diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 053d293db83..5b633552380 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -310,8 +310,7 @@ if ($search_status != '' && $search_status >= 0) $sql.=" AND d.fk_statut IN (".$
if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
{
- $childids = $user->getAllChildIds();
- $childids[]=$user->id;
+ $childids = $user->getAllChildIds(1);
$sql.= " AND d.fk_user_author IN (".join(',',$childids).")\n";
}
// Add where from extra fields
@@ -442,12 +441,15 @@ if ($resql)
print ''.$langs->trans("Modify").'';
}
- $canedit=(($user->id == $user_id && $user->rights->expensereport->creer) || ($user->id != $user_id));
+ $childids = $user->getAllChildIds(1);
+
+ $canedit=((in_array($user_id, $childids) && $user->rights->expensereport->creer)
+ || ($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->expensereport->writeall_advance));
// Boutons d'actions
if ($canedit)
{
- print ''.$langs->trans("AddTrip").'';
+ print ''.$langs->trans("AddTrip").'';
}
print '';