Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Conflicts:
	htdocs/projet/info.php
This commit is contained in:
Laurent Destailleur 2020-08-07 12:09:58 +02:00
commit 68a3716fd2

View File

@ -63,7 +63,7 @@ $search_agenda_label = GETPOST('search_agenda_label');
$id = GETPOST("id", 'int');
$socid = 0;
//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignement.
$result = restrictedArea($user, 'projet', $id, '');
$result = restrictedArea($user, 'projet', $id, 'projet&project');
if (!$user->rights->projet->lire) accessforbidden();