From ad6ecc623117fbacd44f470bb706aebca86e7524 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 18 Sep 2018 16:49:20 +0200 Subject: [PATCH] Standardize and update code --- .../propale/doc/doc_generic_proposal_odt.modules.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index bd3caf7b19b..7483c2a9623 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -37,10 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_proposal_odt extends ModelePDFPropales { - var $emetteur; // Objet societe qui emet + public $emetteur; // Objet societe qui emet - var $phpmin = array(5,2,0); // Minimum version of PHP required by module - var $version = 'dolibarr'; + public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; /** @@ -243,10 +243,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales $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", "dict", "companies", "bills")); if ($conf->propal->multidir_output[$conf->entity]) {