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

Fix: Civility field must be blank if not defined.

Browse Source
This commit is contained in:
Laurent Destailleur 2013-06-27 18:37:09 +02:00
parent 0ec4b3bcdb
commit 1223d7c3d0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/adherents/class/adherent.class.php
View File

@ -1500,11 +1500,12 @@ class Adherent extends CommonObject
*/ */
function getCivilityLabel() function getCivilityLabel()
{ {
global $langs; global $langs;
$langs->load("dict"); $langs->load("dict");
$code=$this->civilite_id; $code=(! empty($this->civilite_id)?$this->civilite_id:(! empty($this->civility_id)?$this->civility_id:''));
return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code); if (empty($code)) return '';
return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
} }
/** /**