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 'main' into feat/ordenes-trabajo

Browse Source
This commit is contained in:
amazuecos
2024-12-26 08:44:19 +01:00
parent 66a36bcf3b 495fc6e73f
commit c05b117c77
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ci4/app/Controllers/Presupuestos/Presupuestocliente.php
View File

@ -2077,7 +2077,12 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
if ($extra_info) { if ($extra_info) {
$totalServicios -= $margenServicios; $totalServicios -= $margenServicios;
$porcentajeMargenServicios = $margenServicios / ($margenServicios + $totalServicios) * 100; if (($margenServicios + $totalServicios) > 0) {
$porcentajeMargenServicios = $margenServicios / ($margenServicios + $totalServicios) * 100;
}
else{
$porcentajeMargenServicios = 0;
}
$sumForFactorPonderado += $totalServicios; $sumForFactorPonderado += $totalServicios;
} }

7
ci4/app/Models/Presupuestos/TipoPresupuestoServiciosDefectoModel.php
View File

@ -76,13 +76,16 @@ class TipoPresupuestoServiciosDefectoModel extends \App\Models\BaseModel
return []; return [];
} }
$where = "(t1.solapas IS NULL OR t1.solapas='" . $solapas . "')"; $where = "(t1.solapas IS NULL OR t1.solapas=" . $solapas . ")";
$builder->where($where); $builder->where($where);
$builder->where("t1.is_deleted", 0); $builder->where("t1.is_deleted", 0);
$builder->where("t2.is_deleted", 0); $builder->where("t2.is_deleted", 0);
$builder->select("t1.tarifa_id AS tarifa_id, t2.nombre AS tarifa_nombre"); $builder->select("t1.tarifa_id AS tarifa_id, t2.nombre AS tarifa_nombre");
return $builder->get()->getResultArray(); $data = $builder->get()->getResultArray();
// DEBUG
$query = $this->db->getLastQuery();
return $data;
} }
} }

3
ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionForm.php
View File

@ -461,7 +461,8 @@
name: "cg", name: "cg",
attr: { attr: {
type: "number" type: "number"
} },
def: 0,
}, },
{ {
name: "gota_negro", name: "gota_negro",