Commit Graph

656 Commits

Author SHA1 Message Date
00401aaf7f Merge branch 'feat/catalogo' into 'main'
Feat/catalogo

See merge request jjimenez/safekat!727
2025-04-22 20:58:42 +00:00
919c80fa9b Version 1.0 2025-04-22 22:57:27 +02:00
b5b4d6b026 añadidos ficheros 2025-04-22 22:20:21 +02:00
5ac1e3d4c1 finalizar envio ok 2025-04-22 22:20:03 +02:00
649a244a10 Optimizando vista html 2025-04-22 12:00:12 +02:00
288a3f02eb Merge branch 'main' into feat/view-maquinista 2025-04-22 10:37:41 +02:00
952500e10e Merge branch 'main' into feat/view-maquinista 2025-04-22 10:34:06 +02:00
b28c0d9f71 Merge branch 'main' into fix/papel-impresion-routes 2025-04-22 10:30:48 +02:00
01c7da8ca6 Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat 2025-04-22 10:30:23 +02:00
13128ebdae fix papel impresion plana filter 2025-04-22 10:30:05 +02:00
6450231b53 terminados albaranes 2025-04-22 10:26:33 +02:00
b86acc3949 fix papel route 2025-04-22 10:18:44 +02:00
62a95a0ca8 add views 2025-04-22 09:43:25 +02:00
ed5f73db25 Refactoring 2025-04-22 09:06:11 +02:00
2050f0ae1e botones albaran finalizado 2025-04-22 00:50:31 +02:00
fc1b69f2fe Merge branch 'main' into add/view_logistica_principal 2025-04-21 21:09:00 +02:00
67a7cda036 Cambios parciales 2025-04-21 15:39:02 +02:00
63254f0bf3 Merge branch 'main' into 'feat/catalogo'
Main

See merge request jjimenez/safekat!718
2025-04-21 12:07:04 +00:00
c344274f9d Arreglado bug de rutas 2025-04-21 13:35:12 +02:00
fe164c4ab3 trabajando 2025-04-21 12:43:09 +02:00
969966ac78 add select imposicion datatable 2025-04-21 08:32:21 +02:00
19fd76e910 falta terminar albaranes 2025-04-20 22:10:56 +02:00
14b5f4bf95 Revisados formularios de crear y editar, con su validacion 2025-04-20 21:35:24 +02:00
61abcb3dbd trabajando en albaranes. Voy a quitar las cajas 2025-04-20 20:02:14 +02:00
c3d38e29a4 imposiciones 2025-04-20 19:26:07 +02:00
f93ecda648 Creado concepto de ISK 2025-04-20 15:58:43 +02:00
49f9fe4009 Avances inicializacion edit 2025-04-19 22:27:27 +02:00
65c9b34f56 añadido switch a los grupos para seleccionar 2025-04-18 13:52:49 +02:00
0b04e6dabd terminada envio lineas 2025-04-18 13:38:06 +02:00
15f6d0d675 voy a añadir grupos de cajas 2025-04-18 10:36:06 +02:00
3949607a3c trabajando en añadir lineas a envio 2025-04-17 13:47:26 +02:00
9e90ec798c Merge branch 'add/view_logistica_principal' of https://git.imnavajas.es/jjimenez/safekat into add/view_logistica_principal 2025-04-17 09:10:35 +02:00
76baae9e92 Merge branch 'main' into 'add/view_logistica_principal'
Main

See merge request jjimenez/safekat!714
2025-04-17 07:10:25 +00:00
36f5d42d03 pdf uncomment 2025-04-16 20:27:08 +02:00
8e97e7b58c fix pod and file if not exist 2025-04-16 20:25:13 +02:00
2a8c4b9da6 fix ot 2025-04-16 19:55:30 +02:00
d50b511e83 Merge branch 'add/view_logistica_principal' of https://git.imnavajas.es/jjimenez/safekat into add/view_logistica_principal 2025-04-16 18:24:53 +02:00
3ada529b6e trabajando 2025-04-16 18:24:48 +02:00
02a64fa40a Merge branch 'main' into 'add/view_logistica_principal'
Main

See merge request jjimenez/safekat!710
2025-04-16 16:24:25 +00:00
c42f223b9a Configurando la logica del catalogo (JS) 2025-04-16 16:10:04 +02:00
7ee844fb0c colores header pdf ot 2025-04-16 09:14:16 +02:00
a74021f97d Merge branch 'main' into 'feat/catalogo'
Main

See merge request jjimenez/safekat!707
2025-04-15 19:07:51 +00:00
725ea61078 Eliminada subida de ficheros y configurado menu de catalogo (no beta) 2025-04-15 21:05:33 +02:00
c6db000057 fix update pedido espera update 2025-04-15 19:39:07 +02:00
6a4e9b611e Merge branch 'add/view_logistica_principal' of https://git.imnavajas.es/jjimenez/safekat into add/view_logistica_principal 2025-04-15 18:48:07 +02:00
fedc608463 cambios antes del pull 2025-04-15 18:48:01 +02:00
4667e77144 Merge branch 'main' into 'add/view_logistica_principal'
Main

See merge request jjimenez/safekat!705
2025-04-15 16:47:08 +00:00
7cf1bf006d Prrrrrrrrrrr 2025-04-15 16:05:11 +02:00
0fe2470477 add colors plannings 2025-04-15 09:53:50 +02:00
2102a44a1e Merge branch 'feat/ot-messages' into feat/sk-38+messages+dates 2025-04-15 01:32:20 +02:00