lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: gestion de la quantit suffisante

Browse Source
This commit is contained in:
Regis Houssin 2007-09-04 19:48:59 +00:00
parent 96f32342d3
commit c28d872922
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/fournisseur.commande.class.php
View File

@ -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;

19
htdocs/product.class.php
View File

@ -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)