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

Merge pull request #6599 from defrance/patch-2

Browse Source 
NEW : SOCIETE_ADD_REF_IN_LIST more display case GetNomUrl
This commit is contained in:
Laurent Destailleur 2017-03-31 17:44:31 +02:00 committed by GitHub
commit 536afb44c7
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1840,13 +1840,24 @@ 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)))
{ {
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 == 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 == 3
)
)
$code .= $this->code_fournisseur . ' - '; $code .= $this->code_fournisseur . ' - ';
}
if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
$name =$code.' '.$name; $name =$code.' '.$name;
else
$name =$code;
} }
if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')'; if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';