From ffad80eef6b3a5e15dd7967405a061e9f5671423 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Thu, 13 Sep 2018 09:45:07 +0200 Subject: [PATCH] Standardize and update code --- .../mod_commande_fournisseur_orchidee.php | 4 ++-- .../doc/doc_generic_supplier_proposal_odt.modules.php | 10 +++++----- htdocs/core/modules/ticket/mod_ticket_universal.php | 4 ++-- .../modules/user/doc/doc_generic_user_odt.modules.php | 10 +++++----- .../doc/doc_generic_usergroup_odt.modules.php | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php index 4639a94279cb5..fb800d1d63daf 100644 --- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php @@ -46,8 +46,8 @@ function info() { global $conf,$langs; - $langs->load("bills"); - $langs->load("admin"); + // Load translation files required by the page + $langs->loadLangs(array("bills","admin")); $form = new Form($this->db); 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 da3eb6ef734e7..a7c2db68a26a9 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 @@ -37,10 +37,10 @@ */ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal { - 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'; /** @@ -52,8 +52,8 @@ function __construct($db) { 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 templates"; diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php index 3371a071c8a8c..c3dad0aa482b3 100644 --- a/htdocs/core/modules/ticket/mod_ticket_universal.php +++ b/htdocs/core/modules/ticket/mod_ticket_universal.php @@ -43,8 +43,8 @@ public function info() { global $conf, $langs; - $langs->load("ticket"); - $langs->load("admin"); + // Load translation files required by the page + $langs->loadLangs(array("ticket","admin")); $form = new Form($this->db); diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php index 5318220beb858..041157f20a276 100644 --- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php +++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php @@ -35,10 +35,10 @@ */ class doc_generic_user_odt extends ModelePDFUser { - 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'; /** @@ -50,8 +50,8 @@ function __construct($db) { 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 templates"; diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php index 887a4cda084f8..708482f3793d9 100644 --- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php +++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php @@ -37,10 +37,10 @@ */ class doc_generic_usergroup_odt extends ModelePDFUserGroup { - 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'; /** @@ -52,8 +52,8 @@ function __construct($db) { 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 templates";