Commit Graph

820 Commits

Author SHA1 Message Date
4f5bc3301f Eliminados ajustes de sistemas. Ahora estan en variables del ERP 2025-04-07 22:14:44 +02:00
2eb51ffd55 maquina padre plana 2025-04-06 09:32:13 +02:00
75eea1a736 Merge branch 'main' into feat/sk-32 2025-04-06 06:03:44 +02:00
cfa3f7329f add error resposne to get_orden_trabajo_summary 2025-04-06 06:00:52 +02:00
73e6106e4f solucionado. También corregidos añadir margen en envios de cliente y problema al cargar cubierta con solapas 2025-04-05 10:25:08 +02:00
fa03a872dc orden trabajo 2025-04-05 09:39:24 +02:00
c31aa262e2 upload files 2025-04-05 09:39:17 +02:00
e70e3b9683 corregido 2025-04-04 18:21:25 +02:00
244361a1ce Merge branch 'main' into 'add/ajustar_margen'
Mergeados UserModel's y eliminadas referencias a App\Models\UserModel a favor...

See merge request jjimenez/safekat!654
2025-04-04 15:03:45 +00:00
cddf64b025 terminada modificacion 2025-04-04 17:03:08 +02:00
a0cb703991 trabajando 2025-04-04 09:21:36 +02:00
6594cb6f51 Merge branch 'main' into bug/users_overwrited 2025-04-04 01:33:35 +02:00
1777f435d9 get file and upload_files methods 2025-04-04 00:51:43 +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
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
cbf4ddd550 añadidos roles facturacion 2025-04-03 19:40:33 +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
b79f490f17 add check horas planning plana 2025-04-03 01:08:29 +02: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
0a10c91159 arreglado 2025-04-02 20:42:27 +02:00
69f6d6cbeb chat select cliente contactos 2025-04-02 20:19:16 +02:00
88e98962d1 arreglado 2025-04-02 19:17:40 +02:00
4d21ff78ff fix logistica controller 2025-04-02 18:43:13 +02:00
4872e498a5 Modificado el controlador 2025-04-02 15:53:30 +02:00
69aa3f4837 Merge branch 'main' into feat/printer-labels 2025-04-02 13:50:34 +02:00
ecbd762c7f corregido typo en papelInteriorDiferente 2025-04-02 10:22:11 +02:00
d42f46d280 etiqueta impresora 2025-04-02 08:16:58 +02:00
babd832606 añadidos ficheros 2025-04-01 20:31:24 +02:00
3cb512d93a añadidos presupuestos en cliente 2025-03-31 20:42:14 +02:00
fb2d12e318 con totales 2025-03-31 17:31:56 +02:00
dde339ad44 Merge branch 'main' into 'feat/listados_cliente_form'
Main

See merge request jjimenez/safekat!629
2025-03-31 07:48:41 +00:00
460cb0344f toggle corte rotativa planning 2025-03-31 09:05:03 +02:00
c65c6571cd Merge branch 'main' into fix/sk-7/bugs 2025-03-31 00:19:12 +02:00
ba0ad10935 fix bugs sk-7 2025-03-31 00:17:49 +02:00
e1fa993fcd añadido facturas. faltan filtros pedidos 2025-03-30 21:36:17 +02:00
4991642d48 feat delete portada and remove loader 2025-03-30 19:30:30 +02:00
bc969828b9 ot pdf download 2025-03-30 14:22:43 +02:00
30a6de5e75 Merge branch 'main' into 'add/tabla_credito_presupuesto'
Main

See merge request jjimenez/safekat!623
2025-03-29 10:31:40 +00:00
d1a9aaac77 añadida tabla de credito al presupuesto 2025-03-29 11:31:03 +01:00
50cd951755 Merge branch 'main' into feat/sk-7/planning 2025-03-29 11:08:34 +01:00
8c64b678fe planning plana 2025-03-29 11:07:36 +01:00
33ce64df0f terminada revision de pedidos 2025-03-28 00:52:49 +01:00
f43dd069d6 email Service merge 2025-03-27 14:00:55 +01:00