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

Merge pull request #4628 from aspangaro/3.8-p2

Browse Source 
Fixed: Correct problem of rights beetween tax and salaries module
This commit is contained in:
Laurent Destailleur 2016-02-15 13:50:06 +01:00
commit be77887477
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/charges/index.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2014 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> * Copyright (C) 2011-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2011-2014 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr> * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* *
@ -86,7 +86,7 @@ if (GETPOST("mode") != 'sconly')
} }
// Payment Salary // Payment Salary
if ($conf->salaries->enabled) if (! empty($conf->salaries->enabled) && $user->rights->salaries->read)
{ {
if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
{ {
@ -167,7 +167,7 @@ if ($conf->salaries->enabled)
} }
if ($conf->tax->enabled) if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
{ {
// Social contributions only // Social contributions only
if (GETPOST("mode") != 'sconly') if (GETPOST("mode") != 'sconly')
@ -278,7 +278,7 @@ if ($conf->tax->enabled)
} }
// VAT // VAT
if ($conf->tax->enabled) if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
{ {
if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
{ {