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

Dolibarr · Mar 5, 2017 · f2c7b7d · f2c7b7d
2 parents 198cf18 + a95e416
commit f2c7b7d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
@@ -1685,7 +1685,8 @@ function load_board($user, $option='topay')
         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)