diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 7d92395b4afb881ff4b712166ffc340debf45bd1..ab3d5dcb2a18122c3571f078a1b1bd4f4d5df6d0 100755 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -1,7 +1,8 @@ <?php -/* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net> - * Copyright (C) 2007-2010 Jean Heimburger <jean@tiaris.info> - * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> +/* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2007-2010 Jean Heimburger <jean@tiaris.info> + * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> + * Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr> * * 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 @@ -34,9 +35,9 @@ $langs->load("compta"); // Protection if external user if ($user->societe_id > 0) -{ accessforbidden(); -} + +$result = restrictedArea($user, 'societe&facture'); /* diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index 36085033987d05471b637fb48b65f98c7148b9e3..ea3e128c5674a6bcb7131e1b8052f2151ebb7f0b 100755 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -1,7 +1,8 @@ <?php -/* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net> - * Copyright (C) 2007-2010 Jean Heimburger <jean@tiaris.info> - * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> +/* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2007-2010 Jean Heimburger <jean@tiaris.info> + * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> + * Copyright (C) 2012 Regis Houssin <regis@dolibarr.fr> * * 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 @@ -35,9 +36,9 @@ $langs->load("compta"); // Protection if external user if ($user->societe_id > 0) -{ accessforbidden(); -} + +$result = restrictedArea($user, 'societe&facture'); /* * Actions diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 7340502119c066bafb8a1a4f18c1b05fa97edd4a..9c12199496ce13ba547d23f4551b11f1eb721c30 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -36,7 +36,8 @@ $langs->load("admin"); $langs->load("products"); // Security check -if (! $user->admin) accessforbidden(); +if (! $user->admin || empty($conf->product->enabled)) + accessforbidden(); $action = GETPOST('action','alpha'); $value = GETPOST('value','alpha');