From 273d9110db6ce3087cdac93fc5c471e885b029c9 Mon Sep 17 00:00:00 2001
From: "pawan.sharma" <pawan.sharma@sunarctechnologies.com>
Date: Mon, 9 May 2022 18:27:41 +0530
Subject: [PATCH] add date filter and change string

---
 project_report/report/project_revenue_custom_report2.py       | 4 ++--
 .../report/project_revenue_custom_report2_views.xml           | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/project_report/report/project_revenue_custom_report2.py b/project_report/report/project_revenue_custom_report2.py
index 5bdf5e8..5361ede 100755
--- a/project_report/report/project_revenue_custom_report2.py
+++ b/project_report/report/project_revenue_custom_report2.py
@@ -24,11 +24,11 @@ class ProjectRevenueCustomReport2(models.Model):
     employee_id = fields.Many2one('hr.employee', string='Consultant', readonly=True)
     timesheet_sdatetime = fields.Datetime(string='Timesheet Start Time', readonly=True)
     unit_amount = fields.Float('Timesheet Hours', digits=(16, 2))
-    timesheet_cost = fields.Float('Consultant Price', digits=(16, 2))
+    timesheet_cost = fields.Float('Hourly Cost', digits=(16, 2))
     profit_per = fields.Float(string='Profit (%)', digits=(16, 2))
     profit_amt = fields.Float(string='Profit Amount', digits=(16, 2))
     expenses_amt = fields.Float(string='Expenses Amount', digits=(16, 2))
-    pro_hourly_rate = fields.Float("Hourly Rate", digits=(16, 2), group_operator="max")
+    pro_hourly_rate = fields.Float("Hourly Revenue", digits=(16, 2), group_operator="max")
     budgeted_hours = fields.Float("Budgeted Hours", digits=(16, 2), readonly=True, group_operator="sum")
     budgeted_revenue = fields.Float("Budgeted Revenue", digits=(16, 2), readonly=True, group_operator="sum")
     actual_revenue = fields.Float("Actual Revenue", digits=(16, 2), readonly=True, group_operator="sum")
diff --git a/project_report/report/project_revenue_custom_report2_views.xml b/project_report/report/project_revenue_custom_report2_views.xml
index 62ef7fd..0796b80 100755
--- a/project_report/report/project_revenue_custom_report2_views.xml
+++ b/project_report/report/project_revenue_custom_report2_views.xml
@@ -70,6 +70,7 @@
                 <filter string="Hours are budgeted according to a consultant" name="cons" domain="[('pricing_type','=','employee_rate'),('project_type','=','hours_in_consultant')]"/>
                 <filter string="Total hours are budgeted without division to consultant" name="limit" domain="[('pricing_type','=','employee_rate'),('project_type','=','hours_no_limit')]"/>
                 <filter string="Not Fixed rate" name="notfixed" domain="[('pricing_type','!=','fixed_rate')]"/>
+                <filter string="Timesheet Date" name="filter_date_from" date="timesheet_sdatetime"/>
                 <group expand="1" string="Group By">
                     <filter string="Project" name="group_project" context="{'group_by':'project_id'}"/>
                     <filter string="Consultant" name="group_employee" context="{'group_by':'employee_id'}"/>