Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Standardize and update code

Browse Source
This commit is contained in:
Philippe GRAND
2018-09-18 17:06:25 +02:00
parent ad6ecc6231
commit ac3efe1d5b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
View File

@@ -36,10 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
*/
class doc_generic_stock_odt extends ModelePDFStock
{
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';
/**
@@ -49,7 +49,7 @@ class doc_generic_stock_odt extends ModelePDFStock
*/
function __construct($db)
{
global $conf,$langs,$mysoc;
global $conf, $langs, $mysoc;
// Load translation files required by the page
$langs->loadLangs(array("main","companies"));
@@ -94,7 +94,7 @@ class doc_generic_stock_odt extends ModelePDFStock
*/
function info($langs)
{
global $conf,$langs;
global $conf, $langs;
// Load translation files required by the page
$langs->loadLangs(array("errors","companies"));
@@ -227,10 +227,9 @@ class doc_generic_stock_odt extends ModelePDFStock
$sav_charset_output=$outputlangs->charset_output;
$outputlangs->charset_output='UTF-8';
$outputlangs->load("main");
$outputlangs->load("dict");
$outputlangs->load("companies");
$outputlangs->load("bills");
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
if ($conf->produit->dir_output)
{
// If $object is id instead of object