diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php
index 004a375130e..0a4c8ee9612 100644
--- a/htdocs/commande/commande.class.php
+++ b/htdocs/commande/commande.class.php
@@ -254,18 +254,23 @@ class Commande
 				$prod = new Product($this->db, $this->products[$i]);
 				if ($prod->fetch($this->products[$i]))
 				{
+					$this->soc_id;
+					$client = new Societe($this->db);
+     				$client->fetch($this->soc_id);
+					if($client->tva_assuj == "0")
+						$tva_tx ="0";
+					else
+						$tva_tx=$prod->tva_tx;
 					// multiprix
 					if($conf->global->PRODUIT_MULTIPRICES == 1)
 					{
-						$this->soc_id;
-						$client = new Societe($this->db);
-     					$client->fetch($this->soc_id);
+						
 						//$prod->multiprices[$client->price_level]
 						$this->insert_product_generic($prod->libelle,
 						$prod->description,
 						$prod->multiprices[$client->price_level],
 						$this->products_qty[$i],
-						$prod->tva_tx,
+						$tva_tx,
 						$this->products[$i],
 						$this->products_remise_percent[$i]);
 					}
@@ -275,7 +280,7 @@ class Commande
 						$prod->description,
 						$prod->price,
 						$this->products_qty[$i],
-						$prod->tva_tx,
+						$tva_tx,
 						$this->products[$i],
 						$this->products_remise_percent[$i]);
 					}
@@ -409,20 +414,22 @@ class Commande
 			{
 				$desc  = $desc?$desc:$prod->libelle;
 				$product_desc = $prod->description;
+				$client = new Societe($this->db);
+     			$client->fetch($this->soc_id);
+				if($client->tva_assuj == "0")
+					$txtva ="0";
+				else
+					$txtva=$prod->tva_tx;
 				// multiprix
 				if($conf->global->PRODUIT_MULTIPRICES == 1)
 				{
-						$client = new Societe($this->db);
-     				$client->fetch($this->soc_id);
 						$pu    = $prod->multiprices[$client->price_level];
-				
 				}
 				else
 					$pu    = $prod->price;
-				  $txtva = $prod->tva_tx;
+			
 			}
 		}
-		
 		$remise = 0;
 		$price = round(ereg_replace(',','.',$pu), 2);
 		$subprice = $price;
@@ -489,8 +496,8 @@ class Commande
 		}
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'commandedet (fk_commande,label,description,fk_product, price,qty,tva_tx, remise_percent, subprice, remise)';
-		$sql .= " VALUES ($this->id, '" . addslashes($desc) . "','" . addslashes($desc) . "',$fk_product,".price2num($price).", '$qty', $txtva, $remise_percent,'".price2num($subprice)."','".price2num( $remise)."') ;";
-	  
+		$sql .= " VALUES ($this->id, '" . addslashes($desc) . "','" . addslashes($desc) . "','$fk_product',".price2num($price).", '$qty', '$txtva', $remise_percent,'".price2num($subprice)."','".price2num( $remise)."') ;";
+	  print $sql;
 		if ( $this->db->query( $sql) )
 		{
 			$this->update_price();
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index f82d77afa38..5a35a6a8533 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -807,6 +807,7 @@ else
 							print '<td>'.stripslashes(nl2br($objp->description));
 							print '</td>';
 						}
+						
 						print '<td align="right">'.$objp->tva_tx.'%</td>';
 						print '<td align="right">'.price($objp->subprice).'</td>';
 						print '<td align="right">'.$objp->qty.'</td>';
@@ -857,7 +858,10 @@ else
 						}
 						print '<textarea name="eldesc" cols="50" rows="1">'.stripslashes($objp->description).'</textarea></td>';
 						print '<td align="right">';
-						print $html->select_tva('eltva_tx',$objp->tva_tx,$mysoc,$soc);
+						if($soc->tva_assuj == "0")
+							print '<input type="hidden" name="eltva_tx" value="0">0';
+						else
+							print $html->select_tva('eltva_tx',$objp->tva_tx,$mysoc,$soc);
 						print '</td>';
 						print '<td align="right"><input size="5" type="text" class="flat" name="elprice" value="'.price($objp->subprice).'"></td>';
 						print '<td align="right"><input size="2" type="text" class="flat" name="elqty" value="'.$objp->qty.'"></td>';
@@ -903,7 +907,10 @@ else
 				print '<tr '.$bc[$var].'>';
 				print '  <td><textarea cols="50" name="desc" rows="1"></textarea></td>';
 				print '<td align="center">';
-				print $html->select_tva('tva_tx',$conf->defaulttx,$mysoc,$soc);
+				if($soc->tva_assuj == "0")
+					print '<input type="hidden" name="tva_tx" value="0">0';
+				else
+					print $html->select_tva('tva_tx',$conf->defaulttx,$mysoc,$soc);
 				print '</td>';
 				print '<td align="right"><input type="text" name="pu" size="5"></td>';
 				print '<td align="right"><input type="text" name="qty" value="1" size="2"></td>';