From 7fd75c793aea3b0b003f40c4d97be86c4f29dc43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Dec 2016 10:39:48 +0100
Subject: [PATCH] FIX Regression when deleting product
---
htdocs/product/class/product.class.php | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9bf8bcbd3f0..1d8d17d6c8f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -908,10 +908,26 @@ class Product extends CommonObject
// End call triggers
}
+ // Delete from product_batch on product delete
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX.'product_batch';
+ $sql.= " WHERE fk_product_stock IN (";
+ $sql.= "SELECT rowid FROM ".MAIN_DB_PREFIX.'product_stock';
+ $sql.= " WHERE fk_product = ".$id.")";
+ dol_syslog(get_class($this).'::delete', LOG_DEBUG);
+ $result = $this->db->query($sql);
+ if (! $result)
+ {
+ $error++;
+ $this->errors[] = $this->db->lasterror();
+ }
+ }
+
// Delete all child tables
if (! $error)
{
- $elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price','product_batch');
+ $elements = array('product_fournisseur_price','product_price','product_lang','categorie_product','product_stock','product_customer_price');
foreach($elements as $table)
{
if (! $error)
--
GitLab