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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-11 18:47:09 +02:00
commit cfbf051fca
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/discount.class.php
View File

@ -519,7 +519,7 @@ class DiscountAbsolute
//} //}
if ($multicurrency) if ($multicurrency)
{ {
return $obj->amount_multicurrency; return $obj->multicurrency_amount;
} }
return $obj->amount; return $obj->amount;

2
htdocs/core/lib/pdf.lib.php
View File

@ -1272,10 +1272,8 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified)) $note = $prodser->multilangs[$outputlangs->defaultlang]["note"]; if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified)) $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
} }
} elseif ($object->element == 'facture' || $object->element == 'facturefourn') { } elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
if ($object->type == $object::TYPE_DEPOSIT) {
$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc); $desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
} }
}
// Description short of product line // Description short of product line
$libelleproduitservice = $label; $libelleproduitservice = $label;