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 17:31:01 +02:00
parent 73d161833a
commit c3db591d7b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
View File

@ -48,10 +48,10 @@ class doc_generic_user_odt extends ModelePDFUser
*/ */
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"));
$this->db = $db; $this->db = $db;
$this->name = "ODT templates"; $this->name = "ODT templates";
@ -205,7 +205,7 @@ class doc_generic_user_odt extends ModelePDFUser
function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0) function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
{ {
// phpcs:enable // phpcs:enable
global $user,$langs,$conf,$mysoc,$hookmanager; global $user, $langs, $conf, $mysoc, $hookmanager;
if (empty($srctemplatepath)) if (empty($srctemplatepath))
{ {
@ -226,10 +226,8 @@ class doc_generic_user_odt extends ModelePDFUser
$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"); // Load translation files required by the page
$outputlangs->load("dict"); $outputlangs->loadLangs(array("main", "companies", "bills", "dict"));
$outputlangs->load("companies");
$outputlangs->load("bills");
if ($conf->user->dir_output) if ($conf->user->dir_output)
{ {