Commit Graph

2448 Commits

Author SHA1 Message Date
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
173afe403e Merge branch 'feat/ot-general-features' into 'main'
ot general features

See merge request jjimenez/safekat!709
2025-04-16 13:52:28 +00:00
c76f4428a6 ot general features 2025-04-16 15:51:09 +02:00
6a4e753a06 Merge branch 'feat/ot-pdf-colores' into 'main'
colores header pdf ot

See merge request jjimenez/safekat!708
2025-04-16 07:15:26 +00:00
7ee844fb0c colores header pdf ot 2025-04-16 09:14:16 +02:00
6d5b8ab621 Importando estilo del comparador 2025-04-15 22:11:58 +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
5dbb40af1d Merge branch 'fix/pedido-espera-update-ot' into 'main'
fix update pedido espera update

See merge request jjimenez/safekat!706
2025-04-15 17:46:28 +00: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
10e18d60e4 Merge branch 'feat/colors-plannings' into 'main'
add colors plannings

See merge request jjimenez/safekat!703
2025-04-15 07:55:36 +00:00
67e588dd67 Primera version visual formulario catalogo completa 2025-04-15 09:54:33 +02:00
0fe2470477 add colors plannings 2025-04-15 09:53:50 +02:00
ea59390b75 Merge branch 'feat/sk-38+messages+dates' into 'main'
Feat/sk 38+messages+dates

See merge request jjimenez/safekat!702
2025-04-15 06:27:41 +00:00
a52745fe09 fix cols 2025-04-15 01:42:20 +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
c157b1215c Merge branch 'add/view_logistica_principal' of https://git.imnavajas.es/jjimenez/safekat into add/view_logistica_principal 2025-04-14 20:07:36 +02:00
c226f031d9 trabajando en selector de pedidos 2025-04-14 20:07:29 +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
c75a2f9ef4 Construyendo el formulario de edicion 2025-04-14 14:45:35 +02:00
137d5b9db2 Merge branch 'feat/sk-40/sk-37' into 'main'
Feat/sk 40/sk 37

See merge request jjimenez/safekat!700
2025-04-14 06:51:33 +00: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
f0a4f19089 vista creada de envios 2025-04-13 20:28:05 +02:00
084f3220e1 Merge branch 'fix/flujo_facturas_precio' into 'main'
reflejado diferentes ivas en total de factura

See merge request jjimenez/safekat!699
2025-04-13 12:13:24 +00:00
b28b8b761e reflejado diferentes ivas en total de factura 2025-04-13 14:13:05 +02:00
42a0aed019 Merge branch 'fix/deleted_at/plantilla_precios' into 'main'
fix deleted at

See merge request jjimenez/safekat!698
2025-04-13 07:55:09 +00:00
f343071311 fix deleted at 2025-04-13 09:54:17 +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
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
41159d1588 select imposicion route 2025-04-12 23:53:28 +02:00
5e8da603f9 Merge branch 'main' into 'feat/catalogo'
Main

See merge request jjimenez/safekat!697
2025-04-12 20:21:30 +00:00
f031e31930 Merge branch 'mod/autoroute' into 'main'
Mod/autoroute

See merge request jjimenez/safekat!696
2025-04-12 20:20:11 +00:00
e8123c9fb8 Cambiado el flag de autorute a ON 2025-04-12 22:19: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
a31e0bddb6 Añadido RBAC directory 2025-04-12 22:14:57 +02:00