|
|
3f7e95322c
|
Merge branch 'add/guardas_negro_hq' into 'main'
añadida posibilidad de guardas negrohq
See merge request jjimenez/safekat!541
|
2025-02-11 18:03:40 +00:00 |
|
|
|
b8b5d5f69b
|
añadida posibilidad de guardas negrohq
|
2025-02-11 19:03:15 +01:00 |
|
|
|
7066a63254
|
Merge branch 'fix/merma_POD_presuadmin' into 'main'
Fix/merma pod presuadmin
See merge request jjimenez/safekat!540
|
2025-02-10 19:01:49 +00:00 |
|
|
|
10d5c286a6
|
añadido calcular mermas en el draw de la slineas presupuesto
|
2025-02-10 20:01:21 +01:00 |
|
|
|
343899013f
|
error en faja.getVal(). error en gramaje guardas
|
2025-02-10 19:48:35 +01:00 |
|
|
|
c1509baef9
|
Merge branch 'fix/guardas_sin_impresion' into 'main'
arreglado guardas sin impresion. arreglado error en comparador para evitar...
See merge request jjimenez/safekat!539
|
2025-02-10 17:53:20 +00:00 |
|
|
|
77adb8ac37
|
Merge branch 'main' into 'fix/guardas_sin_impresion'
Main
See merge request jjimenez/safekat!538
|
2025-02-10 17:53:03 +00:00 |
|
|
|
bf987a7ce3
|
arreglado guardas sin impresion. arreglado error en comparador para evitar cuando se carga. Corregidos decimales en presu cliente tarjeta tiradas
|
2025-02-10 18:52:14 +01:00 |
|
|
|
84a1b3cf98
|
Merge branch 'fix/login-redirect' into 'main'
fix xmlhttprequest
See merge request jjimenez/safekat!537
|
2025-02-10 17:17:05 +00:00 |
|
|
|
97a05d5568
|
fix xmlhttprequest
|
2025-02-10 18:16:16 +01:00 |
|
|
|
32a80370d9
|
Merge branch 'fix/login-redirect' into 'main'
fix login redirect ajax request
See merge request jjimenez/safekat!536
|
2025-02-10 17:14:03 +00:00 |
|
|
|
49a1904eae
|
fix login redirect ajax request
|
2025-02-10 18:11:46 +01:00 |
|
|
|
3b80471773
|
Merge branch 'fix/autonumeric-tintas-datatable' into 'main'
Fix/autonumeric tintas datatable
See merge request jjimenez/safekat!535
|
2025-02-10 08:48:33 +00:00 |
|
|
|
0457ac97eb
|
fix autonumeric datatable & editor datatable consumo tintas
|
2025-02-10 09:47:55 +01:00 |
|
|
|
977cdeb12b
|
delete is deleted column
|
2025-02-10 09:42:48 +01:00 |
|
|
|
73d8c919bc
|
Merge branch 'fix/sk-12' into 'main'
Fix/sk 12
See merge request jjimenez/safekat!534
|
2025-02-10 08:35:46 +00:00 |
|
|
|
071d386d36
|
redirect notification message to model edit form
|
2025-02-10 09:32:48 +01:00 |
|
|
|
41783f5b25
|
fix message cliente direct from model js
|
2025-02-10 07:56:48 +01:00 |
|
|
|
0d2a57592c
|
remove is_deleted
|
2025-02-10 07:26:27 +01:00 |
|
|
|
a07e68a603
|
Merge branch 'add/mostrar_lomo_cubierta' into 'main'
añadidos lomos en resumen lateral y final. Arreglado tb alto de preview en presupuesto admin
See merge request jjimenez/safekat!533
|
2025-02-09 14:21:01 +00:00 |
|
|
|
7b7e386ffd
|
añadidos lomos en resumen lateral y final. Arreglado tb alto de preview en presupuesto admin
|
2025-02-09 15:20:31 +01:00 |
|
|
|
e8145888c9
|
Merge branch 'fix/cambio_cubierta_guardar_valores' into 'main'
Fix/cambio cubierta guardar valores
See merge request jjimenez/safekat!532
|
2025-02-09 12:31:56 +00:00 |
|
|
|
5475fd8ad9
|
Merge branch 'fix/cambio_cubierta_guardar_valores' of https://git.imnavajas.es/jjimenez/safekat into fix/cambio_cubierta_guardar_valores
|
2025-02-09 13:31:22 +01:00 |
|
|
|
206a5e0cca
|
Merge branch 'main' into 'fix/cambio_cubierta_guardar_valores'
Main
See merge request jjimenez/safekat!531
|
2025-02-09 12:31:15 +00:00 |
|
|
|
b496553e09
|
solucionado el problema que se perdia la config cuando se cambiaba el tipo de cubierta
|
2025-02-09 13:31:13 +01:00 |
|
|
|
383c51ee1e
|
Merge branch 'refactor/sk-12-21' into 'main'
Refactor/sk 12 21
See merge request jjimenez/safekat!530
|
2025-02-09 12:25:48 +00:00 |
|
|
|
ff92691a07
|
Merge branch 'main' into refactor/sk-12-21
|
2025-02-09 13:24:55 +01:00 |
|
|
|
8cbcd3ccb7
|
change Chat text to Mensajes Clientes
|
2025-02-09 13:22:59 +01:00 |
|
|
|
363976833c
|
Merge branch 'mod/papel_seleccionable_sobre_guardas' into 'main'
papel y gramaje sobrecubierta y guardas seleccionable
See merge request jjimenez/safekat!529
|
2025-02-09 12:16:23 +00:00 |
|
|
|
348dda9cd1
|
papel y gramaje sobrecubierta y guardas seleccionable
|
2025-02-09 13:16:03 +01:00 |
|
|
|
9b7c6c4ec1
|
add autonumeric format & fix editor btn in tarifa impresion maquina
|
2025-02-09 13:12:37 +01:00 |
|
|
|
3efec5e6cb
|
add autonumeric to number cells of datatables and editorDatatable
|
2025-02-09 12:40:52 +01:00 |
|
|
|
816a321e1a
|
format autonumeric column total_tirada
|
2025-02-09 12:35:38 +01:00 |
|
|
|
8105388563
|
fix column total_presupuesto for autonumeric format
|
2025-02-09 12:34:10 +01:00 |
|
|
|
c3791ac343
|
fix render in column total_presupuesto for autonumeric format
|
2025-02-09 12:31:38 +01:00 |
|
|
|
eb722ebbca
|
autonumeric format in tableOfTarifaencuadernacionlineasHoras
|
2025-02-09 12:28:34 +01:00 |
|
|
|
aebc38a126
|
tarifa acabo lineas format number datatable
|
2025-02-09 12:14:34 +01:00 |
|
|
|
ad8bdb7d5e
|
Merge branch 'main' into refactor/sk-21
|
2025-02-09 12:06:24 +01:00 |
|
|
|
5db68ed991
|
Merge branch 'add/mensaje_acabados_cliente' into 'main'
añadido mensaje para avisar de la cubierta sin acabado
See merge request jjimenez/safekat!528
|
2025-02-09 09:07:52 +00:00 |
|
|
|
32398d8742
|
añadido mensaje para avisar de la cubierta sin acabado
|
2025-02-09 10:07:27 +01:00 |
|
|
|
f532c79b27
|
add format number in datatables
|
2025-02-09 00:25:52 +01:00 |
|
|
|
cf6d4318c3
|
Merge branch 'add/ducplicar_presu_cliente' into 'main'
añadido botón duplicar presupuesto en cliente
See merge request jjimenez/safekat!527
|
2025-02-08 21:34:53 +00:00 |
|
|
|
5ad2fcd566
|
añadido botón duplicar presupuesto en cliente
|
2025-02-08 22:34:31 +01:00 |
|
|
|
21a4e5b8bd
|
Merge branch 'main' into refactor/sk-21
|
2025-02-08 19:04:18 +01:00 |
|
|
|
a138330e24
|
Merge branch 'fix/guardas_presupuesto_admin' into 'main'
arreglado problema con las guardas y solicitudes comparador
See merge request jjimenez/safekat!526
|
2025-02-06 18:37:17 +00:00 |
|
|
|
09683d9be5
|
arreglado problema con las guardas y solicitudes comparador
|
2025-02-06 19:36:48 +01:00 |
|
|
|
6cc9045eb4
|
Merge branch 'fix/cargando_comparador' into 'main'
solucionado el problema
See merge request jjimenez/safekat!525
|
2025-02-06 10:16:43 +00:00 |
|
|
|
82537d9806
|
solucionado el problema
|
2025-02-06 11:16:12 +01:00 |
|
|
|
04e5090095
|
Merge branch 'fix/fileUploadDropzone' into 'main'
fix initialization of fileUploadDropzone
See merge request jjimenez/safekat!524
|
2025-02-06 10:09:59 +00:00 |
|
|
|
bddd99cec0
|
fix initialization of fileUploadDropzone
|
2025-02-06 11:08:54 +01:00 |
|
