Standardize and update code

This commit is contained in:
Philippe GRAND 2018-09-12 15:09:12 +02:00
parent 69bf43f851
commit b8df44167a
5 changed files with 16 additions and 17 deletions

View File

@ -53,8 +53,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("main"); // Load translation files required by the page
$langs->load("companies"); $langs->loadLangs(array("main","companies"));
$this->db = $db; $this->db = $db;
$this->name = "ODT templates"; $this->name = "ODT templates";
@ -98,8 +98,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
{ {
global $conf,$langs; global $conf,$langs;
$langs->load("companies"); // Load translation files required by the page
$langs->load("errors"); $langs->loadLangs(array("errors","companies"));
$form = new Form($this->db); $form = new Form($this->db);

View File

@ -52,8 +52,8 @@ class doc_generic_contract_odt extends ModelePDFContract
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("main"); // Load translation files required by the page
$langs->load("companies"); $langs->loadLangs(array("main","companies"));
$this->db = $db; $this->db = $db;
$this->name = "ODT templates"; $this->name = "ODT templates";

View File

@ -54,8 +54,8 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
{ {
global $conf,$langs,$mysoc; global $conf,$langs,$mysoc;
$langs->load("main"); // Load translation files required by the page
$langs->load("companies"); $langs->loadLangs(array("main","companies"));
$this->db = $db; $this->db = $db;
$this->name = "ODT templates"; $this->name = "ODT templates";
@ -99,8 +99,8 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
{ {
global $conf,$langs; global $conf,$langs;
$langs->load("companies"); // Load translation files required by the page
$langs->load("errors"); $langs->loadLangs(array("errors","companies"));
$form = new Form($this->db); $form = new Form($this->db);

View File

@ -116,10 +116,9 @@ class mailing_contacts1 extends MailingTargets
function formFilter() function formFilter()
{ {
global $langs; global $langs;
$langs->load("companies");
$langs->load("commercial"); // Load translation files required by the page
$langs->load("suppliers"); $langs->loadLangs(array("commercial","companies","suppliers","categories"));
$langs->load("categories");
$s=''; $s='';

View File

@ -109,9 +109,9 @@ class mailing_fraise extends MailingTargets
function formFilter() function formFilter()
{ {
global $conf, $langs; global $conf, $langs;
$langs->load("members");
$langs->load("categories"); // Load translation files required by the page
$langs->load("companies"); $langs->loadLangs(array("members","companies","categories"));
$form=new Form($this->db); $form=new Form($this->db);