From c9e62845e8e7700e3c6c52589b771fac023b2ed2 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 21 Oct 2020 13:41:17 +0200 Subject: [PATCH] fix is no PDF default model for expense report, no PDF created --- htdocs/expensereport/class/expensereport.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 7bc2ba9fab2..730cb01c82b 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -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); } /**