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

fix is no PDF default model for expense report, no PDF created

Browse Source
This commit is contained in:
Florian HENRY 2020-10-21 13:41:17 +02:00
parent 6bba249935
commit c9e62845e8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/expensereport/class/expensereport.class.php
View File

@ -2264,7 +2264,6 @@ class ExpenseReport extends CommonObject
$langs->load("trips"); $langs->load("trips");
if (!dol_strlen($modele)) { if (!dol_strlen($modele)) {
$modele = 'standard';
if ($this->modelpdf) { if ($this->modelpdf) {
$modele = $this->modelpdf; $modele = $this->modelpdf;
@ -2272,10 +2271,14 @@ class ExpenseReport extends CommonObject
$modele = $conf->global->EXPENSEREPORT_ADDON_PDF; $modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
} }
} }
if (!empty($modele)) {
$modelpath = "core/modules/expensereport/doc/";
$modelpath = "core/modules/expensereport/doc/"; return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
} else {
return 0;
}
return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
} }
/** /**