Browse Source

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

Laurent Destailleur 8 years ago
parent
commit
f2c7b7da7e
1 changed files with 2 additions and 1 deletions
  1. 2 1
      htdocs/expensereport/class/expensereport.class.php

+ 2 - 1
htdocs/expensereport/class/expensereport.class.php

@@ -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)