diff --git a/project_report/report/cor_project_report.py b/project_report/report/cor_project_report.py index aa3d722..49e9112 100755 --- a/project_report/report/cor_project_report.py +++ b/project_report/report/cor_project_report.py @@ -13,7 +13,12 @@ class CorProjectReport(models.Model): project_id = fields.Many2one('project.project', string='Project', readonly=True) employee_id = fields.Many2one('hr.employee', string='Consultant', readonly=True) #hours_type = fields.Char(string="Hours Type", readonly=True) + price_unit = fields.Float("Hourly Rate") + budgeted_qty = fields.Float(string='Budgeted Hours', digits=(16, 2)) hours = fields.Float("Number of Hours", digits=(16, 2), readonly=True, group_operator="sum") + employee_price = fields.Float(string="Consultant Price") + consultant_cost = fields.Float("Actual Cost") + actual_revenue = fields.Float("Actual Revenue") # pricing_type = fields.Selection([ # ('fixed_rate', 'Fixed rate'), # ('employee_rate', 'Consultant rate') @@ -31,8 +36,13 @@ class CorProjectReport(models.Model): SELECT ROW_NUMBER() OVER() as id, aa.project_id AS project_id, aa.employee_id AS employee_id, - SUM(aa.unit_amount) AS hours + bb.price_unit AS price_unit, + bb.budgeted_qty AS budgeted_qty, + bb.employee_price AS employee_price, + SUM(aa.unit_amount) AS hours, + bb.consultant_cost AS consultant_cost FROM account_analytic_line aa - Left JOIN project_sale_line_employee_map bb ON bb.project_id = aa.project_id - GROUP BY aa.project_id, aa.employee_id, aa.amount + Left JOIN project_sale_line_employee_map bb ON bb.project_id = aa.project_id and bb.employee_id = aa.employee_id + where aa.project_id = 21 + GROUP BY aa.project_id, aa.employee_id,bb.price_unit,bb.budgeted_qty,bb.employee_price,bb.consultant_cost )""" % (self._table,)) diff --git a/project_report/report/cor_project_report_views.xml b/project_report/report/cor_project_report_views.xml index 841d9e0..8fb5459 100755 --- a/project_report/report/cor_project_report_views.xml +++ b/project_report/report/cor_project_report_views.xml @@ -32,7 +32,10 @@ + + + @@ -46,6 +49,10 @@ + + + + @@ -53,9 +60,9 @@ COR Project Report cor.project.report - graph,tree,pivot + tree,pivot,graph - {} + {'search_default_group_by_project': 1, 'default_res_model': 'cor.project.report'}