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

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source 
Conflicts:
	htdocs/filefunc.inc.php
This commit is contained in:
Laurent Destailleur 2018-03-25 15:27:31 +02:00
commit 934d2d8881
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/modResource.class.php
View File

@ -231,7 +231,7 @@ class modResource extends DolibarrModules
'langs'=> 'resource', 'langs'=> 'resource',
'position'=> 101, 'position'=> 101,
'enabled'=> '1', 'enabled'=> '1',
'perms'=> '$user->rights->resource->read', 'perms'=> '$user->rights->resource->write',
'target'=> '', 'target'=> '',
'user'=> 0 'user'=> 0
); );

2
htdocs/fourn/card.php
View File

@ -50,7 +50,7 @@ $cancelbutton = GETPOST('cancel','alpha');
// Security check // Security check
$id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int')); $id = (GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
if ($user->societe_id) $id=$user->societe_id; if ($user->societe_id) $id=$user->societe_id;
$result = restrictedArea($user, 'societe&fournisseur', $id, '&societe'); $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe', '', 'rowid');
$object = new Fournisseur($db); $object = new Fournisseur($db);
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);