From 53530821545eb3a9eeda13ab00bce1dce4d04c49 Mon Sep 17 00:00:00 2001 From: Adrien Jacob Date: Tue, 21 Apr 2020 09:57:45 +0200 Subject: [PATCH 1/3] FIX Delete extra fields for supplier invoice line --- htdocs/fourn/class/fournisseur.facture.class.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index a9448c7c925..a79209d8e05 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -3155,6 +3155,17 @@ class SupplierInvoiceLine extends CommonObjectLine $this->error = $this->db->lasterror(); } } + + // Remove extrafields + if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used + { + $result=$this->deleteExtraFields(); + if ($result < 0) + { + $error++; + dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); + } + } if (!$error) { From d4a8718e6ca17cda3dcce6d8b3a824245e23a651 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 21 Apr 2020 08:00:14 +0000 Subject: [PATCH 2/3] Fixing style errors. --- htdocs/fourn/class/fournisseur.facture.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index a79209d8e05..c886588ee9b 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -3155,7 +3155,7 @@ class SupplierInvoiceLine extends CommonObjectLine $this->error = $this->db->lasterror(); } } - + // Remove extrafields if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used { From ae519a1009c2a5c598f79486d82493a797091c24 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2020 00:59:22 +0200 Subject: [PATCH 3/3] Update fournisseur.facture.class.php --- .../fourn/class/fournisseur.facture.class.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index c886588ee9b..bc353e7ef0d 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -3128,7 +3128,7 @@ class SupplierInvoiceLine extends CommonObjectLine */ public function delete($notrigger = 0) { - global $user; + global $user, $conf; dol_syslog(get_class($this)."::deleteline rowid=".$this->id, LOG_DEBUG); @@ -3144,6 +3144,17 @@ class SupplierInvoiceLine extends CommonObjectLine $this->deleteObjectLinked(); + // Remove extrafields + if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used + { + $result=$this->deleteExtraFields(); + if ($result < 0) + { + $error++; + dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); + } + } + if (!$error) { // Supprime ligne $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det '; @@ -3156,17 +3167,6 @@ class SupplierInvoiceLine extends CommonObjectLine } } - // Remove extrafields - if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used - { - $result=$this->deleteExtraFields(); - if ($result < 0) - { - $error++; - dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); - } - } - if (!$error) { $this->db->commit();