Commit Graph

733 Commits

Author SHA1 Message Date
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
ab99baaa81 add new dates in form 2025-04-15 01:30:46 +02:00
9f46569b01 add messages to ot 2025-04-15 00:42:24 +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
ebf0a9d5d7 feat colors 2025-04-14 20:41:23 +02:00
0d21a7ab3b Merge branch 'main' into feat/sk-40/sk-37 2025-04-14 08:50:36 +02:00
e9827c3557 fechas pedido and imposiciones 2025-04-14 08:05:03 +02:00
b28b8b761e reflejado diferentes ivas en total de factura 2025-04-13 14:13:05 +02:00
e2da90926d Listado de libros de catalogo 2025-04-13 09:46:47 +02:00
f5d01e520a Merge branch 'main' into feat/imposiciones/sk-40 2025-04-12 23:54:52 +02:00
ba9c4dc339 imposiciones 2025-04-12 23:53:48 +02:00
abc8db6b8b Merge branch 'main' into 'mod/autoroute'
terminado añadir usuarios y fechas a pedidos. añadido inaplazable. color en...

See merge request jjimenez/safekat!695
2025-04-12 20:18:05 +00:00
38d60402c0 constraint btn-edit event inside table not in $(document) 2025-04-12 08:00:32 +02:00
e7394999ab constraint btn-edit event inside table not in $(document) 2025-04-12 08:00:26 +02:00
af57f7d5ae Modificado Paises al metodo JS 2025-04-09 00:37:30 +02:00
c0de7ec238 Cambiadas rutas de maquinas, papel generico, papel impresion, perfil y paises 2025-04-08 14:45:14 +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
64a6e0c5f4 Merge branch 'main' into 'rev/roles_1'
Main

See merge request jjimenez/safekat!672
2025-04-07 20:30:49 +00:00
4f5bc3301f Eliminados ajustes de sistemas. Ahora estan en variables del ERP 2025-04-07 22:14:44 +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
2de72e4278 añadidos totales a tarifas de clientes 2025-04-06 19:35:39 +02:00