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

Create societe.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2021-05-20 14:53:50 +02:00 committed by GitHub
parent 94ca682cbf
commit 28487fac12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3112,15 +3112,15 @@ class Societe extends CommonObject
{ {
// phpcs:enable // phpcs:enable
if ($this->id) { if ($this->id) {
// InfraS change (to avoid infinite loop) // 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); $sameparent = $this->validateFamilyTree($id, $this->id, 0);
if ($sameparent < 0) { if ($sameparent < 0) {
return -1; return -1;
} elseif ($sameparent == 1) { } elseif ($sameparent == 1) {
setEventMessages('ParentCompanyIsAlreadyAChild', null, 'warnings'); setEventMessages('ParentCompanyToAddIsAlreadyAChildOfModifiedCompany', null, 'warnings');
return -1; return -1;
} else { } else {
$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe SET parent = '.($id > 0 ? $id : 'null').' WHERE rowid = '.$this->id; $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); dol_syslog(get_class($this).'::set_parent', LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
@ -3148,7 +3148,7 @@ class Societe extends CommonObject
if ($counter > 100) { if ($counter > 100) {
dol_syslog("Too high level of parent - child for company. May be an infinite loop ?", LOG_WARNING); dol_syslog("Too high level of parent - child for company. May be an infinite loop ?", LOG_WARNING);
} }
$sql = 'SELECT s.parent'; $sql = 'SELECT s.parent';
$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql .= ' WHERE rowid = '.$idparent; $sql .= ' WHERE rowid = '.$idparent;