Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
afdca18886
@ -289,7 +289,7 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco
|
||||
* Last salaries
|
||||
*/
|
||||
if (!empty($conf->salaries->enabled) &&
|
||||
($user->rights->salaries->read && $object->id == $user->id)
|
||||
(($object->fk_user == $user->id) || ($user->rights->salaries->read && $object->id == $user->id))
|
||||
)
|
||||
{
|
||||
$salary = new PaymentSalary($db);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user