Skip to content
Snippets Groups Projects
Commit fdd781f6 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

parents d4a19f06 286854bf
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,7 @@
/* 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');
/*
......
......@@ -2,6 +2,7 @@
/* 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
......
......@@ -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');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment