|
|
13ae70236e
|
Merge branch 'feat/sk-44' into 'main'
Feat/sk 44
See merge request jjimenez/safekat!744
|
2025-04-27 09:00:23 +00:00 |
|
|
|
4d8332e625
|
Merge branch 'main' into feat/sk-44
|
2025-04-27 10:59:41 +02:00 |
|
|
|
c75d08b3c3
|
ot pliegos
|
2025-04-27 10:58:23 +02:00 |
|
|
|
a0b5f3b4df
|
trabajando en envio de ferros
|
2025-04-27 09:51:52 +02:00 |
|
|
|
0e444295e3
|
trabajando en el formulario envio de ferros
|
2025-04-27 09:51:04 +02:00 |
|
|
|
ae7707057a
|
Cambiando titulo pagina
|
2025-04-27 09:17:46 +02:00 |
|
|
|
ff115f4f20
|
Configurando logica de captacion del Excel
|
2025-04-27 09:16:15 +02:00 |
|
|
|
45e41c77e4
|
tablas encuadernacion ot pdf
|
2025-04-27 08:20:35 +02:00 |
|
|
|
ae456c8890
|
Implementado script principal
|
2025-04-27 00:00:58 +02:00 |
|
|
|
e8958dc893
|
Implementado menu lateral
|
2025-04-26 23:23:04 +02:00 |
|
|
|
b0ac132e59
|
Arreglado bug en archivo de migrate del catalogo
|
2025-04-26 23:05:15 +02:00 |
|
|
|
b50e564641
|
Desplegando arcihvos iniciales
|
2025-04-26 21:32:22 +02:00 |
|
|
|
894770d6ce
|
Merge branch 'feat/importador_rama' of https://git.imnavajas.es/jjimenez/safekat into feat/importador_rama
|
2025-04-26 21:25:18 +02:00 |
|
|
|
367c7c2ea8
|
Merge branch 'main' into 'feat/importador_rama'
Main
See merge request jjimenez/safekat!743
|
2025-04-26 19:24:58 +00:00 |
|
|
|
9375b9b624
|
Añadiendo idiomas
|
2025-04-26 21:22:39 +02:00 |
|
|
|
9a6a4f89a2
|
Merge branch 'add/files_albaranes' into 'main'
subidos ficheros
See merge request jjimenez/safekat!742
|
2025-04-26 16:09:09 +00:00 |
|
|
|
7f31e65960
|
subidos ficheros
|
2025-04-26 18:08:41 +02:00 |
|
|
|
5aa2a2e6c9
|
Merge branch 'add/logistica_albaranes' into 'main'
Add/logistica albaranes
See merge request jjimenez/safekat!741
|
2025-04-26 15:27:46 +00:00 |
|
|
|
dfbcb13ba5
|
hecho tema albaranes logistica
|
2025-04-26 17:27:29 +02:00 |
|
|
|
033184cfa2
|
Iniciando herramienta de importacion desde catalogo
|
2025-04-26 16:52:59 +02:00 |
|
|
|
25b6d14423
|
falta boton borrar albaranes!
|
2025-04-26 14:16:32 +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 |
|
