Commit Graph

2071 Commits

Author SHA1 Message Date
1777f435d9 get file and upload_files methods 2025-04-04 00:51:43 +02:00
b141dcacb8 add upload get files for ots 2025-04-04 00:51:06 +02:00
eae40ff4d8 Merge branch 'add/ajustar_margen' of https://git.imnavajas.es/jjimenez/safekat into add/ajustar_margen 2025-04-03 23:37:20 +02:00
cdf70c19ff añadidos ficheros nuevos 2025-04-03 23:37:14 +02:00
1d4f8696e1 Merge branch 'main' into 'add/ajustar_margen'
Main

See merge request jjimenez/safekat!651
2025-04-03 21:36:49 +00:00
6208839a12 empezando modificaciones 2025-04-03 23:36:12 +02:00
8830f59665 Merge branch 'rev/roles' into 'main'
Rev/roles

See merge request jjimenez/safekat!650
2025-04-03 20:21:42 +00:00
5b048b8a1b Revision roles soporte de tickets 2025-04-03 22:21:01 +02:00
92f7d30c99 Revision facturas en vista cliente 2025-04-03 22:09:28 +02:00
c9e655ca82 Revisado roles sistema y facturas 2025-04-03 21:44:58 +02:00
750847e3b6 Revisado roles Compras 2025-04-03 21:14:39 +02:00
d017115530 Merge branch 'main' into feat/sk-32 2025-04-03 20:30:17 +02:00
27126dbaed Merge branch 'main' into fix/permisos-mensajeria-sidebar 2025-04-03 20:23:02 +02:00
41bdae0623 fix focus dropdown notifications unviewed 2025-04-03 20:20:49 +02:00
e593f3000b roles message datatatables 2025-04-03 20:20:36 +02:00
0cde6d5fc5 allow all roles except cliente-administrador y cliente 2025-04-03 19:51:52 +02:00
465ab4c8f5 add cargo_null key 2025-04-03 19:51:19 +02:00
dc4647fee7 add default value if cargo is null in query 2025-04-03 19:51:07 +02:00
5d4cc98a91 Merge branch 'add/roles_facturas' into 'main'
añadidos roles facturacion

See merge request jjimenez/safekat!649
2025-04-03 17:41:06 +00:00
cbf4ddd550 añadidos roles facturacion 2025-04-03 19:40:33 +02:00
40b37962a8 Merge branch 'fix/resumen_margen_envio' into 'main'
arreglado el problema de que no se actualizaba bien el resumen cuando se...

See merge request jjimenez/safekat!648
2025-04-03 17:17:52 +00:00
4f07f45676 arreglado el problema de que no se actualizaba bien el resumen cuando se clickaba en recoger en taller 2025-04-03 19:17:34 +02:00
398afbaeda Arreglado bug añadir usuarios 2025-04-03 14:16:43 +02:00
a123c2dfa7 Mergeados UserModel's y eliminadas referencias a App\Models\UserModel a favor de App\Models\Usuarios\UserModel 2025-04-03 13:54:19 +02:00
ac804e9720 Eliminadas referencias a UsersEntity 2025-04-03 13:29:32 +02:00
ab63043f36 Unificada entidad de usuarios a UserEntity 2025-04-03 13:26:44 +02:00
b79f490f17 add check horas planning plana 2025-04-03 01:08:29 +02:00
bb848d391f Merge branch 'fix/sk-33' into 'main'
Fix/sk 33

See merge request jjimenez/safekat!647
2025-04-02 20:26:33 +00:00
cecf193e37 Merge branch 'main' into fix/sk-33 2025-04-02 22:25:22 +02:00
9cbbddcc1c fix chat view 2025-04-02 22:24:32 +02:00
5f3bc61a41 Merge branch 'fix/maquina_form_variantes' into 'main'
arreglado

See merge request jjimenez/safekat!646
2025-04-02 18:42:41 +00:00
0a10c91159 arreglado 2025-04-02 20:42:27 +02:00
2ff4a8fb9d Merge branch 'fix/porcentajes_resumen_admin' into 'main'
arreglado

See merge request jjimenez/safekat!645
2025-04-02 18:22:13 +00:00
d294ea2811 arreglado 2025-04-02 20:21:57 +02:00
69f6d6cbeb chat select cliente contactos 2025-04-02 20:19:16 +02:00
9e9eb1f56f Merge branch 'fix/actualizar_presupuestos_acabados' into 'main'
arreglado

See merge request jjimenez/safekat!644
2025-04-02 18:08:45 +00:00
91c820feed arreglado 2025-04-02 20:08:30 +02:00
b279bd5321 Merge branch 'mod/cambiar_proveedor_enc_admin' into 'main'
hecha la modificacione

See merge request jjimenez/safekat!643
2025-04-02 17:45:12 +00:00
9b83f6e722 hecha la modificacione 2025-04-02 19:44:54 +02:00
b5cc032afc Merge branch 'fix/guardar_presupuesto_coste_envio' into 'main'
arreglado

See merge request jjimenez/safekat!642
2025-04-02 17:17:55 +00:00
88e98962d1 arreglado 2025-04-02 19:17:40 +02:00
9d071e462c constraint chat functionalities to all roles, excep and 2025-04-02 18:49:36 +02:00
d51949c593 Merge branch 'fix/logistica-controller' into 'main'
fix logistica controller

See merge request jjimenez/safekat!641
2025-04-02 16:43:48 +00:00
4d21ff78ff fix logistica controller 2025-04-02 18:43:13 +02:00
3dc7b816a5 Merge branch 'mod/envio_resumen_admin' into 'main'
Mod/envio resumen admin

See merge request jjimenez/safekat!640
2025-04-02 16:39:49 +00:00
6e5d2c3e94 Merge branch 'main' into 'mod/envio_resumen_admin'
Main

See merge request jjimenez/safekat!639
2025-04-02 16:39:27 +00:00
a481375028 modificado 2025-04-02 18:38:48 +02:00
371e986baf Merge branch 'feat/printer-labels' into 'main'
Feat/printer labels

See merge request jjimenez/safekat!638
2025-04-02 16:30:14 +00:00
4872e498a5 Modificado el controlador 2025-04-02 15:53:30 +02:00
c960fd8539 Tunning parameters! 2025-04-02 14:03:32 +02:00