From ca9b1f155f65f9e15d156dd56eb0cfbd3f2615f4 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 14 Sep 2018 14:05:19 +0200 Subject: [PATCH] Standardize and update code --- .../facture/doc/doc_generic_invoice_odt.modules.php | 10 +++++----- htdocs/core/modules/mailings/fraise.modules.php | 5 +++-- .../stock/doc/doc_generic_stock_odt.modules.php | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index a73d6f13296..75c84a58ba0 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -38,10 +38,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php'; */ class doc_generic_invoice_odt extends ModelePDFFactures { - 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'; /** @@ -53,8 +53,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures { global $conf,$langs,$mysoc; - $langs->load("main"); - $langs->load("companies"); + // Load translation files required by the page + $langs->loadLangs(array("main","companies")); $this->db = $db; $this->name = "ODT/ODS templates"; diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php index 35116b1a902..9cf0f56f7e2 100644 --- a/htdocs/core/modules/mailings/fraise.modules.php +++ b/htdocs/core/modules/mailings/fraise.modules.php @@ -237,8 +237,9 @@ class mailing_fraise extends MailingTargets } global $langs,$_POST; - $langs->load("members"); - $langs->load("companies"); + + // Load translation files required by the page + $langs->loadLangs(array("members","companies")); $cibles = array(); $now=dol_now(); diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php index b57b957e8a4..98d6975f67b 100644 --- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php +++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php @@ -96,8 +96,8 @@ class doc_generic_stock_odt extends ModelePDFStock { global $conf,$langs; - $langs->load("companies"); - $langs->load("errors"); + // Load translation files required by the page + $langs->loadLangs(array("errors","companies"));; $form = new Form($this->db);