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

Merge pull request #5561 from olsesacl/#5544

Browse Source 
FIX #5544 Disabled Contact still appear in lists to send emails
This commit is contained in:
Juanjo Menent 2016-07-29 08:33:29 +02:00 committed by GitHub
commit e4f8b9a4b0
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1936,12 +1936,24 @@ class Societe extends CommonObject
{
global $langs;
$contact_emails = $this->contact_property_array('email');
$contact_emails = $this->contact_property_array('email',1);
if ($this->email && $addthirdparty)
{
if (empty($this->name)) $this->name=$this->nom;
// TODO: Tester si email non deja present dans tableau contact
$contact_emails['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
$exist = 0;
foreach($contact_emails as $contacts){
if($exist ===0){
$contacts = str_replace('>','',$contacts);
$contacts = explode ('<',$contacts);
if($contacts[1]===$this->email){
$exist = 1;
}
}
}
if($exist ===0){
if (empty($this->name)) $this->name=$this->nom;
$contact_emails['thirdparty']=$langs->trans("ThirdParty").': '.dol_trunc($this->name,16)." <".$this->email.">";
}
}
return $contact_emails;
}