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

This commit is contained in:
Laurent Destailleur 2019-11-24 18:11:46 +01:00
commit f2e01834a5

View File

@ -2642,7 +2642,7 @@ else
if ($calculationrule == 'totalofround') $calculationrulenum=1;
else $calculationrulenum=2;
if (empty($object->getVentilExportCompta())) {
if ($object->getVentilExportCompta() != 0) {
$s=$langs->trans("ReCalculate").' ';
$s.='<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=totalofround">'.$langs->trans("Mode1").'</a>';
$s.=' / ';