RM-90121 fix

axelor · Feb 2, 2025 · d1b3697 · d1b3697
1 parent fed3aaa
commit d1b3697
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/axelor-project/src/main/resources/views/Dashboard.xml b/axelor-project/src/main/resources/views/Dashboard.xml
@@ -335,7 +335,7 @@
       <field name="project" target="com.axelor.apps.project.db.Project" title="Project"
         type="reference" colSpan="12"/>
       <field name="employee" target="com.axelor.apps.hr.db.Employee" title="Employee"
-             type="reference" colSpan="12"/>
+        type="reference" colSpan="12"/>
       <field type="date" name="fromDate" title="From Date" required="true"/>
       <field type="date" name="toDate" title="To Date" required="true"/>
     </search-fields>
@@ -355,10 +355,13 @@
     <view name="project-task-dashboard-grid" type="grid"/>
     <view name="project-task-form" type="form"/>
     <view-param name="popup" value="true"/>
-    <domain> (self.taskDate &lt;= :toDate and self.taskDate &gt;= :fromDate )
+    <domain> (date(self.taskDate) &lt;= date(:toDate) and date(self.taskDate) &lt;= date(:fromDate) )
       and
       (self.project=:project OR :project IS NULL) and
-      (self.user.employee =:employee OR :employee IS NULL) </domain>
+      (self.assignedTo.employee =:employee OR :employee IS
+      NULL)
+
+    </domain>
   </action-view>
 
   <action-view name="project-planning-time-dashboard-action"