From 53b5f304a9f8d9b14791e7874da653d0cdb8ba92 Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Wed, 27 Jan 2021 16:04:36 +0530 Subject: [PATCH] make hourly rate and actual revenue changes --- cor_custom/models/project.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cor_custom/models/project.py b/cor_custom/models/project.py index 6d7bc1c..4d51ec7 100755 --- a/cor_custom/models/project.py +++ b/cor_custom/models/project.py @@ -125,7 +125,10 @@ class Project(models.Model): consultant_cost = consultant_cost + rec.consultant_cost timesheet_hour = timesheet_hour + rec.timesheet_hour record.consultant_cost = consultant_cost - record.actual_revenue = actual_revenue + if record.project_type == 'hours_in_consultant': + record.actual_revenue = actual_revenue + else: + record.actual_revenue = record.hourly_rate * timesheet_hour record.budgeted_hours = hour record.timesheet_hour = timesheet_hour total_exp = record.consultant_cost + record.expenses_amt @@ -136,8 +139,8 @@ class Project(models.Model): record.profit_per = (record.profit_amt / record.budgeted_revenue) * 100 if record.project_type == 'hours_in_consultant' and record.budgeted_hours > 0.0: record.hourly_rate = (record.budgeted_revenue / record.budgeted_hours) - if record.project_type == 'hours_no_limit' and record.budgeted_hours2 > 0.0: - record.hourly_rate = (record.budgeted_revenue / record.budgeted_hours2) + # if record.project_type == 'hours_no_limit' and record.budgeted_hours2 > 0.0: + # record.hourly_rate = (record.budgeted_revenue / record.budgeted_hours2) @api.depends('manager_per', 'hour_distribution') def compute_percentage_hours(self): @@ -162,8 +165,8 @@ class Project(models.Model): for rec in self.sale_line_employee_ids: hour = hour + rec.budgeted_qty self.budgeted_hours = hour - if self.budgeted_hours > 0.0: - self.hourly_rate = (self.budgeted_revenue / self.budgeted_hours) + if self.project_type == 'hours_in_consultant' and self.budgeted_hours > 0.0: + record.hourly_rate = (self.budgeted_revenue / self.budgeted_hours) @api.depends('sale_line_employee_ids') def onchange_compute_values(self):