diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php index aaa231ffc5413..d5e0f1ba984cd 100644 --- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php +++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php @@ -36,10 +36,10 @@ */ 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 @@ function __construct($db) */ 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 @@ function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidede $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