Commit Graph

2072 Commits

Author SHA1 Message Date
1b451ab08e Merge branch 'feat/sk-32' into 'main'
Feat/sk 32

See merge request jjimenez/safekat!662
2025-04-06 07:42:31 +00:00
c42a7bae44 Merge branch 'main' into fix/permisos-mensajeria-sidebar 2025-04-06 09:40:09 +02:00
c6bc2e532f Merge branch 'fix/maquina-form-bugs' into 'main'
table papeles impresion responsive

See merge request jjimenez/safekat!661
2025-04-06 07:37:26 +00:00
2b343b0dd9 add filter maquina padre in datatablePlanningPlana 2025-04-06 09:33:44 +02:00
89ec78bc31 add select filter maquina padre 2025-04-06 09:32:53 +02:00
2857697fd2 add padre_id to select in planningPlanaQueryDatatable 2025-04-06 09:32:42 +02:00
2eb51ffd55 maquina padre plana 2025-04-06 09:32:13 +02:00
b320856af8 select maquina plana padre 2025-04-06 09:32:04 +02:00
071dceced8 table papeles impresion responsive 2025-04-06 06:17:19 +02:00
75eea1a736 Merge branch 'main' into feat/sk-32 2025-04-06 06:03:44 +02:00
c14eb1f3c3 button to sm. Acorddion default collapsed 2025-04-06 06:02:51 +02:00
7aa1a33767 fix switches inaplazable y revisada css 2025-04-06 06:02:27 +02:00
f56ede87da reorder sections 2025-04-06 06:02:02 +02:00
ea11011aca buttons to btn-sm 2025-04-06 06:01:50 +02:00
7a316d9b81 update with pedido espera 2025-04-06 06:01:32 +02:00
5051bddf36 add translations 2025-04-06 06:01:20 +02:00
98d47a0f0f remove pedido_espera_by cast 2025-04-06 06:01:12 +02:00
cfa3f7329f add error resposne to get_orden_trabajo_summary 2025-04-06 06:00:52 +02:00
f362087c01 add pedido espera switch 2025-04-06 06:00:09 +02:00
4343b86640 fix sistema/intranet path 2025-04-06 05:59:37 +02:00
ccfc78ed0d add block ui and file zone 2025-04-06 05:59:23 +02:00
4fb6533926 notiflix 2025-04-06 05:59:04 +02:00
2c59ac33df Merge branch 'fix/add_merma_servicios' into 'main'
solucionado. También corregidos añadir margen en envios de cliente y problema...

See merge request jjimenez/safekat!660
2025-04-05 08:25:34 +00:00
73e6106e4f solucionado. También corregidos añadir margen en envios de cliente y problema al cargar cubierta con solapas 2025-04-05 10:25:08 +02:00
b17abbdfa8 upload file feature 2025-04-05 09:40:51 +02:00
60b77453d9 resourcePath config value 2025-04-05 09:40:38 +02:00
e29e77703d orden trabajo files methods 2025-04-05 09:40:18 +02:00
139724ae8a update model with files and new attributes 2025-04-05 09:40:08 +02:00
7dd2e8c1c6 update entity with new attributes 2025-04-05 09:39:57 +02:00
87b52afab3 update entity with new attributes 2025-04-05 09:39:44 +02:00
0533d051c4 add migration column is pedido espera 2025-04-05 09:39:34 +02:00
fa03a872dc orden trabajo 2025-04-05 09:39:24 +02:00
c31aa262e2 upload files 2025-04-05 09:39:17 +02:00
87dcd73c40 Merge branch 'fix/lp_negrohq' into 'main'
arraglado

See merge request jjimenez/safekat!659
2025-04-05 06:49:48 +00:00
21dceb2c23 arraglado 2025-04-05 08:49:24 +02:00
1a3b067fbc Merge branch 'fix/remove_dual_presupuesto_aceptado' into 'main'
corregido

See merge request jjimenez/safekat!658
2025-04-04 16:30:42 +00:00
c493f7c8ac corregido 2025-04-04 18:30:24 +02:00
4545c33a27 Merge branch 'fix/cargar_user_id_presu_admin' into 'main'
corregido

See merge request jjimenez/safekat!657
2025-04-04 16:21:44 +00:00
e70e3b9683 corregido 2025-04-04 18:21:25 +02:00
f937695714 Merge branch 'fix/percent_margin_resumen_admin' into 'main'
corregido

See merge request jjimenez/safekat!656
2025-04-04 16:14:54 +00:00
6b1dc57821 corregido 2025-04-04 18:14:31 +02:00
077cfd7d82 Merge branch 'add/ajustar_margen' into 'main'
Add/ajustar margen

See merge request jjimenez/safekat!655
2025-04-04 15:04:15 +00:00
244361a1ce Merge branch 'main' into 'add/ajustar_margen'
Mergeados UserModel's y eliminadas referencias a App\Models\UserModel a favor...

See merge request jjimenez/safekat!654
2025-04-04 15:03:45 +00:00
cddf64b025 terminada modificacion 2025-04-04 17:03:08 +02:00
c9d6196aac Merge branch 'bug/users_overwrited' into 'main'
Mergeados UserModel's y eliminadas referencias a App\Models\UserModel a favor...

See merge request jjimenez/safekat!653
2025-04-04 07:53:46 +00:00
a0cb703991 trabajando 2025-04-04 09:21:36 +02:00
2d794aa1a3 Merge branch 'main' into fix/permisos-mensajeria-sidebar
Sección habilitada para todos los roles excepto cliente-administrador y cliente
2025-04-04 08:53:59 +02:00
6594cb6f51 Merge branch 'main' into bug/users_overwrited 2025-04-04 01:33:35 +02:00
c832af90d0 add import ChatNotificationModel 2025-04-04 01:32:50 +02:00
3d6e8b4886 update with ot files 2025-04-04 00:52:41 +02:00