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

This commit is contained in:
ldestailleur 2025-09-02 11:58:45 +02:00
commit 557e830aae

View file

@ -426,9 +426,9 @@ class pdf_beluga extends ModelePDFProjects
'title' => "ListExpenseReportsAssociatedProject",
'class' => 'ExpenseReport',
'table' => 'expensereport',
'datefieldname' => 'dated',
'datefieldname' => 'date_debut',
'margin' => 'minus',
'disableamount' => 1,
'disableamount' => 0,
'test' => isModEnabled('expensereport') && $user->hasRight('expensereport', 'lire'),
'lang' => 'trip'),
'agenda' => array(
@ -644,6 +644,9 @@ class pdf_beluga extends ModelePDFProjects
if (empty($date)) {
$date = $element->datev; // Intervention card
}
if (empty($date)) {
$date = $element->date_debut; // Expense report
}
}
$pdf->SetXY($this->posxdate, $curY);