lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize and update code

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-18 11:09:56 +02:00
parent 72f906683f
commit c08f443f0a
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
View File

@ -203,10 +203,7 @@ class doc_generic_contract_odt extends ModelePDFContract
$sav_charset_output=$outputlangs->charset_output; $sav_charset_output=$outputlangs->charset_output;
$outputlangs->charset_output='UTF-8'; $outputlangs->charset_output='UTF-8';
$outputlangs->load("main"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
$outputlangs->load("dict");
$outputlangs->load("companies");
$outputlangs->load("bills");
if ($conf->contrat->dir_output) if ($conf->contrat->dir_output)
{ {

7
htdocs/core/modules/dons/html_cerfafr.modules.php
View File

@ -83,12 +83,7 @@ class html_cerfafr extends ModeleDon
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) $outputlangs=$langs;
$outputlangs->load("main"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "donations"));
$outputlangs->load("dict");
$outputlangs->load("companies");
$outputlangs->load("bills");
$outputlangs->load("products");
$outputlangs->load("donations");
$currency = !empty($currency) ? $currency : $conf->currency; $currency = !empty($currency) ? $currency : $conf->currency;

13
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
View File

@ -39,10 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/ */
class doc_generic_shipment_odt extends ModelePdfExpedition class doc_generic_shipment_odt extends ModelePdfExpedition
{ {
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 public $phpmin = array(5,4,0); // Minimum version of PHP required by module
var $version = 'dolibarr'; public $version = 'dolibarr';
/** /**
@ -52,7 +52,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
*/ */
function __construct($db) function __construct($db)
{ {
global $conf,$langs,$mysoc; global $conf, $langs, $mysoc;
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("main","companies")); $langs->loadLangs(array("main","companies"));
@ -213,10 +213,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
$sav_charset_output=$outputlangs->charset_output; $sav_charset_output=$outputlangs->charset_output;
$outputlangs->charset_output='UTF-8'; $outputlangs->charset_output='UTF-8';
$outputlangs->load("main"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
$outputlangs->load("dict");
$outputlangs->load("companies");
$outputlangs->load("bills");
if ($conf->expedition->dir_output."/sending") if ($conf->expedition->dir_output."/sending")
{ {

11
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -96,10 +96,10 @@ class doc_generic_invoice_odt extends ModelePDFFactures
*/ */
function info($langs) function info($langs)
{ {
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);
@ -212,10 +212,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$sav_charset_output=$outputlangs->charset_output; $sav_charset_output=$outputlangs->charset_output;
$outputlangs->charset_output='UTF-8'; $outputlangs->charset_output='UTF-8';
$outputlangs->load("main"); $outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
$outputlangs->load("dict");
$outputlangs->load("companies");
$outputlangs->load("bills");
if ($conf->facture->dir_output) if ($conf->facture->dir_output)
{ {