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

FIx display civility in contact card

Browse Source
This commit is contained in:
ptibogxiv 2019-07-23 14:04:54 +02:00 committed by GitHub
parent 239b7d56b4
commit 46d0137d30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/contact/class/contact.class.php
View File

@ -345,7 +345,7 @@ class Contact extends CommonObject
$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET "; $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
if ($this->socid > 0) $sql .= " fk_soc='".$this->db->escape($this->socid)."',"; if ($this->socid > 0) $sql .= " fk_soc='".$this->db->escape($this->socid)."',";
elseif ($this->socid == -1) $sql .= " fk_soc=null,"; elseif ($this->socid == -1) $sql .= " fk_soc=null,";
$sql .= " civility='".$this->db->escape($this->civility_id)."'"; $sql .= " civility='".$this->db->escape($this->civility)."'";
$sql .= ", lastname='".$this->db->escape($this->lastname)."'"; $sql .= ", lastname='".$this->db->escape($this->lastname)."'";
$sql .= ", firstname='".$this->db->escape($this->firstname)."'"; $sql .= ", firstname='".$this->db->escape($this->firstname)."'";
$sql .= ", address='".$this->db->escape($this->address)."'"; $sql .= ", address='".$this->db->escape($this->address)."'";
@ -1218,7 +1218,7 @@ class Contact extends CommonObject
global $langs; global $langs;
$langs->load("dict"); $langs->load("dict");
$code=(! empty($this->civility_id)?$this->civility_id:(! empty($this->civilite_id)?$this->civilite_id:'')); $code=(! empty($this->civility_id)?$this->civility:(! empty($this->civilite)?$this->civilite:''));
if (empty($code)) return ''; if (empty($code)) return '';
return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code); return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
} }