From e8b92cc2c52cebf289c9ecf54969d77f535895df Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 17 Oct 2012 12:47:40 +0200 Subject: [PATCH 1/2] correct bug in price delete --- htdocs/fourn/class/fournisseur.product.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 9613e6a282e..4b8fce76508 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -212,7 +212,7 @@ class ProductFournisseur extends Product { // Delete price for this quantity $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price"; - $sql.= " WHERE rowid = ".$this->product_fourn_price_id; + $sql.= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".$qty; dol_syslog(get_class($this).'::update_buyprice sql='.$sql); $resql=$this->db->query($sql); if ($resql) From 8f08d7a166e89bc920d5737684c4333e1c0464c1 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Wed, 17 Oct 2012 14:25:43 +0200 Subject: [PATCH 2/2] add entity in the unique key for delete --- htdocs/fourn/class/fournisseur.product.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 4b8fce76508..5b12f4956d2 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -212,7 +212,7 @@ class ProductFournisseur extends Product { // Delete price for this quantity $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price"; - $sql.= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".$qty; + $sql.= " WHERE fk_soc = ".$fourn->id." AND ref_fourn = '".$this->db->escape($ref_fourn)."' AND quantity = ".$qty." AND entity = ".$conf->entity; dol_syslog(get_class($this).'::update_buyprice sql='.$sql); $resql=$this->db->query($sql); if ($resql)