Fix invalid permission test when deleting services

This commit is contained in:
Cedric GROSS 2013-05-07 12:07:06 +02:00
parent e79d0f50d0
commit d1c1cf6bc0

View File

@ -5,6 +5,7 @@
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2007-2011 Jean Heimburger <jean@tiaris.info> * Copyright (C) 2007-2011 Jean Heimburger <jean@tiaris.info>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Cedric GROSS <c.gross@kreiz-it.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -586,8 +587,12 @@ class Product extends CommonObject
$error=0; $error=0;
if ($user->rights->produit->supprimer) if (($this->type==0 && !$user->rights->produit->supprimer) || ($this->type==1 && !$user->rights->service->supprimer))
{ {
$this->error = "ErrorForbidden";
return 0;
}
$objectisused = $this->isObjectUsed($id); $objectisused = $this->isObjectUsed($id);
if (empty($objectisused)) if (empty($objectisused))
{ {
@ -686,8 +691,6 @@ class Product extends CommonObject
return 0; return 0;
} }
} }
return 0;
}
/** /**
* Update ou cree les traductions des infos produits * Update ou cree les traductions des infos produits