|
|
af57f7d5ae
|
Modificado Paises al metodo JS
|
2025-04-09 00:37:30 +02:00 |
|
|
|
b7c5c328da
|
Merge branch 'main' into 'mod/autoroute'
Main
See merge request jjimenez/safekat!681
|
2025-04-08 20:44:10 +00:00 |
|
|
|
5a2b2ee7cb
|
Resolviendo conflictos
|
2025-04-08 22:43:49 +02:00 |
|
|
|
94a2a1dd2e
|
Resolviendo conflictos
|
2025-04-08 22:41:25 +02:00 |
|
|
|
84155d1f71
|
Merge branch 'fix/rolesPermissions_view' into 'main'
modificada la vista cuando hay más de 3 permisos
See merge request jjimenez/safekat!680
|
2025-04-08 20:38:29 +00:00 |
|
|
|
fc52417b53
|
modificada la vista cuando hay más de 3 permisos
|
2025-04-08 22:37:53 +02:00 |
|
|
|
03135fdac7
|
Añadidos archivos de rutas para presupuestos y compras
|
2025-04-08 15:22:39 +02:00 |
|
|
|
3cfdc584e5
|
Añadida estructura de rutas en carpeta dedicada
|
2025-04-08 15:04:14 +02:00 |
|
|
|
c0de7ec238
|
Cambiadas rutas de maquinas, papel generico, papel impresion, perfil y paises
|
2025-04-08 14:45:14 +02:00 |
|
|
|
ae9af197ac
|
Merge branch 'fix/arreglar_resumen_cliente_vs_admin' into 'main'
Fix/arreglar resumen cliente vs admin
See merge request jjimenez/safekat!679
|
2025-04-07 22:44:08 +00: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 |
|
|
|
982b008ada
|
Merge branch 'fix/compras_proveedores' into 'main'
Arreglado menu compras/proveedores
See merge request jjimenez/safekat!677
|
2025-04-07 22:42:27 +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 |
|
|
|
0116553b2b
|
Merge branch 'rev/roles_2' into 'main'
Rev/roles 2
See merge request jjimenez/safekat!675
|
2025-04-07 21:59:31 +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 |
|
|
|
470732ca39
|
Merge branch 'rev/roles_1' into 'main'
Rev/roles 1
See merge request jjimenez/safekat!673
|
2025-04-07 20:35:18 +00: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 |
|
|
|
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 |
|
