Merge pull request #9563 from grandoc/develop
Standardize and update code
This commit is contained in:
commit
818098a57e
@ -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))
|
||||
{
|
||||
|
||||
@ -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))
|
||||
{
|
||||
|
||||
@ -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))
|
||||
{
|
||||
|
||||
@ -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))
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user