Merge pull request #735 from simnandez/3.3

Fix: [ bug #762 ] Bad profit calculation in Reporting
This commit is contained in:
Laurent Destailleur 2013-03-12 05:26:00 -07:00
commit b88d261c90
2 changed files with 2 additions and 1 deletions

View File

@ -10,6 +10,7 @@ English Dolibarr ChangeLog
- Fix: Package for launchpad
- Fix: [ bug #736 ] Missing column in llx_c_chargesociales
- Fix: Localtax2 for Spain must be based into buyer
- Fix: [ bug #762 ] Bad profit calculation in Reporting

View File

@ -555,7 +555,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
if (isset($totentrees[$annee]) || isset($totsorties[$annee]))
{
$in=(isset($totentrees[$annee])?price2num($totentrees[$annee], 'MT'):0);
$out=(isset($totsorties[$annee])?price2num($totsorties[$annee],' MT'):0);
$out=(isset($totsorties[$annee])?price2num($totsorties[$annee],'MT'):0);
print price($in-$out).'</td>';
// print '<td>&nbsp;</td>';
}