diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 8fe381d35c0..d9d65048fa8 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1398,17 +1398,17 @@ class CommandeFournisseur extends CommonOrder * @param int $idligne Id of line to delete * @return 0 if Ok, <0 ik Ko */ - function deleteline($idligne) + function deleteline($idligne, $notrigger=0) { if ($this->statut == 0) { $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid = ".$idligne; $resql=$this->db->query($sql); - - dol_syslog(get_class($this)."::deleteline sql=".$sql); - if ($resql) - { - // Appel des triggers + + dol_syslog(get_class($this)."::deleteline sql=".$sql); + + if(!$notrigger && $resql){ + // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $result = 0; $interface=new Interfaces($this->db); @@ -1417,7 +1417,10 @@ class CommandeFournisseur extends CommonOrder $error++; $this->errors=$interface->errors; } // Fin appel triggers - + } + + if ($resql) + { $result=$this->update_price(); return 0; } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 42f3f3cf7e0..74949814577 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1258,6 +1258,18 @@ class FactureFournisseur extends CommonInvoice $error=0; $this->db->begin(); + + if (! $error && ! $notrigger) + { + // Appel des triggers + include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + $interface=new Interfaces($this->db); + $result=$interface->run_triggers('LINEBILL_SUPPLIER_DELETE',$this,$user,$langs,$conf); + if ($result < 0) { + $error++; $this->errors=$interface->errors; + } + // Fin appel triggers + } if (! $error) { @@ -1273,19 +1285,6 @@ class FactureFournisseur extends CommonInvoice dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR); } } - - if (! $error && ! $notrigger) - { - // Appel des triggers - include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); - $interface=new Interfaces($this->db); - $result=$interface->run_triggers('LINEBILL_SUPPLIER_DELETE',$this,$user,$langs,$conf); - if ($result < 0) { - $error++; $this->errors=$interface->errors; - } - // Fin appel triggers - } - if (! $error) {