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

deleteObjectLinked() in deleteCommon() function

Browse Source
This commit is contained in:
atm-lena 2022-12-12 10:05:44 +01:00
parent 93ee9a7496
commit 95f437b45c
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/commonobject.class.php
View File

@ -9472,6 +9472,12 @@ abstract class CommonObject
} }
} }
// Delete linked object
$res = $this->deleteObjectLinked();
if ($res < 0) {
$error++;
}
// Commit or rollback // Commit or rollback
if ($error) { if ($error) {
$this->db->rollback(); $this->db->rollback();

27
htdocs/mrp/class/mo.class.php
View File

@ -744,31 +744,8 @@ class Mo extends CommonObject
*/ */
public function delete(User $user, $notrigger = false) public function delete(User $user, $notrigger = false)
{ {
$this->db->begin(); return $this->deleteCommon($user, $notrigger);
//return $this->deleteCommon($user, $notrigger, 1);
$error = 0;
// Delete linked object
$res = $this->deleteObjectLinked();
if ($res < 0) {
$error++;
}
if(!$error){
$res = $this->deleteCommon($user, $notrigger);
if($res < 0){
$error++;
}
}
if(!$error){
dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
$this->db->commit();
return $res;
} else {
$this->db->rollback();
return -1;
}
} }
/** /**