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

todo okgit pullgit pull

Browse Source
This commit is contained in:
Jaime Jiménez
2025-04-08 00:28:45 +02:00
parent b413245683
commit 644ad41001
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ci4/app/Models/Presupuestos/PresupuestoModel.php
View File

@ -484,7 +484,9 @@ class PresupuestoModel extends \App\Models\BaseModel
'total_margenes' => round($totalMargenes, 2),
'total_antes_descuento' => round(
$totalCostes + $totalMargenes + $data['envio_base'], 2),
$totalCostes + $totalMargenes +
$resumen_totales['coste_envio']+$resumen_totales['margen_envio'] +
$data['envio_base'], 2),
'total_descuento' => 0,
'total_descuentoPercent' => 0,
@ -492,11 +494,15 @@ class PresupuestoModel extends \App\Models\BaseModel
'total_presupuesto' => round(
$totalCostes + $totalMargenes +
$resumen_totales['coste_envio']+$resumen_totales['margen_envio'] +
$resumen_totales['envio_base_coste']+$resumen_totales['envio_base_margen'], 2),
$data['envio_base'], 2),
'total_aceptado' => round($totalCostes + $totalMargenes + $resumen_totales['coste_envio']+$resumen_totales['margen_envio'], 2),
'total_factor' => round(($totalCostes + $totalMargenes - $resumen_totales['coste_envio'] - $resumen_totales['margen_envio']) / $resumen_totales['sumForFactor'], 2),
'total_factor_ponderado' => round(($totalCostes + $totalMargenes - $resumen_totales['coste_envio'] - $resumen_totales['margen_envio']) / $resumen_totales['sumForFactorPonderado'], 2),
'total_factor' => round(
($totalCostes + $totalMargenes ) /
$resumen_totales['sumForFactor'], 2),
'total_factor_ponderado' => round(
($totalCostes + $totalMargenes ) /
$resumen_totales['sumForFactorPonderado'], 2),
'iva_reducido' => $iva_reducido,
'excluir_rotativa' => $excluir_rotativa,