Commit Graph

1342 Commits

Author SHA1 Message Date
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
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
cbf4ddd550 añadidos roles facturacion 2025-04-03 19:40:33 +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
9d071e462c constraint chat functionalities to all roles, excep and 2025-04-02 18:49:36 +02:00
4d21ff78ff fix logistica controller 2025-04-02 18:43:13 +02: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
4872e498a5 Modificado el controlador 2025-04-02 15:53:30 +02:00
c960fd8539 Tunning parameters! 2025-04-02 14:03:32 +02:00
9924f27b5b tmp file 2025-04-02 14:00:10 +02:00
492c7366cf add ftp send printer 2025-04-02 13:54:51 +02:00
41291c82fd fx 2025-04-02 13:53:41 +02:00
69aa3f4837 Merge branch 'main' into feat/printer-labels 2025-04-02 13:50:34 +02:00
b4a835bbfd fix ftp send printer command 2025-04-02 13:42:24 +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
efcda66c0b añadido el panel (la vista) 2025-04-01 20:28:56 +02:00
121a29d493 añadidos selects a los gramajes. si hay cambios se pone en naranja 2025-04-01 20:04:05 +02:00
d44686607a Merge branch 'main' into fix/ot-tareas-table-fk 2025-03-31 21:00:50 +02:00
432cc6be01 fix foreign keys set CASCADE constraint 2025-03-31 20:59:49 +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
c5feb39e8b Merge branch 'feat/listados_cliente_form' of https://git.imnavajas.es/jjimenez/safekat into feat/listados_cliente_form 2025-03-31 09:58:06 +02:00
d5534269b3 añadido facturas. faltan filtros pedidos 2025-03-31 09:57:45 +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
053ce49279 fix encuadernacion pliegos ot pdf and tareas maquinas primera 2025-03-30 18:20:05 +02:00
bc969828b9 ot pdf download 2025-03-30 14:22:43 +02:00
5a5ce4835b arreglado calculo de credito total y vista en euros del toast del total de presupuesto en admin 2025-03-30 10:29:38 +02:00
18f391a733 arreglado problema con el resumen y valores totales a la hora de crear presupuestr 2025-03-29 14:03:56 +01: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