Commit Graph

459 Commits

Author SHA1 Message Date
73e9e941ed Merge branch 'main' into maquinista-change-user 2025-04-27 12:25:09 +02:00
9804a6a927 change user session 2025-04-27 12:17:31 +02:00
4d8332e625 Merge branch 'main' into feat/sk-44 2025-04-27 10:59:41 +02:00
c75d08b3c3 ot pliegos 2025-04-27 10:58:23 +02:00
25b6d14423 falta boton borrar albaranes! 2025-04-26 14:16:32 +02:00
b5b86b4164 terminado a falta de pruebas 2025-04-26 10:50:59 +02:00
5e8a7f8bd4 terminado 2025-04-26 09:54:56 +02:00
b942064608 Merge branch 'main' into feat/view-maquinista 2025-04-25 07:41:25 +02:00
52b3b1ae4d maquinista view-basic 2025-04-25 07:40:20 +02:00
5c68334e9a cambiado ael añadir envios 2025-04-24 23:44:07 +02:00
f7b9c23f69 parece terminado los envios 2025-04-24 00:32:53 +02:00
8b949a3173 Merge branch 'main' into add/finalizar_envios_logistica 2025-04-23 17:22:40 +02:00
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
5ac1e3d4c1 finalizar envio ok 2025-04-22 22:20:03 +02:00
7dee2c26e8 Añadidas labels 2025-04-22 15:52:48 +02:00
649a244a10 Optimizando vista html 2025-04-22 12:00:12 +02:00
952500e10e Merge branch 'main' into feat/view-maquinista 2025-04-22 10:34:06 +02:00
62a95a0ca8 add views 2025-04-22 09:43:25 +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
63254f0bf3 Merge branch 'main' into 'feat/catalogo'
Main

See merge request jjimenez/safekat!718
2025-04-21 12:07:04 +00:00
0afd31aae0 Resolviendo conflictos 2025-04-21 14:06:47 +02:00
dd723f9889 Resolviendo conflictos 2025-04-21 14:06:13 +02:00
12e06937c4 add 755 app 2025-04-21 12:55:45 +02:00
5eaa5fea0b fix side bar toggle 2025-04-20 23:03:45 +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
49f9fe4009 Avances inicializacion edit 2025-04-19 22:27:27 +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
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
c76f4428a6 ot general features 2025-04-16 15:51:09 +02:00
a74021f97d Merge branch 'main' into 'feat/catalogo'
Main

See merge request jjimenez/safekat!707
2025-04-15 19:07:51 +00: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
67e588dd67 Primera version visual formulario catalogo completa 2025-04-15 09:54:33 +02:00
a52745fe09 fix cols 2025-04-15 01:42:20 +02:00
14c5cf493c add new dates 2025-04-14 23:36:39 +02:00
16dc39ee15 generando el grupo de envios 2025-04-14 22:00:52 +02:00
f9909bd8cd Merge branch 'main' into 'add/view_logistica_principal'
Main

See merge request jjimenez/safekat!701
2025-04-14 18:07:14 +00:00
e9827c3557 fechas pedido and imposiciones 2025-04-14 08:05:03 +02:00
f0a4f19089 vista creada de envios 2025-04-13 20:28:05 +02:00
e2da90926d Listado de libros de catalogo 2025-04-13 09:46:47 +02:00
08a91294b4 dates users ot 2025-04-13 09:43:15 +02:00