From 73d161833ad3989d7ecc2f5a5189818d419e66c8 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 18 Sep 2018 17:26:20 +0200 Subject: [PATCH] Standardize and update code --- .../doc/doc_generic_supplier_proposal_odt.modules.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php index d196ff48a11..5a318a3a6b3 100644 --- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php @@ -50,7 +50,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal */ function __construct($db) { - global $conf,$langs,$mysoc; + global $conf, $langs, $mysoc; // Load translation files required by the page $langs->loadLangs(array("main","companies")); @@ -222,7 +222,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0) { // phpcs:enable - global $user,$langs,$conf,$mysoc,$hookmanager; + global $user, $langs, $conf, $mysoc, $hookmanager; if (empty($srctemplatepath)) { @@ -243,10 +243,8 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal $sav_charset_output=$outputlangs->charset_output; $outputlangs->charset_output='UTF-8'; - $outputlangs->load("main"); - $outputlangs->load("dict"); - $outputlangs->load("companies"); - $outputlangs->load("bills"); + // Load translation files required by the page + $outputlangs->loadLangs(array("main", "companies", "bills", "dict")); if ($conf->supplier_proposal->dir_output) {