|
|
4adc124ca2
|
añadidos ficheros nuevos
|
2025-02-26 21:11:41 +01:00 |
|
|
|
794e549abc
|
Merge branch 'add/serv_acabado_desdoblados' of https://git.imnavajas.es/jjimenez/safekat into add/serv_acabado_desdoblados
|
2025-02-26 21:10:57 +01:00 |
|
|
|
34378e0d93
|
servicios desdoblados en presupuesto admin
|
2025-02-26 21:09:39 +01:00 |
|
|
|
3204d550b7
|
Merge branch 'main' into 'add/serv_acabado_desdoblados'
Main
See merge request jjimenez/safekat!572
|
2025-02-26 08:18:27 +00:00 |
|
|
|
4bf8018c65
|
Merge branch 'fix/presupuesto_pdf_fb' into 'main'
Fix/presupuesto pdf fb
See merge request jjimenez/safekat!571
|
2025-02-26 07:33:51 +00:00 |
|
|
|
26980297ed
|
Merge branch 'main' into 'fix/presupuesto_pdf_fb'
Main
See merge request jjimenez/safekat!570
|
2025-02-26 07:25:59 +00:00 |
|
|
|
0b786d42a7
|
Merge branch 'fix/messages' into 'main'
fix datatable messages
See merge request jjimenez/safekat!569
|
2025-02-26 07:19:16 +00:00 |
|
|
|
ae561d1e19
|
fix datatable messages
|
2025-02-26 08:11:12 +01:00 |
|
|
|
30e1561a0b
|
trabajando en el edit
|
2025-02-25 21:31:32 +01:00 |
|
|
|
ff59207d4c
|
arreglado merma pod
|
2025-02-25 17:15:31 +01:00 |
|
|
|
fcd6adebb7
|
Implementacion de feedback JM sobre presupuestos
|
2025-02-25 15:36:11 +01:00 |
|
|
|
fbfa70a734
|
realizada la lista
|
2025-02-24 20:59:32 +01:00 |
|
|
|
4601b15abe
|
realizada la lista
|
2025-02-24 20:59:21 +01:00 |
|
|
|
c1cae0fcf7
|
añadida migracion y modelo, entidad y controlador basicos
|
2025-02-24 09:59:35 +01:00 |
|
|
|
c5f1f0e55a
|
Merge branch 'fix/confirmar_presupuesto' into 'main'
Fix/confirmar presupuesto
See merge request jjimenez/safekat!568
|
2025-02-23 20:26:12 +00:00 |
|
|
|
dc92e352b9
|
resuelto problema al confirmar presupuesto precio distinto
|
2025-02-23 21:25:53 +01:00 |
|
|
|
046c31eb62
|
resolviendo el problema
|
2025-02-23 19:41:35 +01:00 |
|
|
|
d347c9187b
|
Merge branch 'feat/presupuestos_pdf' into 'main'
Revisada la generacion de presupuestos en PDf
See merge request jjimenez/safekat!567
|
2025-02-22 22:26:47 +00:00 |
|
|
|
0f7fa4a809
|
Revisada la generacion de presupuestos en PDf
|
2025-02-22 23:25:52 +01:00 |
|
|
|
190037f9df
|
Merge branch 'mod/serv_defecto_admin' into 'main'
quitado el botón de servicios defecto. Se añaden automaticamente cuando se crea
See merge request jjimenez/safekat!566
|
2025-02-22 18:26:12 +00:00 |
|
|
|
73980295da
|
quitado el botón de servicios defecto. Se añaden automaticamente cuando se crea
|
2025-02-22 19:25:19 +01:00 |
|
|
|
03870cf133
|
Merge branch 'fix/toast' into 'main'
fix toast presupuesto
See merge request jjimenez/safekat!565
|
2025-02-22 06:26:20 +00: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 |
|
