From f0c9230b4570eb4abfa6b39d2cb6f76605f5d21c Mon Sep 17 00:00:00 2001
From: Andre Cianfarani <acianfa@free.fr>
Date: Tue, 21 Feb 2006 15:14:00 +0000
Subject: [PATCH] bugfix

---
 htdocs/facture.class.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php
index 56d88d35a35..030ee52a013 100644
--- a/htdocs/facture.class.php
+++ b/htdocs/facture.class.php
@@ -190,14 +190,9 @@ class Facture
 						$tva_tx=$prod->tva_tx;
 				// multiprix
 				if($conf->global->PRODUIT_MULTIPRICES == 1)
-				{
-					
 					$price = $prod->multiprices[$soc->price_level];
-				}
 				else
-				{
 					$price = $prod->price;
-				}
 
 				$resql = $this->addline(
 					$this->id,
@@ -1030,8 +1025,7 @@ class Facture
 			$soc->fetch($this->socidp);
 			if($soc->tva_assuj == "0")
 					$txtva ="0";
-			else
-				$txtva=$prod->tva_tx;
+			dolibarr_syslog("facture.class.php:: txtva : ".$txtva);
             if ($fk_product && ! $pu)
             {
                 $prod = new Product($this->db, $fk_product);
@@ -1041,7 +1035,11 @@ class Facture
 				if($conf->global->PRODUIT_MULTIPRICES == 1)
 					$pu = $prod->multiprices[$soc->price_level];
 				else
+				{
                 	$pu=$prod->price;
+				}
+				if($txtva == "")
+					$txtva=$prod->tva_tx;
             }
 			$price = $pu;
 			$subprice = $pu;