Commit Graph

590 Commits

Author SHA1 Message Date
b0fb0f18fb Primera version del importador de Bubok 2025-04-30 15:36:33 +02:00
5aab9a33ac arreglado 2025-04-29 20:03:02 +02:00
b288ca498c terminado 2025-04-29 19:30:35 +02:00
eed5c0994e Importador rama con ajuste del precio 2025-04-29 17:09:19 +02:00
7da76af866 Primera version del importador RAMA 2025-04-29 15:42:50 +02:00
bf21a336b1 Merge branch 'main' into feat/festivos-calendar 2025-04-28 02:10:52 +02:00
029757bb40 add calendar festivos 2025-04-28 00:42:15 +02:00
6d45a950df Trabajando JS 2025-04-27 22:00:52 +02:00
6f8890a8b1 Merge branch 'main' into 'feat/importador_rama'
Main

See merge request jjimenez/safekat!749
2025-04-27 18:56:08 +00:00
97554bffc9 add maquinista change user session 2025-04-27 18:53:24 +02:00
3402e67fb2 Merge branch 'add/envio_ferros' into 'main'
Add/envio ferros

See merge request jjimenez/safekat!745
2025-04-27 10:14:05 +00:00
b1932e6f85 terminado envio de ferros 2025-04-27 12:12:52 +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
0e444295e3 trabajando en el formulario envio de ferros 2025-04-27 09:51:04 +02:00
ff115f4f20 Configurando logica de captacion del Excel 2025-04-27 09:16:15 +02:00
45e41c77e4 tablas encuadernacion ot pdf 2025-04-27 08:20:35 +02:00
ae456c8890 Implementado script principal 2025-04-27 00:00:58 +02:00
7f31e65960 subidos ficheros 2025-04-26 18:08:41 +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
ef173ab0fc Merge branch 'main' into add/impresion_etiquetas_envios 2025-04-26 09:56:47 +02:00
5e8a7f8bd4 terminado 2025-04-26 09:54:56 +02:00
151e4a2d7a cambios 2025-04-25 17:50:30 +02:00
4379a9d23b erase ot dates 2025-04-25 12:57:14 +02:00
cc2c9eee1c maquina button 2025-04-25 11:30:41 +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
7bfb49f412 Merge branch 'add/finalizar_envios_logistica' into 'main'
Add/finalizar envios logistica

See merge request jjimenez/safekat!731
2025-04-24 07:05:23 +00:00
f7b9c23f69 parece terminado los envios 2025-04-24 00:32:53 +02:00
e918b5f400 corregidos los dos fallos 2025-04-23 17:41:43 +02:00
8b949a3173 Merge branch 'main' into add/finalizar_envios_logistica 2025-04-23 17:22:40 +02:00
e0916b567c tabajando 2025-04-23 17:22:12 +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
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