|
|
30c5b06d3d
|
update progress based on task time and task date
|
2025-05-06 08:30:01 +02:00 |
|
|
|
aac8ab24be
|
Merge branch 'feat/ot-pdf-zip' into 'main'
Feat/ot pdf zip
See merge request jjimenez/safekat!785
|
2025-05-05 19:01:26 +00:00 |
|
|
|
99ffe1f462
|
Merge branch 'main' into feat/ot-pdf-zip
|
2025-05-05 21:00:33 +02:00 |
|
|
|
caac71a48d
|
zip pdf download
|
2025-05-05 20:59:57 +02:00 |
|
|
|
478077721b
|
Merge branch 'fix/varios' into 'main'
Fix/varios
See merge request jjimenez/safekat!784
|
2025-05-05 18:14:05 +00:00 |
|
|
|
10b5ae911a
|
Añadidas mejoras propuestas por Manolo a la importacion de RAMA
|
2025-05-05 20:13:59 +02:00 |
|
|
|
43fef3a1a0
|
Merge branch 'fix/impresion_titulos' into 'main'
Fix/impresion titulos
See merge request jjimenez/safekat!783
|
2025-05-05 17:45:32 +00:00 |
|
|
|
c6fb4b3213
|
terminado
|
2025-05-05 19:42:45 +02:00 |
|
|
|
247fa7e6f9
|
prueba2
|
2025-05-05 19:36:33 +02:00 |
|
|
|
21e907ad50
|
prueba
|
2025-05-05 19:27:17 +02:00 |
|
|
|
bf146d4024
|
Revision de la entidad de catalogo libros
|
2025-05-05 18:53:44 +02:00 |
|
|
|
68a39bd749
|
Merge branch 'mod/servicios' into 'main'
terminado
See merge request jjimenez/safekat!782
|
2025-05-05 16:52:39 +00:00 |
|
|
|
514905ff47
|
terminado
|
2025-05-05 18:52:16 +02:00 |
|
|
|
75f06c44a1
|
Añadida opcion 'uso' en las queries de catalogo
|
2025-05-05 18:38:30 +02:00 |
|
|
|
4120ded07b
|
Renombrado importador desde catalogo a RA-MA
|
2025-05-05 17:37:07 +02:00 |
|
|
|
24fc4ff1c1
|
Merge branch 'fix/pod_nohq_negro_enviobase' into 'main'
ahora el pod puede ser negro estandar. Para presupuestos no importados, si...
See merge request jjimenez/safekat!781
|
2025-05-05 15:35:59 +00:00 |
|
|
|
899365f2c2
|
Puesto en grupo beta opcion Catalogo -> Importar
|
2025-05-05 17:35:22 +02:00 |
|
|
|
302d12da1e
|
ahora el pod puede ser negro estandar. Para presupuestos no importados, si no_envio_base no se añade
|
2025-05-05 17:34:51 +02:00 |
|
|
|
659d1d17ea
|
Merge branch 'fix/remove_button_imposiciones' into 'main'
quitado el boton en las nuevas
See merge request jjimenez/safekat!779
|
2025-05-05 14:32:15 +00:00 |
|
|
|
ff5d853032
|
quitado el boton en las nuevas
|
2025-05-05 16:31:55 +02:00 |
|
|
|
ba6f92b3e6
|
Merge branch 'mod/ordenar_menus' into 'main'
Modificaciones
See merge request jjimenez/safekat!778
|
2025-05-05 14:31:12 +00:00 |
|
|
|
1ebc22c74b
|
Modificaciones
|
2025-05-05 16:30:11 +02:00 |
|
|
|
785b9ea693
|
Merge branch 'mod/etiquetas_embalaje' into 'main'
cambiado el campo cajas
See merge request jjimenez/safekat!777
|
2025-05-05 14:23:49 +00:00 |
|
|
|
d2c6d131b3
|
cambiado el campo cajas
|
2025-05-05 16:23:12 +02:00 |
|
|
|
df1f003cbd
|
Merge branch 'fix/imposicion-form' into 'main'
Fix/imposicion form
See merge request jjimenez/safekat!776
|
2025-05-05 12:33:36 +00:00 |
|
|
|
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 |
|
