|
|
45e41c77e4
|
tablas encuadernacion ot pdf
|
2025-04-27 08:20:35 +02:00 |
|
|
|
96bd24ae8b
|
Merge branch 'add/impresion_etiquetas_envios' into 'main'
Add/impresion etiquetas envios
See merge request jjimenez/safekat!740
|
2025-04-26 08:51:24 +00:00 |
|
|
|
b5b86b4164
|
terminado a falta de pruebas
|
2025-04-26 10:50:59 +02:00 |
|
|
|
ef173ab0fc
|
Merge branch 'main' into add/impresion_etiquetas_envios
|
2025-04-26 09:56:47 +02:00 |
|
|
|
f473caf06c
|
Merge branch 'fix/change_pedido_ot_logistica' into 'main'
terminado
See merge request jjimenez/safekat!739
|
2025-04-26 07:55:29 +00:00 |
|
|
|
5e8a7f8bd4
|
terminado
|
2025-04-26 09:54:56 +02:00 |
|
|
|
905112334f
|
Merge branch 'fix/php-syntax' into 'main'
<php syntax
See merge request jjimenez/safekat!738
|
2025-04-25 17:34:29 +00:00 |
|
|
|
d0f37cb714
|
<php syntax
|
2025-04-25 19:32:26 +02:00 |
|
|
|
151e4a2d7a
|
cambios
|
2025-04-25 17:50:30 +02:00 |
|
|
|
05ebfa06df
|
Merge branch 'feat/view-maquinista' into 'main'
Feat/view maquinista
See merge request jjimenez/safekat!737
|
2025-04-25 11:22:19 +00:00 |
|
|
|
dafdf68c41
|
view maquinista
|
2025-04-25 13:20:35 +02:00 |
|
|
|
4379a9d23b
|
erase ot dates
|
2025-04-25 12:57:14 +02:00 |
|
|
|
cc2c9eee1c
|
maquina button
|
2025-04-25 11:30:41 +02:00 |
|
|
|
b942064608
|
Merge branch 'main' into feat/view-maquinista
|
2025-04-25 07:41:25 +02:00 |
|
|
|
52b3b1ae4d
|
maquinista view-basic
|
2025-04-25 07:40:20 +02:00 |
|
|
|
86dafb1133
|
Merge branch 'add/fechaEmbalajeForEnvio' into 'main'
cambiado ael añadir envios
See merge request jjimenez/safekat!736
|
2025-04-24 21:44:35 +00:00 |
|
|
|
5c68334e9a
|
cambiado ael añadir envios
|
2025-04-24 23:44:07 +02:00 |
|
|
|
f16654f4ad
|
Merge branch 'fix/findpedidoLogistica' into 'main'
corregido el añadir cuando no es multienvio y select añadir lineas
See merge request jjimenez/safekat!735
|
2025-04-24 16:40:46 +00:00 |
|
|
|
a1fd7075d6
|
corregido el añadir cuando no es multienvio y select añadir lineas
|
2025-04-24 18:40:10 +02:00 |
|
|
|
4fd242d4d2
|
Merge branch 'fix/facturas_problems' into 'main'
terminado
See merge request jjimenez/safekat!734
|
2025-04-24 10:01:38 +00:00 |
|
|
|
3838bcb536
|
terminado
|
2025-04-24 12:01:06 +02:00 |
|
|
|
e2011529b4
|
Merge branch 'fix/facturas_problema_albaranes_2' into 'main'
solucionado el totl aceptado
See merge request jjimenez/safekat!733
|
2025-04-24 09:02:06 +00:00 |
|
|
|
616c12002e
|
solucionado el totl aceptado
|
2025-04-24 11:01:38 +02:00 |
|
|
|
ab36e86bdb
|
Merge branch 'fix/facturas_problema_albaranes' into 'main'
solucionado
See merge request jjimenez/safekat!732
|
2025-04-24 08:56:17 +00:00 |
|
|
|
1ce4ac36a6
|
solucionado
|
2025-04-24 10:55:52 +02:00 |
|
|
|
7bfb49f412
|
Merge branch 'add/finalizar_envios_logistica' into 'main'
Add/finalizar envios logistica
See merge request jjimenez/safekat!731
|
2025-04-24 07:05:23 +00:00 |
|
|
|
f7b9c23f69
|
parece terminado los envios
|
2025-04-24 00:32:53 +02:00 |
|
|
|
f7d1c59c6a
|
Merge branch 'fix/round_tiempo_rot_descuento_admin' into 'main'
corregidos los dos fallos
See merge request jjimenez/safekat!730
|
2025-04-23 15:42:50 +00:00 |
|
|
|
e918b5f400
|
corregidos los dos fallos
|
2025-04-23 17:41:43 +02:00 |
|
|
|
8b949a3173
|
Merge branch 'main' into add/finalizar_envios_logistica
|
2025-04-23 17:22:40 +02:00 |
|
|
|
e0916b567c
|
tabajando
|
2025-04-23 17:22:12 +02:00 |
|
|
|
3779b3b8a0
|
Merge branch 'fix/bug_catalogo_rutas' into 'main'
Arreglado renaming de las rutas
See merge request jjimenez/safekat!729
|
2025-04-23 13:26:56 +00:00 |
|
|
|
6175da1d61
|
Arreglado renaming de las rutas
|
2025-04-23 15:26:22 +02:00 |
|
|
|
9473c10f97
|
Merge branch 'bug/ruta_duplicada' into 'main'
Renombrada ruta duplicada
See merge request jjimenez/safekat!728
|
2025-04-23 07:16:56 +00:00 |
|
|
|
800d32afde
|
Renombrada ruta duplicada
|
2025-04-23 09:16:13 +02:00 |
|
|
|
00401aaf7f
|
Merge branch 'feat/catalogo' into 'main'
Feat/catalogo
See merge request jjimenez/safekat!727
|
2025-04-22 20:58:42 +00:00 |
|
|
|
919c80fa9b
|
Version 1.0
|
2025-04-22 22:57:27 +02:00 |
|
|
|
b5b4d6b026
|
añadidos ficheros
|
2025-04-22 22:20:21 +02:00 |
|
|
|
5ac1e3d4c1
|
finalizar envio ok
|
2025-04-22 22:20:03 +02:00 |
|
|
|
7dee2c26e8
|
Añadidas labels
|
2025-04-22 15:52:48 +02:00 |
|
|
|
649a244a10
|
Optimizando vista html
|
2025-04-22 12:00:12 +02:00 |
|
|
|
288a3f02eb
|
Merge branch 'main' into feat/view-maquinista
|
2025-04-22 10:37:41 +02:00 |
|
|
|
952500e10e
|
Merge branch 'main' into feat/view-maquinista
|
2025-04-22 10:34:06 +02:00 |
|
|
|
2cfe03b2ec
|
Merge branch 'fix/papel-impresion-routes' into 'main'
Fix/papel impresion routes
See merge request jjimenez/safekat!726
|
2025-04-22 08:33:10 +00:00 |
|
|
|
b28c0d9f71
|
Merge branch 'main' into fix/papel-impresion-routes
|
2025-04-22 10:30:48 +02:00 |
|
|
|
01c7da8ca6
|
Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat
|
2025-04-22 10:30:23 +02:00 |
|
|
|
13128ebdae
|
fix papel impresion plana filter
|
2025-04-22 10:30:05 +02:00 |
|
|
|
6016b6145c
|
Merge branch 'add/view_logistica_principal' into 'main'
Add/view logistica principal
See merge request jjimenez/safekat!725
|
2025-04-22 08:26:52 +00:00 |
|
|
|
6450231b53
|
terminados albaranes
|
2025-04-22 10:26:33 +02:00 |
|
|
|
b86acc3949
|
fix papel route
|
2025-04-22 10:18:44 +02:00 |
|