Commit Graph

551 Commits

Author SHA1 Message Date
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
0ecd18f5ff fix btn cancel fa 2025-05-05 11:22:41 +02:00
7a119eb197 corregidos problemas 2025-05-05 10:32:09 +02:00
fa6e9208a1 arreglado 2025-05-05 09:55:48 +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
b4dfdfa101 add ot_id in ots datatables 2025-05-05 08:07:17 +02:00
ba3f4ab43c terminado 2025-05-05 07:42:27 +02: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
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
a88ffda50d add revision preimpresion ot 2025-05-02 21:02:53 +02:00
5138681718 feat/ot-datatable-news 2025-05-02 07:56:28 +02: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
9181905233 terminado 2025-04-30 20:23:45 +02: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
5aab9a33ac arreglado 2025-04-29 20:03:02 +02:00
b288ca498c terminado 2025-04-29 19:30:35 +02:00
eed5c0994e Importador rama con ajuste del precio 2025-04-29 17:09:19 +02:00
7da76af866 Primera version del importador RAMA 2025-04-29 15:42:50 +02:00
bf21a336b1 Merge branch 'main' into feat/festivos-calendar 2025-04-28 02:10:52 +02:00
029757bb40 add calendar festivos 2025-04-28 00:42:15 +02: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
97554bffc9 add maquinista change user session 2025-04-27 18:53:24 +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
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
0e444295e3 trabajando en el formulario envio de ferros 2025-04-27 09:51:04 +02:00
ff115f4f20 Configurando logica de captacion del Excel 2025-04-27 09:16:15 +02:00
ae456c8890 Implementado script principal 2025-04-27 00:00:58 +02:00
7f31e65960 subidos ficheros 2025-04-26 18:08:41 +02:00
25b6d14423 falta boton borrar albaranes! 2025-04-26 14:16:32 +02: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
5e8a7f8bd4 terminado 2025-04-26 09:54:56 +02:00
151e4a2d7a cambios 2025-04-25 17:50:30 +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