FIX trigger LINEORDER_DELETE, extrafields should be removed after delete trigger.
This commit is contained in:
parent
c6ee45cc53
commit
b3aef891e2
@ -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;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user