diff --git a/axelor-project/src/main/resources/views/Dashboard.xml b/axelor-project/src/main/resources/views/Dashboard.xml index 7949c7ca5a5..8696f9256de 100644 --- a/axelor-project/src/main/resources/views/Dashboard.xml +++ b/axelor-project/src/main/resources/views/Dashboard.xml @@ -357,10 +357,12 @@ - (date(self.taskDate) <= date(:toDate) and date(self.taskDate) <= date(:fromDate) ) + (date(self.taskDate) <= date(:toDate) and date(self.taskDate) <= date(:fromDate) + ) and (self.project=:project OR :project IS NULL) and - (self.assignedTo.employee =:employee OR :employee IS + (self.assignedTo.employee =:employee OR + :employee IS NULL) @@ -376,7 +378,16 @@ (date(self.endDateTime) <= date(:toDate) and date(self.endDateTime) >= date(:fromDate) )) and - (self.project=:project OR :project IS NULL) + (self.project=:project OR :project IS NULL) + and + (self.employee + =:employee OR :employee IS + NULL) + + + + +