From 0f2f0d8466f72fc719aca6a5d0eaa814a2d1d3c6 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 5 Jan 2007 12:54:23 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20le=20taux=20de=20tva=20n'=E9tait=20pas?=
 =?UTF-8?q?=20r=E9cup=E9r=E9=20dans=20la=20liste=20de=20prix=20multiple=20?=
 =?UTF-8?q?Add:=20suppression=20des=20prix=20multiples=20dans=20la=20base?=
 =?UTF-8?q?=20product=5Fprice=20lors=20d'une=20suppression=20d'un=20produi?=
 =?UTF-8?q?t=20non=20utilis=E9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/product.class.php | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/htdocs/product.class.php b/htdocs/product.class.php
index be578ea1c44..0e8359d2745 100644
--- a/htdocs/product.class.php
+++ b/htdocs/product.class.php
@@ -425,19 +425,24 @@ class Product
 
     if ($user->rights->produit->supprimer)
       {
-	$prod_use = $this->verif_prod_use($id);
-	if ($prod_use == 0)
-          {
-	    $sqld = "DELETE from ".MAIN_DB_PREFIX."product ";
-	    $sqld.= " WHERE rowid = ".$id;
-	    $result = $this->db->query($sqld);
-	    return 0;
-          }
-	else
-          {
-            $this->error .= "Impossible de supprimer le produit.\n";
-            return -1;
-          }
+	      $prod_use = $this->verif_prod_use($id);
+	      if ($prod_use == 0)
+        {
+	        $sqld = "DELETE from ".MAIN_DB_PREFIX."product ";
+	        $sqld.= " WHERE rowid = ".$id;
+	        $result = $this->db->query($sqld);
+	        
+	        $sqlc = "DELETE from ".MAIN_DB_PREFIX."product_price ";
+	        $sqlc.= " WHERE fk_product = ".$id;
+	        $result = $this->db->query($sqlc);
+	        
+	        return 0;
+        }
+	      else
+        {
+          $this->error .= "Impossible de supprimer le produit.\n";
+          return -1;
+        }
       }
   }
 
@@ -583,8 +588,8 @@ class Product
 		       $this->db->query($sql_multiprix);
 
 		       // On ajoute nouveau tarif
-		       $sql_multiprix = "INSERT INTO ".MAIN_DB_PREFIX."product_price(date_price,fk_product,fk_user_author,price_level,price,price_ttc,price_base_type) ";
-		       $sql_multiprix .= " VALUES(now(),".$this->id.",".$user->id.",".$i.",".price2num($this->multiprices["$i"]).",'".$price_ttc."','".$this->multiprices_base_type["$i"]."'";
+		       $sql_multiprix = "INSERT INTO ".MAIN_DB_PREFIX."product_price(date_price,fk_product,fk_user_author,price_level,price,price_ttc,price_base_type,tva_tx) ";
+		       $sql_multiprix .= " VALUES(now(),".$this->id.",".$user->id.",".$i.",".price2num($this->multiprices["$i"]).",'".$price_ttc."','".$this->multiprices_base_type["$i"]."',".$this->tva_tx;
 		       $sql_multiprix .= ")";
 		       if (! $this->db->query($sql_multiprix) )
 		       {