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
b0fb0f18fb
Primera version del importador de Bubok
2025-04-30 15:36:33 +02:00
cf4c4df80a
Features:
...
- Prototipo PDF
- Ferro PDF
- Ferro OK fecha cambiado a Ferro/Prototipo OK
- Comentarios para orden,impresion,cubierta,encuadernacion y logistica
- Migración para comentarios
- Tarifas acabado migraciones con campos para identificar mejor si es plastificado,plakene,retractilado y el tipo de cada uno
2025-04-30 09:23:37 +02:00
36c9227586
fix pdf tables encuadernacion. Add tarifa acabado configuration for ots
2025-04-30 01:25:24 +02:00
4e9dfb51c7
Merge branch 'fix/descuento_con_ajuste' into 'main'
...
arreglado
See merge request jjimenez/safekat!757
2025-04-29 18:03:58 +00:00
5aab9a33ac
arreglado
2025-04-29 20:03:02 +02:00
ea762a09c0
Merge branch 'fix/confirmar_presupuesto_ajustado' into 'main'
...
corregido
See merge request jjimenez/safekat!756
2025-04-29 17:56:28 +00:00
21014d029f
corregido
2025-04-29 19:56:08 +02:00
9c31f2bbc5
Merge branch 'add/configuracion_cliente_cambios_importador_catalogo' into 'main'
...
terminado
See merge request jjimenez/safekat!755
2025-04-29 17:33:59 +00:00
b288ca498c
terminado
2025-04-29 19:30:35 +02:00
96a6845c0c
Merge branch 'feat/importador_rama_2' into 'main'
...
Feat/importador rama 2
See merge request jjimenez/safekat!754
2025-04-29 15:10:55 +00:00
eed5c0994e
Importador rama con ajuste del precio
2025-04-29 17:09:19 +02:00
e2ab42cd84
Arreglado bug impresora de tickets (logistica)
2025-04-29 17:01:16 +02:00
7da76af866
Primera version del importador RAMA
2025-04-29 15:42:50 +02:00
bf1e66d746
Corregido bug en API imprimelibros
2025-04-29 12:40:35 +02:00
adccc414be
Merge branch 'fix/bugs-ot' into 'main'
...
Fix/bugs ot
See merge request jjimenez/safekat!752
2025-04-28 06:13:50 +00:00
95fa192cb9
remove ? from orden_trabajo pdf
2025-04-28 08:12:22 +02:00
9310d2dabd
delete class text-center from div.card otTask
2025-04-28 08:06:44 +02:00
3abf45ca6e
tiempo real tarea empty when created
2025-04-28 08:00:39 +02:00
6ea22066c2
Merge branch 'feat/festivos-calendar' into 'main'
...
Feat/festivos calendar
See merge request jjimenez/safekat!751
2025-04-28 00:11:16 +00:00
bf21a336b1
Merge branch 'main' into feat/festivos-calendar
2025-04-28 02:10:52 +02:00
d1e5731d1d
create POD dates pedido
2025-04-28 02:03:40 +02:00
029757bb40
add calendar festivos
2025-04-28 00:42:15 +02:00
bb4c9690b9
Merge branch 'feat/importador_rama' into 'main'
...
Feat/importador rama
See merge request jjimenez/safekat!750
2025-04-27 20:01:26 +00:00
6d45a950df
Trabajando JS
2025-04-27 22:00:52 +02:00
6f8890a8b1
Merge branch 'main' into 'feat/importador_rama'
...
Main
See merge request jjimenez/safekat!749
2025-04-27 18:56:08 +00:00
c093c01c00
Merge branch 'main' into feat/festivos-calendar
2025-04-27 19:30:31 +02:00
a4532a7ff6
Merge branch 'fix/filter-datatable-ot' into 'main'
...
Fix/filter datatable ot
See merge request jjimenez/safekat!748
2025-04-27 17:27:30 +00:00
31a12ff343
try catch getTiempoProcesamientoHHMM
2025-04-27 19:26:02 +02:00
1d6f5fe53e
default table encuadernacion
2025-04-27 19:24:11 +02:00
0b767c63e9
fix filter ferro
2025-04-27 19:13:06 +02:00
e464652fe2
festivo entity model
2025-04-27 19:01:23 +02:00
dd20f2a20e
Merge branch 'maquinista-change-user' into 'main'
...
Maquinista change user
See merge request jjimenez/safekat!747
2025-04-27 16:54:35 +00:00
97554bffc9
add maquinista change user session
2025-04-27 18:53:24 +02:00
73e9e941ed
Merge branch 'main' into maquinista-change-user
2025-04-27 12:25:09 +02:00
05720cf1ce
Merge branch 'fix/migrate' into 'main'
...
fix migrate class name
See merge request jjimenez/safekat!746
2025-04-27 10:20:33 +00:00
04e9e3ee6f
fix migrate class name
2025-04-27 12:18:20 +02:00
9804a6a927
change user session
2025-04-27 12:17:31 +02:00
3402e67fb2
Merge branch 'add/envio_ferros' into 'main'
...
Add/envio ferros
See merge request jjimenez/safekat!745
2025-04-27 10:14:05 +00:00
b1932e6f85
terminado envio de ferros
2025-04-27 12:12:52 +02:00
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
