Commit Graph

1416 Commits

Author SHA1 Message Date
7139bb377c falta autonumeric 2025-04-10 15:34:14 +02:00
fc52417b53 modificada la vista cuando hay más de 3 permisos 2025-04-08 22:37:53 +02:00
ab4afe7492 Merge branch 'main' into 'fix/arreglar_resumen_cliente_vs_admin'
Main

See merge request jjimenez/safekat!678
2025-04-07 22:43:25 +00:00
036c11b4ab Arreglado menu compras/proveedores 2025-04-08 00:41:31 +02:00
644ad41001 todo okgit pullgit pull 2025-04-08 00:28:45 +02:00
b413245683 Merge branch 'main' into 'fix/arreglar_resumen_cliente_vs_admin'
Main

See merge request jjimenez/safekat!676
2025-04-07 22:19:36 +00:00
4b57c716ab Refactorizazion 2025-04-07 23:58:44 +02:00
df05f4b5b4 Revisados roles de pedidos y corregidos bugs de poner autoroute = false 2025-04-07 23:49:35 +02:00
6c20121f0c Merge branch 'main' into 'fix/arreglar_resumen_cliente_vs_admin'
Main

See merge request jjimenez/safekat!674
2025-04-07 21:39:12 +00:00
885aea495c falta factores cliente 2025-04-07 23:38:31 +02:00
a6f07a15b5 Añadidos permisos para Produccion 2025-04-07 23:20:07 +02:00
432567e964 Permisos produccion 2025-04-07 22:56:07 +02:00
5b15d7a72e Subiendo menu importador 2025-04-07 22:34:40 +02:00
64a6e0c5f4 Merge branch 'main' into 'rev/roles_1'
Main

See merge request jjimenez/safekat!672
2025-04-07 20:30:49 +00:00
c8598cbd27 Resolviendo conflictos 2025-04-07 22:30:29 +02:00
a62e51d31c Merge branch 'main' into 'mod/ajustes_mail'
Main

See merge request jjimenez/safekat!670
2025-04-07 20:16:02 +00:00
4f5bc3301f Eliminados ajustes de sistemas. Ahora estan en variables del ERP 2025-04-07 22:14:44 +02:00
ce1d94bbda añadido pendiente en erp antiguo 2025-04-07 21:32:36 +02:00
66825d3286 quitada la condición isactivo en el listado 2025-04-07 18:38:29 +02:00
3baa7c9e51 Merge branch 'rev/roles_1' of https://git.imnavajas.es/jjimenez/safekat into rev/roles_1 2025-04-07 09:55:35 +02:00
c450d4f804 Revisando roles y añadido clase beta al CSS 2025-04-07 09:55:30 +02:00
78584f22c3 cambiado a papel generico la descripción del pedido (y de facturas por tanto) 2025-04-07 07:10:17 +02:00
2de72e4278 añadidos totales a tarifas de clientes 2025-04-06 19:35:39 +02:00
ce325d73dc Merge branch 'main' into fix/permisos-mensajeria-sidebar 2025-04-06 09:49:46 +02:00
301152c6e2 Merge branch 'feat/sk-34/filter-maquina-padre' into 'main'
Feat/sk 34/filter maquina padre

See merge request jjimenez/safekat!663
2025-04-06 07:43:31 +00:00
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
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
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
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