Commit Graph

1718 Commits

Author SHA1 Message Date
f270b6dee8 wiki 2025-02-22 20:56:06 +01:00
339c979ded Merge branch 'main' into feat/wiki 2025-02-22 07:26:52 +01:00
e7088b635a fix toast presupuesto 2025-02-22 07:15:49 +01:00
def7539710 Merge branch 'fix/comparador_rotativa_admin' into 'main'
arreglado problemas rotativa y comparador rotativa

See merge request jjimenez/safekat!564
2025-02-21 16:26:33 +00:00
6264dbe17e arreglado problemas rotativa y comparador rotativa 2025-02-21 17:26:07 +01:00
755b12e830 Merge branch 'dev/api_il_2' into 'main'
Dev/api il 2

See merge request jjimenez/safekat!563
2025-02-21 13:04:40 +00:00
83dedefa23 Merge branch 'main' into 'dev/api_il_2'
Main

See merge request jjimenez/safekat!562
2025-02-21 13:03:55 +00:00
feea7d7437 Implementacion API IL guardar 2025-02-21 14:02:47 +01:00
c666925101 Merge branch 'fix/factor' into 'main'
Fix/factor

See merge request jjimenez/safekat!561
2025-02-20 19:45:49 +00:00
068a2307bc arreglado 2025-02-20 20:45:33 +01:00
9329aececc solucionado 2025-02-20 20:28:29 +01:00
9311c7b9ae Merge branch 'mod/texto_coste_maquina' into 'main'
arreglado factor resumen y cambiado texto

See merge request jjimenez/safekat!560
2025-02-20 19:25:10 +00:00
851b224149 arreglado factor resumen y cambiado texto 2025-02-20 20:24:54 +01:00
627d59444b Merge branch 'fix/costes_impresion_rot_resumen' into 'main'
corregido

See merge request jjimenez/safekat!559
2025-02-20 19:13:40 +00:00
8c771d9779 corregido 2025-02-20 20:13:20 +01:00
e32a5e4820 Merge branch 'fix/tarifas_extra_presu_cliente' into 'main'
Fix/tarifas extra presu cliente

See merge request jjimenez/safekat!558
2025-02-20 19:00:25 +00:00
ad0f5d4234 solucionado problema en getdata en resumen y totalizador coste maquina 2025-02-20 20:00:06 +01:00
ebaf4364ac resuelto el problema de los servicios acabado 2025-02-20 19:19:43 +01:00
bff5830c9b Merge branch 'mod/horas_maquinas_a_margen' into 'main'
terminado

See merge request jjimenez/safekat!557
2025-02-20 18:01:58 +00:00
91796e993c terminado 2025-02-20 19:01:16 +01:00
091088085c Merge branch 'dev/api_il_2' of https://git.imnavajas.es/jjimenez/safekat into dev/api_il_2 2025-02-20 12:06:44 +01:00
e81dc3f88f Refector 2025-02-20 12:06:21 +01:00
9d423c7fa9 Merge branch 'main' into 'dev/api_il_2'
create migration to add check_presupuesto_cliente column to tarifas tables...

See merge request jjimenez/safekat!556
2025-02-20 10:58:11 +00:00
cf74749889 Merge branch 'feat/soporte' into 'main'
Feat/soporte

See merge request jjimenez/safekat!555
2025-02-20 09:51:16 +00:00
fdd5076920 añadida validacion 2025-02-20 10:50:23 +01:00
b0c2beb334 Merge branch 'main' into 'feat/soporte'
create migration to add check_presupuesto_cliente column to tarifas tables...

See merge request jjimenez/safekat!554
2025-02-20 08:59:47 +00:00
a3cf44d405 Merge branch 'fix/toast-width-total-presupuesto' into 'main'
reduce size toast total presupuesto

See merge request jjimenez/safekat!553
2025-02-20 07:37:07 +00:00
e76540ab52 reduce size toast total presupuesto 2025-02-20 08:36:39 +01:00
4fee73229b Merge branch 'feat/add-check-cliente-tarifa-extra' into 'main'
create migration to add check_presupuesto_cliente column to tarifas tables...

See merge request jjimenez/safekat!552
2025-02-20 07:25:32 +00:00
1af261eff9 add mostrar_presupuesto_cliente field in tarifas extra y preimpresion 2025-02-20 08:24:01 +01:00
84e7bf3dbb Resolviendo bugs para integracion end2end de IL 2025-02-19 22:04:51 +01:00
b6decf8657 terminado 2025-02-19 21:35:55 +01:00
fea409b5ad haciendo el buscador 2025-02-19 15:00:20 +01:00
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
1ea00b5522 editorjs 2025-02-18 08:15:26 +00:00
4b1092df5f editorjs 2025-02-18 08:15:14 +00:00
3cdc38b822 terminadas respuesta. falta repasar todo y cabecera datatable y permisos menus y botones 2025-02-17 20:56:32 +01:00