Merge pull request #9563 from grandoc/develop

Standardize and update code
This commit is contained in:
Laurent Destailleur 2018-09-19 14:29:29 +02:00 committed by GitHub
commit 818098a57e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions

View File

@ -154,10 +154,9 @@ if ($resql)
// Define line content
$outputlangs=new Translate('',$conf);
$outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang); // By default language of customer
$outputlangs->load("bills");
$outputlangs->load("main");
$outputlangs->load("contracts");
$outputlangs->load("products");
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "contracts", "bills", "products"));
if (dol_strlen($newemail))
{

View File

@ -127,10 +127,9 @@ if ($resql)
// Define line content
$outputlangs=new Translate('',$conf);
$outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang); // By default language of sale representative
$outputlangs->load("bills");
$outputlangs->load("main");
$outputlangs->load("contracts");
$outputlangs->load("products");
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "contracts", "bills", "products"));
if (dol_strlen($obj->email))
{

View File

@ -151,8 +151,9 @@ if ($resql)
// Define line content
$outputlangs=new Translate('',$conf);
$outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang); // By default language of customer
$outputlangs->load("bills");
$outputlangs->load("main");
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "bills"));
if (dol_strlen($newemail))
{

View File

@ -131,8 +131,9 @@ if ($resql)
// Define line content
$outputlangs=new Translate('',$conf);
$outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang); // By default language of sale representative
$outputlangs->load("bills");
$outputlangs->load("main");
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "bills"));
if (dol_strlen($obj->email))
{