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 'dev/api_il_2'

Browse Source 
Main

See merge request jjimenez/safekat!562
This commit is contained in:
Ignacio Martinez Navajas
2025-02-21 13:03:55 +00:00
parent feea7d7437 c666925101
commit 83dedefa23
6 changed files with 62 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2884,7 +2884,6 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
$sumForFactor += round($linea['precio_pedido'], 2);
$sumForFactor -= round($linea['precio_pedido'], 2);
$totalImpresion += round($linea['precio_impresion_horas'], 2);
$totalImpresion += round($linea['precio_click_pedido'], 2);
$sumForFactor += round($linea['precio_click_pedido'], 2);
@ -2895,6 +2894,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
$sumForFactor += round($linea['total_corte'], 2);
}
}
$margenImpresion += round($linea['precio_impresion_horas'], 2); // coste de maquina y magen son MARGEN, no COSTE
$margenImpresion += round($linea['margen_impresion_horas'], 2);
$margenImpresion += round($linea['margen_click_pedido'], 2);
$sumForFactor -= round($linea['margen_click_pedido'], 2);