|
|
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 |
|
|
|
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 |
|
|
|
9924f27b5b
|
tmp file
|
2025-04-02 14:00:10 +02:00 |
|
|
|
492c7366cf
|
add ftp send printer
|
2025-04-02 13:54:51 +02:00 |
|
|
|
dc4db78b76
|
Merge branch 'feat/printer-labels' of https://git.imnavajas.es/jjimenez/safekat into feat/printer-labels
|
2025-04-02 13:54:06 +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 |
|
|
|
ef79cc5c2e
|
Merge branch 'main' into 'feat/printer-labels'
Main
See merge request jjimenez/safekat!637
|
2025-04-02 10:14:38 +00:00 |
|
|
|
0f5e8a223b
|
Merge branch 'fix/importador_papel_diferente' into 'main'
corregido typo en papelInteriorDiferente
See merge request jjimenez/safekat!636
|
2025-04-02 08:22:33 +00: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 |
|
|
|
c2b61a3d99
|
Merge branch 'add/logistica_files' into 'main'
añadidos ficheros
See merge request jjimenez/safekat!635
|
2025-04-01 18:31:46 +00:00 |
|
|
|
babd832606
|
añadidos ficheros
|
2025-04-01 20:31:24 +02:00 |
|
|
|
210c87ab11
|
Merge branch 'add/vista_panel_logistica' into 'main'
añadido el panel (la vista)
See merge request jjimenez/safekat!634
|
2025-04-01 18:29:40 +00:00 |
|
|
|
efcda66c0b
|
añadido el panel (la vista)
|
2025-04-01 20:28:56 +02:00 |
|
|
|
ff4587333a
|
Merge branch 'mod/importador_presupuesto_gramajes_select' into 'main'
añadidos selects a los gramajes. si hay cambios se pone en naranja
See merge request jjimenez/safekat!633
|
2025-04-01 18:04:27 +00:00 |
|
|
|
121a29d493
|
añadidos selects a los gramajes. si hay cambios se pone en naranja
|
2025-04-01 20:04:05 +02:00 |
|
|
|
bb78f9cbd8
|
Merge branch 'fix/presupuesto_comentarios_pdf' into 'main'
Arreglada superposicion del footer con las observaciones del PDF
See merge request jjimenez/safekat!632
|
2025-04-01 08:06:56 +00:00 |
|
