Commit Graph

1485 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
c76f4428a6 ot general features 2025-04-16 15:51:09 +02:00
7ee844fb0c colores header pdf ot 2025-04-16 09:14:16 +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
0fe2470477 add colors plannings 2025-04-15 09:53:50 +02: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
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
b28b8b761e reflejado diferentes ivas en total de factura 2025-04-13 14:13:05 +02:00
f343071311 fix deleted at 2025-04-13 09:54:17 +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
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
9ee2a833b5 Comprobar que el directorio RBAC existe y añadido .gitkeep 2025-04-12 21:11:20 +02:00
89531f1a1b terminado el flujo completo de facturas, incluyendo cambio en el texto de pedidos y facturas cuando no tiene factura validada 2025-04-12 17:47:36 +02:00
8912606c9a pagos en borrador 2025-04-12 12:37:57 +02:00
2e845b7355 solucionado 2025-04-12 10:50:50 +02:00
79fcb1e3fe arreglado problema 2025-04-12 10:18:32 +02:00
3d535e4ed5 Merge branch 'main' into 'mod/pedidos_user_fechas'
Main

See merge request jjimenez/safekat!689
2025-04-12 08:01:59 +00:00
bb9f6210e7 terminado añadir usuarios y fechas a pedidos. añadido inaplazable. color en rojo en fechas cuando inaplazable 2025-04-12 10:00:24 +02:00
ba54d99185 remove doble slash ad form url 2025-04-12 07:59:57 +02:00
efb50383b7 add class table-responsive 2025-04-12 07:59:33 +02:00
defb7373c4 remove unused imports 2025-04-11 07:03:08 +02:00
a4f6f8cdb3 migration drop is_deleted 2025-04-11 07:01:39 +02:00
1e339b5503 delete is_deleted field 2025-04-11 06:56:55 +02:00
269410c2c7 Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat 2025-04-11 03:34:10 +02:00
64e4f51e13 Arreglado bug al generar PDF de facturas 2025-04-10 22:41:38 +02:00
026a109b5e terminado 2025-04-10 16:58:54 +02:00
cce8b1845f Merge branch 'main' into 'mod/facturas_trello'
Main

See merge request jjimenez/safekat!683
2025-04-10 13:34:31 +00:00
7139bb377c falta autonumeric 2025-04-10 15:34:14 +02:00
d8cb02271e Actualizado el pdf de facturas para eliminar precio por linea 2025-04-10 14:33:35 +02:00