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

Fix error report of LDAP

Browse Source
This commit is contained in:
Laurent Destailleur 2019-09-02 16:01:51 +02:00
parent 6cf3fd79bb
commit 7f6ea3855c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1140,7 +1140,7 @@ class Societe extends CommonObject
if ($result > 0) if ($result > 0)
{ {
$lmember->societe=$this->name; $lmember->company=$this->name;
//$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname; // We keep firstname and lastname of member unchanged //$lmember->firstname=$this->firstname?$this->firstname:$lmember->firstname; // We keep firstname and lastname of member unchanged
//$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname; // We keep firstname and lastname of member unchanged //$lmember->lastname=$this->lastname?$this->lastname:$lmember->lastname; // We keep firstname and lastname of member unchanged
$lmember->address=$this->address; $lmember->address=$this->address;
@ -1158,7 +1158,8 @@ class Societe extends CommonObject
$result=$lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates $result=$lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
if ($result < 0) if ($result < 0)
{ {
$this->error=$lmember->error; $this->error = $lmember->error;
$this->errors = array_merge($this->errors, $lmember->errors);
dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
$error++; $error++;
} }