|
|
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 |
|
|
|
e96c738839
|
Merge branch 'mod/ajustes_mail' into 'main'
Mod/ajustes mail
See merge request jjimenez/safekat!671
|
2025-04-07 20:17:28 +00: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 |
|
|
|
4633fa623a
|
Merge branch 'add/tablaCredito_presuAdmin_old_erp' into 'main'
añadido pendiente en erp antiguo
See merge request jjimenez/safekat!669
|
2025-04-07 19:32:56 +00:00 |
|
|
|
ce1d94bbda
|
añadido pendiente en erp antiguo
|
2025-04-07 21:32:36 +02:00 |
|
|
|
387667b0c2
|
Merge branch 'fix/lista_papel_impre_activo' into 'main'
quitada la condición isactivo en el listado
See merge request jjimenez/safekat!668
|
2025-04-07 16:38:50 +00: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 |
|
|
|
937af8f5d9
|
Merge branch 'main' into 'rev/roles_1'
Main
See merge request jjimenez/safekat!667
|
2025-04-07 07:54:11 +00:00 |
|
|
|
6045d65935
|
Merge branch 'mod/listado_plantillas_tarifas' into 'main'
Mod/listado plantillas tarifas
See merge request jjimenez/safekat!666
|
2025-04-07 05:11:04 +00: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 |
|
|
|
e5b2bc19d4
|
Merge branch 'fix/permisos-mensajeria-sidebar' into 'main'
Fix/permisos mensajeria sidebar
See merge request jjimenez/safekat!665
|
2025-04-06 07:50:27 +00: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 |
|
|
|
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 |
|
