code easier to understand

This commit is contained in:
Laurent Destailleur 2023-02-22 01:09:23 +01:00
parent 0b61a4fc54
commit d4402aa7f5
11 changed files with 29 additions and 22 deletions

View File

@ -2286,10 +2286,11 @@ class Adherent extends CommonObject
{
global $conf, $langs;
$datas = [];
$langs->loadLangs(['members', 'companies']);
$nofetch = !empty($params['nofetch']);
$datas = array();
$nofetch = empty($params['nofetch']) ? false : true;
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$langs->load("users");
return ['optimize' => $langs->trans("ShowUser")];

View File

@ -1578,9 +1578,10 @@ class ActionComm extends CommonObject
{
global $conf, $langs, $user;
$langs->load('agenda');
$datas = [];
$nofetch = empty($params['nofetch']) ? false : true;
$datas = array();
$nofetch = !empty($params['nofetch']);
// Set label of type
$labeltype = '';
if ($this->type_code) {

View File

@ -736,10 +736,10 @@ class Mailing extends CommonObject
{
global $conf, $langs;
$nofetch = empty($params['nofetch']) ? false : true;
$nofetch = !empty($params['nofetch']);
$langs->load('mails');
$datas = [];
$datas = array();
$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ShowEMailing").'</u>';
if (isset($this->statut)) {
$datas['picto'] .= ' '.$this->getLibStatut(5);

View File

@ -1415,9 +1415,9 @@ class Account extends CommonObject
global $langs;
include_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
$datas = [];
$datas = array();
$nofetch = empty($params['nofetch']) ? false : true;
$nofetch = !empty($params['nofetch']);
$pictos = img_picto('', $this->picto).' <u class="paddingrightnow">'.$langs->trans("BankAccount").'</u>';
if (isset($this->status)) {
$pictos .= ' '.$this->getLibStatut(5);

View File

@ -1834,8 +1834,9 @@ class Expedition extends CommonObject
global $conf, $langs;
$langs->load('shipping');
$nofetch = empty($params['nofetch']) ? false : true;
$datas = [];
$nofetch = !empty($params['nofetch']);
$datas = array();
$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Shipment").'</u>';
if (isset($this->statut)) {
$datas['picto'] .= ' '.$this->getLibStatut(5);

View File

@ -1705,9 +1705,11 @@ class ExpenseReport extends CommonObject
global $conf, $langs;
$langs->load('expensereport');
$nofetch = empty($params['nofetch']) ? false : true;
$nofetch = !empty($params['nofetch']);
$moretitle = $params['moretitle'] ?? '';
$datas = [];
$datas = array();
$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ExpenseReport").'</u>';
if (isset($this->status)) {
$datas['picto'] .= ' '.$this->getLibStatut(5);

View File

@ -1311,9 +1311,9 @@ class Holiday extends CommonObject
global $conf, $langs;
$langs->load('holiday');
$nofetch = empty($params['nofetch']) ? false : true;
$nofetch = !empty($params['nofetch']);
$datas = [];
$datas = array();
$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Holiday").'</u>';
if (isset($this->statut)) {
$datas['picto'] .= ' '.$this->getLibStatut(5);

View File

@ -727,8 +727,9 @@ class KnowledgeRecord extends CommonObject
$langs->loadLangs(['knowledgemanagement', 'languages']);
$datas = [];
$nofetch = empty($params['nofetch']) ? false : true;
$datas = array();
$nofetch = !empty($params['nofetch']);
$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("KnowledgeRecord").'</u>';
if (isset($this->statut)) {
$datas['picto'] .= ' '.$this->getLibStatut(5);

View File

@ -5011,8 +5011,8 @@ class Product extends CommonObject
$langs->load('products');
$datas = [];
$nofetch = empty($params['nofetch']) ? false : true;
$datas = array();
$nofetch = !empty($params['nofetch']);
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
return ['optimize' => $langs->trans("ShowProduct")];

View File

@ -2613,10 +2613,11 @@ class Societe extends CommonObject
$langs->loadLangs(['companies', 'commercial']);
$datas = [];
$datas = array();
$option = $params['option'] ?? '';
$nofetch = empty($params['nofetch']) ? false : true;
$nofetch = !empty($params['nofetch']);
$name = $this->name;
if (!empty($this->name_alias) && empty($noaliasinname)) {

View File

@ -1432,9 +1432,9 @@ class Ticket extends CommonObject
global $langs;
$langs->load('ticket');
$nofetch = !empty($params['nofetch']);
$nofetch = empty($params['nofetch']) ? false : true;
$datas = [];
$datas = array();
$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Ticket").'</u>';
$datas['picto'] .= ' '.$this->getLibStatut(4);
$datas['ref'] = '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;