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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2015-04-02 11:01:41 +02:00
commit c476858880
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/projet/element.php
View File

@ -623,13 +623,8 @@ foreach ($listofreferent as $key => $value)
$total_ht = $total_ht + $element->total_ht;
$total_ttc = $total_ttc + $element->total_ttc;
}
print '<tr >';
print '<td align="left" >'.$name.'</td>';
print '<td align="right">'.$i.'</td>';
print '<td align="right">'.price($total_ht).'</td>';
print '<td align="right">'.price($total_ttc).'</td>';
print '</tr>';
// Calculate margin
if ($margin=="add")
{
$margin_ht+= $total_ht;
@ -640,8 +635,21 @@ foreach ($listofreferent as $key => $value)
$margin_ht-= $total_ht;
$margin_ttc-= $total_ttc;
}
}
// Show $total_ht & $total_ttc -- add a minus when necessary
if ($margin!="add")
{
$total_ht = -$total_ht;
$total_ttc = -$total_ttc;
}
print '<tr >';
print '<td align="left" >'.$name.'</td>';
print '<td align="right">'.$i.'</td>';
print '<td align="right">'.price($total_ht).'</td>';
print '<td align="right">'.price($total_ttc).'</td>';
print '</tr>';
}
}
}
// and the margin amount total