diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 10809b99952..afc5588af33 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -572,6 +572,7 @@ class Product extends CommonObject function delete($id) { global $conf,$user,$langs; + $error=0; if ($user->rights->produit->supprimer) diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 3b550aeca74..554b6ac5f9d 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -343,11 +343,15 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->produit-> /* * Suppression d'un produit/service pas encore affect */ -if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->produit->supprimer) +if ($action == 'confirm_delete' && $confirm == 'yes') { $product = new Product($db); $product->fetch($id); - $result = $product->delete($id); + + if ( ($product->type == 0 && $user->rights->produit->supprimer) || ($product->type == 1 && $user->rights->service->supprimer) ) + { + $result = $product->delete($id); + } if ($result == 0) {