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:14:21 +02:00
parent c08f443f0a
commit ad061f4e13
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
View File

@ -36,10 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/ */
class doc_generic_product_odt extends ModelePDFProduct class doc_generic_product_odt extends ModelePDFProduct
{ {
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';
/** /**
@ -49,7 +49,7 @@ class doc_generic_product_odt extends ModelePDFProduct
*/ */
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"));
@ -94,7 +94,7 @@ class doc_generic_product_odt extends ModelePDFProduct
*/ */
function info($langs) function info($langs)
{ {
global $conf,$langs; global $conf, $langs;
// Load translation files required by the page // Load translation files required by the page
$langs->loadLangs(array("errors","companies")); $langs->loadLangs(array("errors","companies"));
@ -227,10 +227,8 @@ class doc_generic_product_odt extends ModelePDFProduct
$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->produit->dir_output) if ($conf->produit->dir_output)
{ {
// If $object is id instead of object // If $object is id instead of object

11
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@ -54,10 +54,10 @@ if (! empty($conf->agenda->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/
*/ */
class doc_generic_task_odt extends ModelePDFTask class doc_generic_task_odt extends ModelePDFTask
{ {
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';
/** /**
@ -432,10 +432,7 @@ class doc_generic_task_odt extends ModelePDFTask
$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", "projects"));
$outputlangs->load("dict");
$outputlangs->load("companies");
$outputlangs->load("projects");
if ($conf->projet->dir_output) if ($conf->projet->dir_output)
{ {