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

FIX : #13968

Browse Source
This commit is contained in:
florian HENRY 2020-05-26 21:27:46 +02:00
parent fe6453194e
commit 7ada0de654
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,13 @@ class Societe extends CommonObject
"actioncomm", "actioncomm",
); );
/**
* Build as [parentChildTable]=>[childTable]=>array(parentChildTable.PrimaryKey,childTable.ForeignKey,WhereClause)
* Define into Contrcutor because of MAIN_DB_PREFIX cannot be use here
* @var array List of Parent's child's child tables. To know object to delete on cascade.
*/
protected $parentchildchildtablesoncascade = array();
/** /**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
*/ */
@ -653,6 +660,22 @@ class Societe extends CommonObject
$this->forme_juridique_code = 0; $this->forme_juridique_code = 0;
$this->tva_assuj = 1; $this->tva_assuj = 1;
$this->status = 1; $this->status = 1;
$this->parentchildchildtablesoncascade = array(
'socpeople'=>
array(
MAIN_DB_PREFIX.'socpeople_extrafields' =>
array(MAIN_DB_PREFIX.'socpeople.rowid',MAIN_DB_PREFIX.'socpeople_extrafields.fk_object',''),
MAIN_DB_PREFIX.'element_contact' =>
array(MAIN_DB_PREFIX.'socpeople.rowid',
MAIN_DB_PREFIX.'element_contact.fk_socpeople',
MAIN_DB_PREFIX.'element_contact.fk_c_type_contact IN (SELECT ct.rowid FROM '.MAIN_DB_PREFIX.'c_type_contact as ct WHERE ct.source=\'external\')'),
MAIN_DB_PREFIX.'societe_contacts' =>
array(MAIN_DB_PREFIX.'socpeople.rowid',
MAIN_DB_PREFIX.'societe_contacts.fk_socpeople',
MAIN_DB_PREFIX.'societe_contacts.fk_c_type_contact IN (SELECT ct.rowid FROM '.MAIN_DB_PREFIX.'c_type_contact as ct WHERE ct.source=\'external\')'),
)
);
} }
@ -1673,6 +1696,22 @@ class Societe extends CommonObject
foreach ($this->childtablesoncascade as $tabletodelete) foreach ($this->childtablesoncascade as $tabletodelete)
{ {
if (!$error && array_key_exists($tabletodelete, $this->parentchildchildtablesoncascade))
{
if (count($this->parentchildchildtablesoncascade[$tabletodelete])>0){
foreach($this->parentchildchildtablesoncascade[$tabletodelete] as $childtabletodelete=>$dataToDelette) {
$sql = "DELETE FROM ". $childtabletodelete;
$sql .= " WHERE ".$dataToDelette[1]." IN (SELECT ".$dataToDelette[0]." FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE fk_soc = " . $id.")";
if (!empty($dataToDelette[3])) {
$sql .= " AND ".$dataToDelette[3];
}
if (!$this->db->query($sql)) {
$error++;
$this->errors[] = $this->db->lasterror();
}
}
}
}
if (!$error) if (!$error)
{ {
$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete; $sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete;
@ -1683,6 +1722,7 @@ class Societe extends CommonObject
$this->errors[] = $this->db->lasterror(); $this->errors[] = $this->db->lasterror();
} }
} }
} }
// Removed extrafields // Removed extrafields