|
|
3936e3175a
|
Merge branch 'main' into fix/imposicion-form
|
2025-05-05 14:32:55 +02:00 |
|
|
|
571338c4b3
|
fix imposicion form
|
2025-05-05 14:31:59 +02:00 |
|
|
|
5e5cff9eae
|
Merge branch 'add/print_labels_maquinista' into 'main'
terminado
See merge request jjimenez/safekat!775
|
2025-05-05 11:14:14 +00:00 |
|
|
|
1d75f825a4
|
terminado
|
2025-05-05 13:13:44 +02:00 |
|
|
|
95e10820a3
|
Merge branch 'feat/menu_active' into 'main'
Añadida funcionalidad de marcar el menu que esta activo
See merge request jjimenez/safekat!774
|
2025-05-05 09:23:49 +00:00 |
|
|
|
b41dc836c7
|
Merge branch 'fix/btn-cancel-fa' into 'main'
fix btn cancel fa
See merge request jjimenez/safekat!773
|
2025-05-05 09:23:34 +00:00 |
|
|
|
4afcf05049
|
Añadida funcionalidad de marcar el menu que esta activo
|
2025-05-05 11:23:34 +02:00 |
|
|
|
0ecd18f5ff
|
fix btn cancel fa
|
2025-05-05 11:22:41 +02:00 |
|
|
|
ff648fec87
|
Merge branch 'fix/respuesta_tickets' into 'main'
resuelto
See merge request jjimenez/safekat!772
|
2025-05-05 08:57:46 +00:00 |
|
|
|
b5c1053f8c
|
resuelto
|
2025-05-05 10:57:21 +02:00 |
|
|
|
4701329d25
|
Merge branch 'fix/tickets_list' into 'main'
corregidos problemas
See merge request jjimenez/safekat!771
|
2025-05-05 08:32:40 +00:00 |
|
|
|
7a119eb197
|
corregidos problemas
|
2025-05-05 10:32:09 +02:00 |
|
|
|
3f8b7981c7
|
Merge branch 'fix/add_merma_servicios_2' into 'main'
arreglado
See merge request jjimenez/safekat!770
|
2025-05-05 07:56:13 +00:00 |
|
|
|
fa6e9208a1
|
arreglado
|
2025-05-05 09:55:48 +02:00 |
|
|
|
1f1bd32fa4
|
Merge branch 'mod/smtp_produccion' into 'main'
Modificados parametros SMTP de SK para produccion
See merge request jjimenez/safekat!769
|
2025-05-05 07:44:28 +00:00 |
|
|
|
8100350e3b
|
Modificados parametros SMTP de SK para produccion
|
2025-05-05 09:44:04 +02:00 |
|
|
|
2af2dcdbb8
|
Merge branch 'feat/lg_maquinas_etiqueta_pedido' into 'main'
Feat/lg maquinas etiqueta pedido
See merge request jjimenez/safekat!768
|
2025-05-05 06:29:00 +00:00 |
|
|
|
1c581db4cf
|
add etiqueta envio maquina model and show in tarea card
|
2025-05-05 08:27:01 +02:00 |
|
|
|
b4dfdfa101
|
add ot_id in ots datatables
|
2025-05-05 08:07:17 +02:00 |
|
|
|
8cbe5a7051
|
fix papel ot color
|
2025-05-05 08:04:46 +02:00 |
|
|
|
46176adc70
|
fix show form cosido in ot task
|
2025-05-05 07:53:36 +02:00 |
|
|
|
67bac8f666
|
Merge branch 'add/impresion_etiquetas_footer' into 'main'
terminado
See merge request jjimenez/safekat!767
|
2025-05-05 05:43:11 +00:00 |
|
|
|
ba3f4ab43c
|
terminado
|
2025-05-05 07:42:27 +02:00 |
|
|
|
058857e51b
|
Merge branch 'feat/revision-ot-2' into 'main'
Feat/revision ot 2
See merge request jjimenez/safekat!766
|
2025-05-04 22:48:57 +00:00 |
|
|
|
5ce6859a2f
|
Merge branch 'main' into feat/revision-ot-2
|
2025-05-05 00:48:01 +02:00 |
|
|
|
2bfdd89085
|
Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat
|
2025-05-05 00:47:51 +02:00 |
|
|
|
305eea00e6
|
fichaje automatico y escaneo
|
2025-05-05 00:47:00 +02:00 |
|
|
|
8ea6128109
|
Merge branch 'add/interfaz_impresion_etiquetas' into 'main'
Add/interfaz impresion etiquetas
See merge request jjimenez/safekat!765
|
2025-05-04 16:37:34 +00:00 |
|
|
|
7b645539e3
|
terminado
|
2025-05-04 18:35:08 +02:00 |
|
|
|
fb7f2a28d9
|
revision ot v2
|
2025-05-04 17:25:53 +02:00 |
|
|
|
39639d9ff8
|
falta ordenar por cajas
|
2025-05-04 13:05:37 +02:00 |
|
|
|
3f90665c39
|
trabajando en la tabla de las lineas
|
2025-05-03 18:27:52 +02:00 |
|
|
|
71e70bf551
|
terminando a falta del listado añadir etiquetas
|
2025-05-03 12:06:25 +02:00 |
|
|
|
db70c57fb3
|
Merge branch 'main' into feat/preimpresion-revisada-check
|
2025-05-02 21:03:49 +02:00 |
|
|
|
91b044bbae
|
Merge branch 'main' of https://git.imnavajas.es/jjimenez/safekat
|
2025-05-02 21:03:33 +02:00 |
|
|
|
a88ffda50d
|
add revision preimpresion ot
|
2025-05-02 21:02:53 +02:00 |
|
|
|
746955c3b1
|
Merge branch 'feat/prod_dev_environment' into 'main'
Feat/prod dev environment
See merge request jjimenez/safekat!764
|
2025-05-02 10:56:25 +00:00 |
|
|
|
8ca0a40b2b
|
Añadida gestion de correos de pruebas en produccion
|
2025-05-02 11:54:11 +02:00 |
|
|
|
20c009f445
|
Añadida distincion visual para entorno de desarrollo
|
2025-05-02 11:29:19 +02:00 |
|
|
|
5138681718
|
feat/ot-datatable-news
|
2025-05-02 07:56:28 +02:00 |
|
|
|
9283059f9d
|
Merge branch 'fix/entrega_taller_bubok' into 'main'
corregido
See merge request jjimenez/safekat!763
|
2025-05-01 07:08:36 +00:00 |
|
|
|
b75278f449
|
corregido
|
2025-05-01 09:08:14 +02:00 |
|
|
|
3fb944ff97
|
Merge branch 'mod/importador_bubok' into 'main'
añadido ajuste de precio, url en comentarios y crear pedido y ot
See merge request jjimenez/safekat!762
|
2025-05-01 06:59:59 +00:00 |
|
|
|
c7250cb8fd
|
añadido ajuste de precio, url en comentarios y crear pedido y ot
|
2025-05-01 08:59:34 +02:00 |
|
|
|
7a9b2af8a6
|
Merge branch 'feat/ot-new-features' into 'main'
Features:
See merge request jjimenez/safekat!761
|
2025-05-01 04:16:42 +00:00 |
|
|
|
cf5a42de8d
|
Merge branch 'main' into feat/ot-new-features
|
2025-05-01 06:15:26 +02:00 |
|
|
|
a259d76e5e
|
ot new features
|
2025-05-01 06:02:22 +02:00 |
|
|
|
f696153d74
|
Merge branch 'fix/pliegos_presupuesto' into 'main'
terminado
See merge request jjimenez/safekat!760
|
2025-04-30 18:24:13 +00:00 |
|
|
|
9181905233
|
terminado
|
2025-04-30 20:23:45 +02:00 |
|
|
|
0ec7dff479
|
Merge branch 'feat/importador_bubok' into 'main'
Primera version del importador de Bubok
See merge request jjimenez/safekat!759
|
2025-04-30 13:39:21 +00:00 |
|
