|
|
bf49d601cf
|
fix dropzone when presupuesto is borrador
|
2025-01-28 20:27:15 +01:00 |
|
|
|
22f78363cb
|
Merge branch 'main' into feat/sk-20
|
2025-01-28 19:04:21 +01:00 |
|
|
|
6f016dda6d
|
Merge branch 'fix/presu_admin_errors' into 'main'
arreglado el preview de rotativa a color del admin y restaurado el...
See merge request jjimenez/safekat!496
|
2025-01-28 17:48:01 +00:00 |
|
|
|
e87e278dd0
|
modificados todos los buscadores de papeles y gramajes para ver el alto y el ancho (admin y cliente)
|
2025-01-28 18:47:20 +01:00 |
|
|
|
2df3f5914e
|
resueltos errores con la rotativa. Quitado retractilado de cubierta cliente y Ninguno por defecto en acabados
|
2025-01-27 18:45:38 +01:00 |
|
|
|
8417c2401f
|
quitado el 2 que usaba el muiltiplicador
|
2025-01-24 09:56:07 +01:00 |
|
|
|
2e1a6222ef
|
arreglado el preview de rotativa a color del admin y restaurado el multiplicador en getcosteslineasrotativa
|
2025-01-24 09:05:11 +01:00 |
|
|
|
d219237440
|
Merge branch 'fix/preview_isCosido' into 'main'
arreglado el error en la vista
See merge request jjimenez/safekat!495
|
2025-01-23 22:38:33 +00:00 |
|
|
|
900400f494
|
arreglado el error en la vista
|
2025-01-23 23:38:11 +01:00 |
|
|
|
19220ab985
|
sk-20 : add form files to presupuesto admin
|
2025-01-23 20:25:28 +01:00 |
|
|
|
910df7b822
|
Merge branch 'mod/exceso_solapas_cubierta_sobrecubierta' into 'main'
Mod/exceso solapas cubierta sobrecubierta
See merge request jjimenez/safekat!494
|
2025-01-23 13:30:32 +00:00 |
|
|
|
9619dfbfb5
|
Merge branch 'main' into 'mod/exceso_solapas_cubierta_sobrecubierta'
Main
See merge request jjimenez/safekat!493
|
2025-01-23 13:30:04 +00:00 |
|
|
|
0d3ea391d7
|
falta calcular maximo solapas
|
2025-01-23 14:26:51 +01:00 |
|
|
|
25040ad6b5
|
Merge branch 'fix/sk-19' into 'main'
refactor upload files from stp side
See merge request jjimenez/safekat!492
|
2025-01-23 10:48:30 +00:00 |
|
|
|
98d8d45899
|
Merge branch 'main' into 'mod/exceso_solapas_cubierta_sobrecubierta'
Main
See merge request jjimenez/safekat!491
|
2025-01-23 09:54:38 +00:00 |
|
|
|
a32b8befcb
|
cambiados servicios de solapas en el presupuesto cliente
|
2025-01-23 10:49:08 +01:00 |
|
|
|
330d1c7a4f
|
refactor upload files from stp side
|
2025-01-23 10:36:15 +01:00 |
|
|
|
1c3f045488
|
Merge branch 'fix/tarifa-maquina-form' into 'main'
hide in tarifa-maquinas form when form is add
See merge request jjimenez/safekat!490
|
2025-01-23 00:09:36 +00:00 |
|
|
|
cb661b55ac
|
hide in tarifa-maquinas form when form is add
|
2025-01-23 01:08:40 +01:00 |
|
|
|
36107bd825
|
Merge branch 'fix/tarifa-maquina-form' into 'main'
fix js in tarifa new form
See merge request jjimenez/safekat!489
|
2025-01-22 23:51:58 +00:00 |
|
|
|
66d90ac15b
|
fix js in tarifa new form
|
2025-01-23 00:51:01 +01:00 |
|
|
|
c6b7505f1b
|
corregido error get lineas (no incluia el nombre del papel generico 3
|
2025-01-23 00:13:34 +01:00 |
|
|
|
b315a44c9a
|
corregido error get lineas (no incluia el nombre del papel generico 2
|
2025-01-23 00:03:02 +01:00 |
|
|
|
e05e807b65
|
corregido error get lineas (no incluia el nombre del papel generico
|
2025-01-23 00:02:24 +01:00 |
|
|
|
dd2f19b86c
|
corregido error getlineaspresupuesto
|
2025-01-22 23:49:31 +01:00 |
|
|
|
0f9395115f
|
modificando presupuestos. falta preguntar si añadir solapas (cubierta) y solapas (sobrecubierta)
|
2025-01-22 23:43:19 +01:00 |
|
|
|
f9b84fa443
|
Merge branch 'main' into 'mod/exceso_solapas_cubierta_sobrecubierta'
quitada la condicion que comprobaba que los papeles tenian el mismo gramaje...
See merge request jjimenez/safekat!488
|
2025-01-22 17:48:43 +00:00 |
|
|
|
4d343ec59c
|
Merge branch 'fix/add_papel_maquina_error_mismo_gramaje' into 'main'
quitada la condicion que comprobaba que los papeles tenian el mismo gramaje...
See merge request jjimenez/safekat!487
|
2025-01-22 17:48:04 +00:00 |
|
|
|
bd9764ffab
|
quitada la condicion que comprobaba que los papeles tenian el mismo gramaje para seleccionarlos dentro de una máquina
|
2025-01-22 18:47:35 +01:00 |
|
|
|
c40945f91a
|
Merge branch 'feat/sk-18' into 'main'
Feat/sk 18
See merge request jjimenez/safekat!486
|
2025-01-22 16:45:33 +00:00 |
|
|
|
ecd280928e
|
add js duplicate functionality
|
2025-01-22 17:44:46 +01:00 |
|
|
|
e37dbe85a2
|
add duplicate button and modal form
|
2025-01-22 17:44:16 +01:00 |
|
|
|
bc02e3f2bb
|
add MaquinaService class
|
2025-01-22 17:44:05 +01:00 |
|
|
|
1a05fe762a
|
add new translations
|
2025-01-22 17:43:42 +01:00 |
|
|
|
3bcd9466c6
|
add method to get relations
|
2025-01-22 17:43:28 +01:00 |
|
|
|
eb692a121e
|
add duplicate method
|
2025-01-22 17:43:16 +01:00 |
|
|
|
92298cf5f1
|
add maquina_duplicate rule
|
2025-01-22 17:43:07 +01:00 |
|
|
|
36a0f018ae
|
add maquina service
|
2025-01-22 17:42:59 +01:00 |
|
|
|
93c350ed5c
|
add duplicate route for maquinas
|
2025-01-22 17:42:51 +01:00 |
|
|
|
18c267ce04
|
int is not a valid validation rule, changed to integer
|
2025-01-22 17:39:39 +01:00 |
|
|
|
d427ed308d
|
maquina duplicate
|
2025-01-22 16:54:49 +01:00 |
|
|
|
fe289bc3ce
|
Merge branch 'feat/sk-17' into 'main'
fix duplicate
See merge request jjimenez/safekat!485
|
2025-01-21 08:58:02 +00:00 |
|
|
|
01498361e3
|
fix duplicate
|
2025-01-21 09:56:59 +01:00 |
|
|
|
bb6e5fb5ca
|
Merge branch 'add/presu_admin_add_services' into 'main'
Add/presu admin add services
See merge request jjimenez/safekat!484
|
2025-01-21 07:33:13 +00:00 |
|
|
|
62d1ca88c1
|
Merge branch 'main' into 'add/presu_admin_add_services'
Main
See merge request jjimenez/safekat!483
|
2025-01-21 07:32:52 +00:00 |
|
|
|
d7011acba4
|
Merge branch 'feat/sk-17' into 'main'
feat : duplicar papel impresion con relaciones
See merge request jjimenez/safekat!482
|
2025-01-20 21:19:22 +00:00 |
|
|
|
aa5dea2cfb
|
feat : duplicar papel impresion con relaciones
|
2025-01-20 22:18:10 +01:00 |
|
|
|
036998e71a
|
añadidos todos los servicios a falta del solapas grandes (incluido plegado de guardas)
|
2025-01-20 20:15:27 +01:00 |
|
|
|
e7163efc5e
|
Merge branch 'fix/maquinas_papeles_seleccionados' into 'main'
corregido el problema que no cogia la rotativa al mostrar los papeles
See merge request jjimenez/safekat!481
|
2025-01-20 11:59:04 +00:00 |
|
|
|
398cb23f11
|
corregido el problema que no cogia la rotativa al mostrar los papeles
|
2025-01-20 12:58:42 +01:00 |
|
