From 47a0420e3fd9b93feccde09651d7388493ae2ae6 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 19 Nov 2007 13:35:51 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20la=20base=20de=20prix=20TTC=20n'=E9tait?=
 =?UTF-8?q?=20pas=20prise=20en=20compte=20en=20mode=20multiprix=20=E0=20la?=
 =?UTF-8?q?=20cr=E9ation=20d'un=20produit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/product.class.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/htdocs/product.class.php b/htdocs/product.class.php
index 6a3cadc3295..6d87dfcb457 100644
--- a/htdocs/product.class.php
+++ b/htdocs/product.class.php
@@ -621,9 +621,21 @@ class Product extends CommonObject
 			{
 				if($this->multiprices["$i"] != "")
 				{
+					// Prise en compte du type
+					if ($this->multiprices_base_type["$i"] == 'TTC')
+					{
+						$multiprice_ttc = price2num($this->multiprices["$i"],'MU');
+						$multiprice_ht = price2num($this->multiprices["$i"] / (1 + ($this->tva_tx / 100)),'MU');
+					}
+					else
+					{
+						$multiprice_ht = price2num($this->multiprices["$i"],'MU');
+						$multiprice_ttc = price2num($this->multiprices["$i"] * (1 + ($this->tva_tx / 100)),'MU');
+					}
+
 					// 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,tva_tx) ";
-					$sql_multiprix .= " VALUES(now(),".$this->id.",".$user->id.",".$i.",".price2num($this->multiprices["$i"]).",'".price2num($this->multiprices_ttc["$i"])."','".$this->multiprices_base_type["$i"]."',".$this->tva_tx;
+					$sql_multiprix .= " VALUES(now(),".$this->id.",".$user->id.",".$i.",".price2num($multiprice_ht).",'".price2num($multiprice_ttc)."','".$this->multiprices_base_type["$i"]."',".$this->tva_tx;
 					$sql_multiprix .= ")";
 					if (! $this->db->query($sql_multiprix) )
 					{