Commit Graph

2124 Commits

Author SHA1 Message Date
7ee844fb0c colores header pdf ot 2025-04-16 09:14:16 +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
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
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
ebf0a9d5d7 feat colors 2025-04-14 20:41:23 +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
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
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
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
7350e193e5 Merge branch 'fix/rbac_init' into 'main'
Comprobar que el directorio RBAC existe y añadido .gitkeep

See merge request jjimenez/safekat!694
2025-04-12 19:11:48 +00:00
9ee2a833b5 Comprobar que el directorio RBAC existe y añadido .gitkeep 2025-04-12 21:11:20 +02:00
8cd4570845 Merge branch 'mod/flujo_facturas' into 'main'
terminado el flujo completo de facturas, incluyendo cambio en el texto de...

See merge request jjimenez/safekat!693
2025-04-12 15:48:21 +00: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
f966f2d47a Merge branch 'fix/facturas_suma_alineamiento' into 'main'
solucionado

See merge request jjimenez/safekat!692
2025-04-12 08:51:07 +00:00
2e845b7355 solucionado 2025-04-12 10:50:50 +02:00
803b979e0d Merge branch 'fix/error_no_inaplazable' into 'main'
arreglado problema

See merge request jjimenez/safekat!691
2025-04-12 08:18:51 +00:00
79fcb1e3fe arreglado problema 2025-04-12 10:18:32 +02:00
9b6b66af13 Merge branch 'mod/pedidos_user_fechas' into 'main'
terminado añadir usuarios y fechas a pedidos. añadido inaplazable. color en...

See merge request jjimenez/safekat!690
2025-04-12 08:02:28 +00: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
da8917b0d3 Merge branch 'fix/sk-41' into 'main'
Fix/sk 41

See merge request jjimenez/safekat!688
2025-04-12 06:01:17 +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
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
de8ae93871 Merge branch 'fix/sk-36' into 'main'
Fix/sk 36

See merge request jjimenez/safekat!687
2025-04-11 05:04:09 +00: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
9e591a099d Merge branch 'fix/user-import-model' into 'main'
Fix/user import model

See merge request jjimenez/safekat!686
2025-04-11 01:36:08 +00:00
269410c2c7 Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat 2025-04-11 03:34:10 +02:00