|
|
dc4db78b76
|
Merge branch 'feat/printer-labels' of https://git.imnavajas.es/jjimenez/safekat into feat/printer-labels
|
2025-04-02 13:54:06 +02:00 |
|
|
|
41291c82fd
|
fx
|
2025-04-02 13:53:41 +02:00 |
|
|
|
69aa3f4837
|
Merge branch 'main' into feat/printer-labels
|
2025-04-02 13:50:34 +02:00 |
|
|
|
b4a835bbfd
|
fix ftp send printer command
|
2025-04-02 13:42:24 +02:00 |
|
|
|
ef79cc5c2e
|
Merge branch 'main' into 'feat/printer-labels'
Main
See merge request jjimenez/safekat!637
|
2025-04-02 10:14:38 +00:00 |
|
|
|
0f5e8a223b
|
Merge branch 'fix/importador_papel_diferente' into 'main'
corregido typo en papelInteriorDiferente
See merge request jjimenez/safekat!636
|
2025-04-02 08:22:33 +00:00 |
|
|
|
ecbd762c7f
|
corregido typo en papelInteriorDiferente
|
2025-04-02 10:22:11 +02:00 |
|
|
|
d42f46d280
|
etiqueta impresora
|
2025-04-02 08:16:58 +02:00 |
|
|
|
c2b61a3d99
|
Merge branch 'add/logistica_files' into 'main'
añadidos ficheros
See merge request jjimenez/safekat!635
|
2025-04-01 18:31:46 +00:00 |
|
|
|
babd832606
|
añadidos ficheros
|
2025-04-01 20:31:24 +02:00 |
|
|
|
210c87ab11
|
Merge branch 'add/vista_panel_logistica' into 'main'
añadido el panel (la vista)
See merge request jjimenez/safekat!634
|
2025-04-01 18:29:40 +00:00 |
|
|
|
efcda66c0b
|
añadido el panel (la vista)
|
2025-04-01 20:28:56 +02:00 |
|
|
|
ff4587333a
|
Merge branch 'mod/importador_presupuesto_gramajes_select' into 'main'
añadidos selects a los gramajes. si hay cambios se pone en naranja
See merge request jjimenez/safekat!633
|
2025-04-01 18:04:27 +00:00 |
|
|
|
121a29d493
|
añadidos selects a los gramajes. si hay cambios se pone en naranja
|
2025-04-01 20:04:05 +02:00 |
|
|
|
bb78f9cbd8
|
Merge branch 'fix/presupuesto_comentarios_pdf' into 'main'
Arreglada superposicion del footer con las observaciones del PDF
See merge request jjimenez/safekat!632
|
2025-04-01 08:06:56 +00:00 |
|
|
|
29245d45c4
|
Arreglada superposicion del footer con las observaciones del PDF
|
2025-04-01 10:06:28 +02:00 |
|
|
|
8a9df3a41a
|
Merge branch 'fix/ot-tareas-table-fk' into 'main'
Fix/ot tareas table fk
See merge request jjimenez/safekat!631
|
2025-03-31 19:01:17 +00:00 |
|
|
|
d44686607a
|
Merge branch 'main' into fix/ot-tareas-table-fk
|
2025-03-31 21:00:50 +02:00 |
|
|
|
432cc6be01
|
fix foreign keys set CASCADE constraint
|
2025-03-31 20:59:49 +02:00 |
|
|
|
04a2a44760
|
Merge branch 'feat/listados_cliente_form' into 'main'
Feat/listados cliente form
See merge request jjimenez/safekat!630
|
2025-03-31 18:45:18 +00:00 |
|
|
|
3cb512d93a
|
añadidos presupuestos en cliente
|
2025-03-31 20:42:14 +02:00 |
|
|
|
fb2d12e318
|
con totales
|
2025-03-31 17:31:56 +02:00 |
|
|
|
c5feb39e8b
|
Merge branch 'feat/listados_cliente_form' of https://git.imnavajas.es/jjimenez/safekat into feat/listados_cliente_form
|
2025-03-31 09:58:06 +02:00 |
|
|
|
d5534269b3
|
añadido facturas. faltan filtros pedidos
|
2025-03-31 09:57:45 +02:00 |
|
|
|
dde339ad44
|
Merge branch 'main' into 'feat/listados_cliente_form'
Main
See merge request jjimenez/safekat!629
|
2025-03-31 07:48:41 +00:00 |
|
|
|
cdc4bf6fcd
|
Merge branch 'feat/corte-ot-planning' into 'main'
toggle corte rotativa planning
See merge request jjimenez/safekat!628
|
2025-03-31 07:06:51 +00:00 |
|
|
|
460cb0344f
|
toggle corte rotativa planning
|
2025-03-31 09:05:03 +02:00 |
|
|
|
c7fdd1a9a3
|
Merge branch 'fix/sk-7/bugs' into 'main'
Fix/sk 7/bugs
See merge request jjimenez/safekat!627
|
2025-03-30 22:22:34 +00:00 |
|
|
|
c65c6571cd
|
Merge branch 'main' into fix/sk-7/bugs
|
2025-03-31 00:19:12 +02:00 |
|
|
|
ba0ad10935
|
fix bugs sk-7
|
2025-03-31 00:17:49 +02:00 |
|
|
|
e1fa993fcd
|
añadido facturas. faltan filtros pedidos
|
2025-03-30 21:36:17 +02:00 |
|
|
|
4991642d48
|
feat delete portada and remove loader
|
2025-03-30 19:30:30 +02:00 |
|
|
|
053ce49279
|
fix encuadernacion pliegos ot pdf and tareas maquinas primera
|
2025-03-30 18:20:05 +02:00 |
|
|
|
bc969828b9
|
ot pdf download
|
2025-03-30 14:22:43 +02:00 |
|
|
|
f553641818
|
Merge branch 'fix/varios_presupuesto_admin' into 'main'
arreglado calculo de credito total y vista en euros del toast del total de presupuesto en admin
See merge request jjimenez/safekat!626
|
2025-03-30 08:30:08 +00:00 |
|
|
|
5a5ce4835b
|
arreglado calculo de credito total y vista en euros del toast del total de presupuesto en admin
|
2025-03-30 10:29:38 +02:00 |
|
|
|
4810ab99c1
|
Merge branch 'fix/calculo_creditos_presupuesto' into 'main'
arreglado problema con el resumen y valores totales a la hora de crear presupuestr
See merge request jjimenez/safekat!625
|
2025-03-29 13:04:25 +00:00 |
|
|
|
18f391a733
|
arreglado problema con el resumen y valores totales a la hora de crear presupuestr
|
2025-03-29 14:03:56 +01:00 |
|
|
|
1bd27776f4
|
Merge branch 'add/tabla_credito_presupuesto' into 'main'
Add/tabla credito presupuesto
See merge request jjimenez/safekat!624
|
2025-03-29 10:32:27 +00:00 |
|
|
|
30a6de5e75
|
Merge branch 'main' into 'add/tabla_credito_presupuesto'
Main
See merge request jjimenez/safekat!623
|
2025-03-29 10:31:40 +00:00 |
|
|
|
d1a9aaac77
|
añadida tabla de credito al presupuesto
|
2025-03-29 11:31:03 +01:00 |
|
|
|
e520b5b621
|
Merge branch 'feat/sk-7/planning' into 'main'
Feat/sk 7/planning
See merge request jjimenez/safekat!622
|
2025-03-29 10:09:22 +00:00 |
|
|
|
50cd951755
|
Merge branch 'main' into feat/sk-7/planning
|
2025-03-29 11:08:34 +01:00 |
|
|
|
8c64b678fe
|
planning plana
|
2025-03-29 11:07:36 +01:00 |
|
|
|
8d289fde15
|
Merge branch 'fix/tarifas_encuadernacion_view' into 'main'
arreglado form de tarifas enc
See merge request jjimenez/safekat!621
|
2025-03-28 12:29:27 +00:00 |
|
|
|
c4b1620c1b
|
arreglado form de tarifas enc
|
2025-03-28 13:29:01 +01:00 |
|
|
|
adfa8bc465
|
Merge branch 'add/calculo_credito_cliente' into 'main'
Add/calculo credito cliente
See merge request jjimenez/safekat!620
|
2025-03-27 23:53:07 +00:00 |
|
|
|
33ce64df0f
|
terminada revision de pedidos
|
2025-03-28 00:52:49 +01:00 |
|
|
|
0e91105f68
|
Merge branch 'main' into 'add/calculo_credito_cliente'
Main
See merge request jjimenez/safekat!619
|
2025-03-27 16:54:12 +00:00 |
|
|
|
06bd6d4870
|
Merge branch 'mod/add_pedidos_facturas_produccion' into 'main'
modificado select de añadir pedidos en facturas
See merge request jjimenez/safekat!618
|
2025-03-27 16:39:06 +00:00 |
|
