diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 87f1e7431a2..d5010473c74 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1268,7 +1268,7 @@ class Form
 			
 			if (! $num)
 			{
-				print '<option value="0">-- '.$langs->trans("NoProductMatching").' --</option>';
+				print '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
 			}
 			else
 			{
@@ -1280,37 +1280,30 @@ class Form
 					$objp = $this->db->fetch_object($result);
 					
 					$opt = '<option value="'.$objp->idprodfournprice.'"';
-					if ($objp->fprice == '') $opt.=' disabled="disabled"';
 					$opt.= '>'.$objp->nom.' - '.$objp->ref_fourn.' - ';
-					if ($objp->fprice != '')
+					
+					if ($objp->quantity == 1)
 					{
-						if ($objp->quantity == 1)
-						{
-							$opt.= price($objp->fprice);
-							$opt.= $langs->trans("Currency".$conf->monnaie)."/";
-						}
+						$opt.= price($objp->fprice);
+						$opt.= $langs->trans("Currency".$conf->monnaie)."/";
+					}
 						
-						$opt.= $objp->quantity;
+					$opt.= $objp->quantity;
 						
-						if ($objp->quantity == 1)
-						{
-							$opt.= strtolower($langs->trans("Unit"));
-						}
-						else
-						{
-							$opt.= strtolower($langs->trans("Units"));
-						}
-						if ($objp->quantity > 1)
-						{
-							$opt.=" - ";
-							$opt.= price($objp->unitprice).$langs->trans("Currency".$conf->monnaie)."/".strtolower($langs->trans("Unit"));
-						}
-						if ($objp->duration) $opt .= " - ".$objp->duration;
+					if ($objp->quantity == 1)
+					{
+						$opt.= strtolower($langs->trans("Unit"));
 					}
 					else
 					{
-						$opt.= $langs->trans("NoPriceDefinedForThisSupplier");
+						$opt.= strtolower($langs->trans("Units"));
 					}
+					if ($objp->quantity > 1)
+					{
+						$opt.=" - ";
+						$opt.= price($objp->unitprice).$langs->trans("Currency".$conf->monnaie)."/".strtolower($langs->trans("Unit"));
+					}
+					if ($objp->duration) $opt .= " - ".$objp->duration;
 					$opt .= "</option>\n";
 					
 					print $opt;
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 5d241cf9b84..604b7fd25d7 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -116,6 +116,7 @@ PriceQty=Price for this quantity
 PriceQtyHT=Price for this quantity HT
 PriceQtyTTC=Price for this quantity TTC
 NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product
+NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product
 RecordedProducts=Products recorded
 RecordedProductsAndServices=Products/services recorded
 GenerateThumb=Generate thumb
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 16d44c04aa9..de18796aa13 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -116,6 +116,7 @@ PriceQty=Prix pour la quantit
 PriceQtyHT=Prix pour la quantité HT
 PriceQtyTTC=Prix pour la quantité TTC
 NoPriceDefinedForThisSupplier=Aucun prix/qté défini pour ce fournisseur/produit
+NoSupplierPriceDefinedForThisProduct=Aucun prix/qté fournisseur défini pour ce produit
 RecordedProducts=Produits en vente
 RecordedProductsAndServices=Produits/services en vente
 GenerateThumb=Générer la vignette
\ No newline at end of file