jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev/presupuestos3' into 'dev/fixes'

Browse Source 
# Conflicts:
#   ci4/app/Controllers/Presupuestos/Cosidotapablanda.php
#   ci4/app/Language/es/Presupuestos.php
#   ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php
#   ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php
This commit is contained in:
Jaime Jimenez Ortega
2023-10-10 09:21:41 +00:00
parent 43e051b135 c9bae54c29
commit 852fe9e2e2
17 changed files with 1787 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci4/app/Entities/Configuracion/Maquina.php
View File

@ -28,8 +28,8 @@ class Maquina extends \CodeIgniter\Entity\Entity
"velocidad_corte" => 0.0,
"precio_hora_corte" => 0.0,
"metrosxminuto" => 0.0,
"forzar_num_formas_horizontales_portada" => null,
"forzar_num_formas_verticales_portada" => null,
"forzar_num_formas_horizontales_cubierta" => null,
"forzar_num_formas_verticales_cubierta" => null,
"observaciones" => "",
"is_deleted" => 0,
"created_at" => null,
@ -56,8 +56,8 @@ class Maquina extends \CodeIgniter\Entity\Entity
"precio_tinta_color" => "float",
"velocidad_corte" => "float",
"precio_hora_corte" => "float",
"forzar_num_formas_horizontales_portada" => "?int",
"forzar_num_formas_verticales_portada" => "?int",
"forzar_num_formas_horizontales_cubierta" => "?int",
"forzar_num_formas_verticales_cubierta" => "?int",
"is_deleted" => "int",
"user_created_id" => "int",
"user_updated_id" => "int",