Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts: htdocs/compta/resultat/index.php htdocs/projet/tasks/list.php
This commit is contained in:
commit
6a41d5bba8
@ -58,6 +58,7 @@ $search_task_label = GETPOST('search_task_label');
|
||||
$search_task_description = GETPOST('search_task_description');
|
||||
$search_project_user = GETPOST('search_project_user');
|
||||
$search_task_user = GETPOST('search_task_user');
|
||||
$search_societe = GETPOST('search_societe');
|
||||
|
||||
$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
|
||||
if ($mine) { $search_task_user = $user->id; $mine = 0; }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user