lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix calculation of profit

Browse Source
This commit is contained in:
Laurent Destailleur 2021-02-08 23:37:32 +01:00
parent 8b3c872f2a
commit 8acc5e1486
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/projet/element.php
View File

@ -777,7 +777,6 @@ foreach ($listofreferent as $key => $value)
// Each element with at least one line is output // Each element with at least one line is output
$qualifiedforfinalprofit = true; $qualifiedforfinalprofit = true;
if ($key == 'intervention' && empty($conf->global->PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT)) $qualifiedforfinalprofit = false; if ($key == 'intervention' && empty($conf->global->PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT)) $qualifiedforfinalprofit = false;
if ($key == 'propal' && $element->status != Propal::STATUS_SIGNED && $element->status != Propal::STATUS_BILLED) $qualifiedforfinalprofit = false;
//var_dump($key.' '.$qualifiedforfinalprofit); //var_dump($key.' '.$qualifiedforfinalprofit);
// Calculate margin // Calculate margin
@ -787,8 +786,7 @@ foreach ($listofreferent as $key => $value)
$total_revenue_ht += $total_ht; $total_revenue_ht += $total_ht;
} }
if ($margin != "add") // Revert sign if ($margin != "add") { // Revert sign
{
$total_ht = -$total_ht; $total_ht = -$total_ht;
$total_ttc = -$total_ttc; $total_ttc = -$total_ttc;
} }