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

Fix long name overlap date

Browse Source
This commit is contained in:
Laurent Destailleur 2020-09-03 11:34:20 +02:00
parent 5af1eff2d9
commit 77d15c9382
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -796,7 +796,7 @@ class pdf_standard extends ModeleExpenseReport
$pdf->MultiCell(80, 5, $outputlangs->transnoentities("TripNDF")." :", 0, 'L');
$pdf->rect($posx, $posy, $this->page_largeur - $this->marge_gauche - $posx, $hautcadre);
// Informations for trip (dates and users workflow)
// Informations for expense report (dates and users workflow)
if ($object->fk_user_author > 0) {
$userfee = new User($this->db);
$userfee->fetch($object->fk_user_author);
@ -804,7 +804,7 @@ class pdf_standard extends ModeleExpenseReport
$pdf->SetXY($posx + 2, $posy);
$pdf->SetFont('', '', 10);
$pdf->MultiCell(96, 4, $outputlangs->transnoentities("AUTHOR")." : ".dolGetFirstLastname($userfee->firstname, $userfee->lastname), 0, 'L');
$posy += 5;
$posy = $pdf->GetY() + 1;
$pdf->SetXY($posx + 2, $posy);
$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DateCreation")." : ".dol_print_date($object->date_create, "day", false, $outputlangs), 0, 'L');
}
@ -822,8 +822,7 @@ class pdf_standard extends ModeleExpenseReport
$pdf->SetXY($posx + 2, $posy);
$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_REFUS")." : ".dol_print_date($object->date_refuse, "day", false, $outputlangs), 0, 'L');
}
} elseif ($object->fk_statut == 4)
{
} elseif ($object->fk_statut == 4) {
if ($object->fk_user_cancel > 0) {
$userfee = new User($this->db);
$userfee->fetch($object->fk_user_cancel); $posy += 6;