Commit Graph

476 Commits

Author SHA1 Message Date
fb7f2a28d9 revision ot v2 2025-05-04 17:25:53 +02:00
a88ffda50d add revision preimpresion ot 2025-05-02 21:02:53 +02:00
5138681718 feat/ot-datatable-news 2025-05-02 07:56:28 +02:00
cf5a42de8d Merge branch 'main' into feat/ot-new-features 2025-05-01 06:15:26 +02:00
a259d76e5e ot new features 2025-05-01 06:02:22 +02:00
b0fb0f18fb Primera version del importador de Bubok 2025-04-30 15:36:33 +02:00
cf4c4df80a Features:
- Prototipo PDF
 - Ferro PDF
 - Ferro OK fecha cambiado a Ferro/Prototipo OK
 - Comentarios para orden,impresion,cubierta,encuadernacion y logistica
 - Migración para comentarios
 - Tarifas acabado migraciones con campos para identificar mejor si es plastificado,plakene,retractilado y el tipo de cada uno
2025-04-30 09:23:37 +02:00
b288ca498c terminado 2025-04-29 19:30:35 +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
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
ae7707057a Cambiando titulo pagina 2025-04-27 09:17:46 +02:00
ff115f4f20 Configurando logica de captacion del Excel 2025-04-27 09:16:15 +02:00
e8958dc893 Implementado menu lateral 2025-04-26 23:23:04 +02:00
894770d6ce Merge branch 'feat/importador_rama' of https://git.imnavajas.es/jjimenez/safekat into feat/importador_rama 2025-04-26 21:25:18 +02:00
9375b9b624 Añadiendo idiomas 2025-04-26 21:22:39 +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