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

Fix: problem to delete a service if the product module is disable

Browse Source
This commit is contained in:
Regis Houssin 2011-05-15 17:00:18 +00:00
parent 27005362b3
commit b523ab815a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/product/class/product.class.php
View File

@ -572,6 +572,7 @@ class Product extends CommonObject
function delete($id) function delete($id)
{ {
global $conf,$user,$langs; global $conf,$user,$langs;
$error=0; $error=0;
if ($user->rights->produit->supprimer) if ($user->rights->produit->supprimer)

8
htdocs/product/fiche.php
View File

@ -343,11 +343,15 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->produit->
/* /*
* Suppression d'un produit/service pas encore affect * 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 = new Product($db);
$product->fetch($id); $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) if ($result == 0)
{ {