diff --git a/htdocs/product.class.php b/htdocs/product.class.php index b225d57f58a..9d97e6b9d21 100644 --- a/htdocs/product.class.php +++ b/htdocs/product.class.php @@ -258,11 +258,16 @@ class Product $sql = "SELECT COUNT(*)"; $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as p, ".MAIN_DB_PREFIX."commandedet as c"; $sql.= ", ".MAIN_DB_PREFIX."facturedet as f, ".MAIN_DB_PREFIX."contratdet as ct"; - $sql.= " WHERE p.fk_product = ".$id." AND c.fk_product = ".$id." AND f.fk_product = ".$id." AND ct.fkproduct = ".$id; + $sql.= " WHERE p.fk_product = ".$id." OR c.fk_product = ".$id." OR f.fk_product = ".$id." OR ct.fk_product = ".$id; $resql = $this->db->query($sql); - if ($resql == 0) + if ($resql) { - return 0; + $row = $this->db->fetch_row($resql); + $nbuse = $row[0]; + } + if ($nbuse == 0) + { + return 0; } else { @@ -270,6 +275,7 @@ class Product } } + /** * \brief Suppression du produit en base si pas utilisé * \param id id du produit diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 372ea3aea56..39f7e7a900e 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -745,8 +745,7 @@ if ($_GET["action"] == '') print ''.$langs->trans("CreateCopy").''; } - $product = new Product($db); - $prod_use = $product->verif_prod_use($id); + $prod_use = $product->verif_prod_use($product->id); if ($user->rights->produit->supprimer && $prod_use == 0) {