lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

define $code for all execution paths

Browse Source
This commit is contained in:
Frédéric FRANCE 2018-10-09 19:28:52 +02:00 committed by GitHub
parent 430f833222
commit c3f07dd2e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/societe/class/societe.class.php
View File

@ -1837,24 +1837,28 @@ class Societe extends CommonObject
if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto))) if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
{ {
$code = '';
if (($this->client) && (! empty ( $this->code_client )) if (($this->client) && (! empty ( $this->code_client ))
&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 2 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 2
) )
) ) {
$code = $this->code_client . ' - '; $code .= $this->code_client . ' - ';
}
if (($this->fournisseur) && (! empty ( $this->code_fournisseur )) if (($this->fournisseur) && (! empty ( $this->code_fournisseur ))
&& ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1 && ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1
|| $conf->global->SOCIETE_ADD_REF_IN_LIST == 3 || $conf->global->SOCIETE_ADD_REF_IN_LIST == 3
) )
) ) {
$code .= $this->code_fournisseur . ' - '; $code .= $this->code_fournisseur . ' - ';
}
if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1) if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1) {
$name =$code.' '.$name; $name = $code.' '.$name;
else } else {
$name =$code; $name = $code;
}
} }
if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')'; if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';