From 02b9508f07b78a724fe03e70ab5e156307a25a2c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 16 Jun 2006 13:10:45 +0000
Subject: [PATCH] =?UTF-8?q?la=20constante=20PRODUIT=5FCHANGE=5FPROD=5FDESC?=
 =?UTF-8?q?=20n'a=20plus=20d'int=E9r=EAt=20si=20on=20rajoute=20la=20descri?=
 =?UTF-8?q?ption=20=20produit=20par=20d=E9faut=20=3F=3F=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/compta/facture.php | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 58c0a448f21..60bdb6880ac 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -403,19 +403,32 @@ if (($_POST['action'] == 'addligne' || $_POST['action'] == 'addligne_predef') &&
         {
             $prod = new Product($db, $_POST['idprod']);
             $prod->fetch($_POST['idprod']);
-			// multiprix
-			if ($conf->global->PRODUIT_MULTIPRICES == 1)
-			{
-				$pu = $prod->multiprices[$soc->price_level];
-			}
-			else
-			{
+            
+            // multiprix
+            if ($conf->global->PRODUIT_MULTIPRICES == 1)
+            {
+            	$pu = $prod->multiprices[$soc->price_level];
+            }
+            else
+            {
             	$pu=$prod->price;
-			}
-        	$desc=$_POST['desc'];
-            if (! $desc) $desc = $prod->description;
-			if ($conf->global->PRODUIT_CHANGE_PROD_DESC) $prod->description;
-			$tva_tx = get_default_tva($mysoc,$soc,$prod->tva_tx);
+            }
+            
+            $desc=$_POST['desc'];
+            
+            if (! $desc)
+            {
+            	$desc = $prod->description;
+            }
+            
+            // ceci n'a plus d'intérêt si on rajoute la description produit
+            // à chaque fois ???
+            if ($conf->global->PRODUIT_CHANGE_PROD_DESC)
+            {
+            	$desc = $prod->description;
+            }
+            
+            $tva_tx = get_default_tva($mysoc,$soc,$prod->tva_tx);
         }
         else
         {