From 4f5639cb6aa272056addf973232945e695731d4c Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Wed, 24 Feb 2021 20:09:09 +0530 Subject: [PATCH] remove conflict --- project_report/report/project_budget_hrs_analysis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project_report/report/project_budget_hrs_analysis.py b/project_report/report/project_budget_hrs_analysis.py index f71a2f6..de52b0e 100755 --- a/project_report/report/project_budget_hrs_analysis.py +++ b/project_report/report/project_budget_hrs_analysis.py @@ -21,7 +21,7 @@ class BudgetHrsAnalysis(models.Model): partner_id = fields.Many2one('res.partner', string='Client', readonly=True) employee_id = fields.Many2one('hr.employee', string='Consultant', readonly=True) hours_type = fields.Char(string="Hours Type", readonly=True) - hours = fields.Float("Timeline", digits=(16, 2), readonly=True, group_operator="sum") + hours = fields.Float("Number of Hours", digits=(16, 2), readonly=True, group_operator="sum") pricing_type = fields.Selection([ ('fixed_rate', 'Fixed rate'), ('employee_rate', 'Consultant rate')