|
|
21dceb2c23
|
arraglado
|
2025-04-05 08:49:24 +02:00 |
|
|
|
1a3b067fbc
|
Merge branch 'fix/remove_dual_presupuesto_aceptado' into 'main'
corregido
See merge request jjimenez/safekat!658
|
2025-04-04 16:30:42 +00:00 |
|
|
|
c493f7c8ac
|
corregido
|
2025-04-04 18:30:24 +02:00 |
|
|
|
4545c33a27
|
Merge branch 'fix/cargar_user_id_presu_admin' into 'main'
corregido
See merge request jjimenez/safekat!657
|
2025-04-04 16:21:44 +00:00 |
|
|
|
e70e3b9683
|
corregido
|
2025-04-04 18:21:25 +02:00 |
|
|
|
f937695714
|
Merge branch 'fix/percent_margin_resumen_admin' into 'main'
corregido
See merge request jjimenez/safekat!656
|
2025-04-04 16:14:54 +00:00 |
|
|
|
6b1dc57821
|
corregido
|
2025-04-04 18:14:31 +02:00 |
|
|
|
077cfd7d82
|
Merge branch 'add/ajustar_margen' into 'main'
Add/ajustar margen
See merge request jjimenez/safekat!655
|
2025-04-04 15:04:15 +00: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 |
|
|
|
c9d6196aac
|
Merge branch 'bug/users_overwrited' into 'main'
Mergeados UserModel's y eliminadas referencias a App\Models\UserModel a favor...
See merge request jjimenez/safekat!653
|
2025-04-04 07:53:46 +00: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 |
|
|
|
c832af90d0
|
add import ChatNotificationModel
|
2025-04-04 01:32:50 +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 |
|
|
|
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 |
|
|
|
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 |
|
