|
|
1da50e9f01
|
Merge branch 'main' into 'feat/soporte'
Main
See merge request jjimenez/safekat!551
|
2025-02-19 13:02:31 +00:00 |
|
|
|
4576747ac1
|
Merge branch 'fix/preview_presu_cliente_solapas' into 'main'
arreglado
See merge request jjimenez/safekat!550
|
2025-02-19 09:55:05 +00:00 |
|
|
|
35c988a0be
|
arreglado
|
2025-02-19 10:52:45 +01:00 |
|
|
|
b22012d170
|
Merge branch 'fix/autonumeric-precio-tarifa-maquina-editor' into 'main'
add 6 decimal places precio tarifa impresion maquina
See merge request jjimenez/safekat!549
|
2025-02-18 18:34:14 +00:00 |
|
|
|
da7d768f36
|
add 6 decimal places precio tarifa impresion maquina
|
2025-02-18 19:33:24 +01:00 |
|
|
|
c905e7c005
|
Merge branch 'main' into 'feat/soporte'
Main
See merge request jjimenez/safekat!548
|
2025-02-18 11:13:37 +00:00 |
|
|
|
bd8ed62423
|
Merge branch 'fix/buscador_servicios' into 'main'
arreglado nombre de la table en el buscador del select2
See merge request jjimenez/safekat!547
|
2025-02-18 11:10:37 +00:00 |
|
|
|
878efb4378
|
arreglado nombre de la table en el buscador del select2
|
2025-02-18 12:10:09 +01:00 |
|
|
|
a8339390b8
|
Merge branch 'fix/comercial_presu_cliente_menu' into 'main'
corregidos permisos borrar en presupuestos
See merge request jjimenez/safekat!546
|
2025-02-18 11:01:10 +00:00 |
|
|
|
af9986f354
|
corregidos permisos borrar en presupuestos
|
2025-02-18 12:00:44 +01:00 |
|
|
|
2402ea2835
|
Merge branch 'fix/tapa_blanda_sin_solapas_quitaroffset' into 'main'
solucionado el problema
See merge request jjimenez/safekat!545
|
2025-02-18 10:29:24 +00:00 |
|
|
|
dd54c69aba
|
solucionado el problema
|
2025-02-18 11:28:51 +01:00 |
|
|
|
4beef3b0ae
|
Merge branch 'fix/margenes-maquinas-format' into 'main'
fix decimals number
See merge request jjimenez/safekat!544
|
2025-02-18 08:27:53 +00:00 |
|
|
|
4409ed8652
|
fix decimals number
|
2025-02-18 08:26:18 +00:00 |
|
|
|
3cdc38b822
|
terminadas respuesta. falta repasar todo y cabecera datatable y permisos menus y botones
|
2025-02-17 20:56:32 +01:00 |
|
|
|
809a705c88
|
terminado tickets. faltan respuestas 2
|
2025-02-16 18:58:38 +01:00 |
|
|
|
aff79ec3d6
|
terminado tickets. faltan respuestas
|
2025-02-16 18:52:56 +01:00 |
|
|
|
4a8aaf906c
|
trabajando en la lista de tickets
|
2025-02-15 17:54:49 +01:00 |
|
|
|
a616ec7ba7
|
trabajando en el formulario de añadir
|
2025-02-14 23:45:28 +01:00 |
|
|
|
b3cc82636d
|
empezada la estructura de tickets
|
2025-02-14 12:14:23 +01:00 |
|
|
|
eea415fb47
|
Merge branch 'fix/papel_especial_interior_cliente' into 'main'
corregido error en get papel especial interior
See merge request jjimenez/safekat!543
|
2025-02-13 18:02:19 +00:00 |
|
|
|
5045431b97
|
corregido error en get papel especial interior
|
2025-02-13 19:01:28 +01:00 |
|
|
|
8657218c7a
|
Merge branch 'fix/coser_hilo_admin' into 'main'
corregido error de la tarifa cosido
See merge request jjimenez/safekat!542
|
2025-02-12 18:02:19 +00:00 |
|
|
|
5b7493f3cf
|
corregido error de la tarifa cosido
|
2025-02-12 19:01:44 +01:00 |
|
|
|
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 |
|
