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

Merge pull request #23261 from fappels/17_fix_delete_orderline_trigger

Browse Source 
FIX: trigger LINEORDER_DELETE, delete extrafields should be moved after delete trigger.
This commit is contained in:
Laurent Destailleur 2022-12-22 13:49:27 +01:00 committed by GitHub
commit 71669db12c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/commande/class/commande.class.php
View File

@ -4331,16 +4331,6 @@ class OrderLine extends CommonOrderLine
dol_syslog("OrderLine::delete", LOG_DEBUG); dol_syslog("OrderLine::delete", LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
// Remove extrafields
if (!$error) {
$this->id = $this->rowid;
$result = $this->deleteExtraFields();
if ($result < 0) {
$error++;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
}
}
if (!$error && !$notrigger) { if (!$error && !$notrigger) {
// Call trigger // Call trigger
$result = $this->call_trigger('LINEORDER_DELETE', $user); $result = $this->call_trigger('LINEORDER_DELETE', $user);
@ -4350,6 +4340,15 @@ class OrderLine extends CommonOrderLine
// End call triggers // End call triggers
} }
// Remove extrafields
if (!$error) {
$result = $this->deleteExtraFields();
if ($result < 0) {
$error++;
dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
}
}
if (!$error) { if (!$error) {
$this->db->commit(); $this->db->commit();
return 1; return 1;