Standardize and update code

This commit is contained in:
Philippe GRAND 2018-09-18 17:34:01 +02:00
parent c3db591d7b
commit 4536993fdc

View File

@ -207,7 +207,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
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))
{ {
@ -228,10 +228,8 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
$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)
{ {