RM-90121 Add the filter to allocation lines chart

axelor · Feb 3, 2025 · 7a8df8d · 7a8df8d
1 parent 8608145
commit 7a8df8d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/axelor-project/src/main/resources/views/Dashboard.xml b/axelor-project/src/main/resources/views/Dashboard.xml
@@ -357,7 +357,7 @@
     <view name="project-task-dashboard-grid" type="grid"/>
     <view name="project-task-form" type="form"/>
     <view-param name="popup" value="true"/>
-    <domain> (date(self.taskDate) &lt;= date(:toDate) and date(self.taskDate) &lt;= date(:fromDate)
+    <domain> (date(self.taskDate) &lt;= date(:toDate) and date(self.taskDate) &gt;= date(:fromDate)
       )
       and
       (self.project=:project OR :project IS NULL) and
@@ -401,6 +401,10 @@
       date(self.period.toDate)
       &gt;= date(:fromDate) ))
       and
-      (self.project=:project OR :project IS NULL)</domain>
+      (self.project=:project OR :project IS NULL)
+      and
+      (self.employee
+      =:employee OR :employee IS
+      NULL)</domain>
   </action-view>
 </object-views>