From c28d87292237e1deefe66079386c7be3daed5a74 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 4 Sep 2007 19:48:59 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20gestion=20de=20la=20quantit=E9=20suffisa?=
 =?UTF-8?q?nte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/fourn/fournisseur.commande.class.php |  2 +-
 htdocs/product.class.php                    | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/htdocs/fourn/fournisseur.commande.class.php b/htdocs/fourn/fournisseur.commande.class.php
index d63503035c2..ff1f0c7befe 100644
--- a/htdocs/fourn/fournisseur.commande.class.php
+++ b/htdocs/fourn/fournisseur.commande.class.php
@@ -677,7 +677,7 @@ class CommandeFournisseur extends Commande
 				$prod = new Product($this->db, $fk_product);
 				if ($prod->fetch($fk_product) > 0)
 				{
-					$result=$prod->get_buyprice($this->fourn_id,$qty);
+					$result=$prod->get_buyprice($fk_prod_fourn_price,$qty);
 					if ($result > 0)
 					{
 						$label = $prod->libelle;
diff --git a/htdocs/product.class.php b/htdocs/product.class.php
index 0a4b4368d2f..f2721b27eb5 100644
--- a/htdocs/product.class.php
+++ b/htdocs/product.class.php
@@ -661,23 +661,20 @@ class Product
 
 	/**
 	*    \brief      Lit le prix pratiqué par un fournisseur
-	*    \param      fourn_id        Id du fournisseur
-	*    \param      qty             Quantite recherchée
+	*    \param      prodfournprice        Id du tarif
+	*    \param      qty                   Quantité du produit
 	*    \return     int             <0 si ko, 0 si ok mais rien trouvé, 1 si ok et trouvé
 	*/
-	function get_buyprice($fourn_id, $qty)
+	function get_buyprice($prodfournprice,$qty)
 	{
 		$result = 0;
 		$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pf.ref_fourn";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."product_fournisseur as pf";
 		$sql.= " WHERE pf.rowid = pfp.fk_product_fournisseur";
-		$sql.= " AND pf.fk_soc = ".$fourn_id;
-		$sql.= " AND pf.fk_product =" .$this->id;
+		$sql.= " AND pfp.rowid = ".$prodfournprice;
 		$sql.= " AND pfp.quantity <= ".$qty;
-		$sql.= " ORDER BY pfp.quantity DESC";
-		$sql.= " LIMIT 1";
 	
-		dolibarr_syslog("Product::get_buyprice $fourn_id,$qty sql=$sql");
+		dolibarr_syslog("Product::get_buyprice $prodfournprice,$qty sql=$sql");
 	
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -696,11 +693,7 @@ class Product
 				$sql = "SELECT pfp.price as price, pfp.quantity as quantity, pf.fk_soc";
 				$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."product_fournisseur as pf";
 				$sql.= " WHERE pf.rowid = pfp.fk_product_fournisseur";
-				$sql.= " AND pf.fk_soc = ".$fourn_id;
-				$sql.= " AND pf.fk_product =" .$this->id;
-				//$sql.= " AND quantity <= ".$qty;
-				$sql.= " ORDER BY pfp.quantity DESC";
-				$sql.= " LIMIT 1";
+				$sql.= " AND pfp.rowid = ".$prodfournprice;
 	
 				$resql = $this->db->query($sql);
 				if ($resql)