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

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

Browse Source 
Conflicts:
	htdocs/fourn/facture/card.php
This commit is contained in:
Laurent Destailleur 2019-11-24 18:14:18 +01:00
commit c7aaed1264
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/facture/card.php
View File

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