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

Merge pull request #15078 from FHenry/12.0_fix_if_no_pdf_model_no_pdf_created

Browse Source 
FIX if no PDF default model in admin for expense report, do not create a PDF
This commit is contained in:
Laurent Destailleur 2020-10-21 19:55:43 +02:00 committed by GitHub
commit a96c193ab0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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");
if (!dol_strlen($modele)) {
$modele = 'standard';
if ($this->modelpdf) {
$modele = $this->modelpdf;
@ -2272,10 +2271,14 @@ class ExpenseReport extends CommonObject
$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);
}
/**