diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php index 90746afed0e..15d48694277 100644 --- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php @@ -108,8 +108,8 @@ class pdf_standard extends ModeleExpenseReport $this->posxdate=88; $this->posxtype=107; $this->posxprojet=120; - $this->posxtva=136; - $this->posxup=152; + $this->posxtva=138; + $this->posxup=154; $this->posxqty=168; $this->postotalttc=178; if (empty($conf->projet->enabled)) { @@ -328,7 +328,7 @@ class pdf_standard extends ModeleExpenseReport $nextColumnPosX = $this->posxprojet; } - $pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, dol_trunc($outputlangs->transnoentities($object->lines[$i]->type_fees_code), 12), 0, 'C'); + $pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, dol_trunc($outputlangs->transnoentities($object->lines[$i]->type_fees_code), 10), 0, 'C'); // Project if (! empty($conf->projet->enabled)) diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index afa45a2e5cd..6d989e6efc0 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -1970,7 +1970,7 @@ else print ''; print ''; - print '
| '.$langs->trans("TF_".strtoupper(empty($objp->type_fees_libelle)?'OTHER':$objp->type_fees_libelle)).' | '; - print ''.($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans(($line->type_fees_code))).' | '; + print ''; + $labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code)); + print $labeltype; + print ' | '; print ''.$line->comments.' | '; print ''.vatrate($line->vatrate,true).' | '; print ''.price($line->value_unit).' | ';