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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-12 22:45:39 +01:00
commit 9f3bedb7ea
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
View File

@ -579,8 +579,10 @@ class pdf_standard extends ModeleExpenseReport
} }
$expensereporttypecode = $object->lines[$linenumber]->type_fees_code; $expensereporttypecode = $object->lines[$linenumber]->type_fees_code;
$expensereporttypecodetoshow = $outputlangs->trans($expensereporttypecode); $expensereporttypecodetoshow = ($outputlangs->trans(($expensereporttypecode)) == $expensereporttypecode ? $object->lines[$linenumber]->type_fees_libelle : $outputlangs->trans($expensereporttypecode));
if ($expensereporttypecodetoshow == $expensereporttypecode) {
if ($expensereporttypecodetoshow == $expensereporttypecode) {
$expensereporttypecodetoshow = preg_replace('/^(EX_|TF_)/', '', $expensereporttypecodetoshow); $expensereporttypecodetoshow = preg_replace('/^(EX_|TF_)/', '', $expensereporttypecodetoshow);
} }
//$expensereporttypecodetoshow = dol_trunc($expensereporttypecodetoshow, 9); //$expensereporttypecodetoshow = dol_trunc($expensereporttypecodetoshow, 9);