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

Fix regression - can't reset parent company

Browse Source
This commit is contained in:
Laurent Destailleur 2021-05-25 12:11:06 +02:00
parent 93501a1147
commit 71b35ef0e5
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3111,24 +3111,29 @@ class Societe extends CommonObject
public function set_parent($id) public function set_parent($id)
{ {
// phpcs:enable // phpcs:enable
dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
if ($this->id) { if ($this->id) {
// Check if the id we want to add as parent has not already one parent that is the current id we try to update // Check if the id we want to add as parent has not already one parent that is the current id we try to update
$sameparent = $this->validateFamilyTree($id, $this->id, 0); if ($id > 0) {
if ($sameparent < 0) { $sameparent = $this->validateFamilyTree($id, $this->id, 0);
return -1; if ($sameparent < 0) {
} elseif ($sameparent == 1) {
setEventMessages('ParentCompanyToAddIsAlreadyAChildOfModifiedCompany', null, 'warnings');
return -1;
} else {
$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.((int) $this->id);
dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
$this->parent = $id;
return 1;
} else {
return -1; return -1;
} }
if ($sameparent == 1) {
setEventMessages('ParentCompanyToAddIsAlreadyAChildOfModifiedCompany', null, 'warnings');
return -1;
}
}
$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.((int) $this->id);
$resql = $this->db->query($sql);
if ($resql) {
$this->parent = $id;
return 1;
} else {
return -1;
} }
} else { } else {
return -1; return -1;