Merge pull request #4319 from ParisLiakos/develop

FIX MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
This commit is contained in:
Laurent Destailleur 2015-12-31 15:04:16 +01:00
commit 2cbcbb8f85

View File

@ -2054,7 +2054,7 @@ abstract class CommonObject
$forcedroundingmode=$roundingadjust;
if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode=$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
if ($forcedroundingmode == 'auto') $forcedroundingmode='0';
elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0';
$error=0;