Skip to content

Commit

Permalink
RM-90121 fix
Browse files Browse the repository at this point in the history
  • Loading branch information
mea-axelor committed Feb 2, 2025
1 parent c9130cd commit a5b3ae7
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions axelor-project/src/main/resources/views/Dashboard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -350,10 +350,16 @@
model="com.axelor.apps.project.db.ProjectTask" title="Project task">
<view name="project-task-dashboard-grid" type="grid"/>
<view name="project-task-form" type="form"/>
<domain> (self.taskDate &lt;= :toDate and self.taskDate &gt;= :fromDate )
<domain> (date(self.taskDate) &lt;= date(:toDate) and date(self.taskDate) &gt;= date(:fromDate) )
and
(self.project=:project OR :project IS NULL) and
(self.user.employee =:employee OR :employee IS NULL) </domain>
(self.user.employee =:employee OR :employee IS
NULL)
__repo__(employee).all().filter('self.employee.id = ?1',:employee).fetchOne()
"/>


</domain>
</action-view>

</object-views>

0 comments on commit a5b3ae7

Please sign in to comment.