Skip to content
Snippets Groups Projects
Commit f2c7b7da authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

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

parents 198cf18a a95e4164
No related branches found
No related tags found
No related merge requests found
......@@ -1685,7 +1685,8 @@ class ExpenseReport extends CommonObject
if ($option == 'toapprove') $sql.= " WHERE ex.fk_statut = 2";
else $sql.= " WHERE ex.fk_statut = 5";
$sql.= " AND ex.entity IN (".getEntity('expensereport', 1).")";
$sql.= " AND ex.fk_user_author IN (".join(',',$userchildids).")";
$sql.= " AND (ex.fk_user_author IN (".join(',',$userchildids).")";
$sql.= " OR ex.fk_user_validator IN (".join(',',$userchildids)."))";
$resql=$this->db->query($sql);
if ($resql)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment