Merge branch 'copy_master' into 'master'

Copy master

See merge request prakash.jain/cor-odoo!216
This commit is contained in:
pawan.sharma 2022-03-14 13:43:36 +00:00
commit 391a660858
1 changed files with 9 additions and 2 deletions

View File

@ -145,8 +145,10 @@ class Project(models.Model):
########################
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)
########### Added New code 14 March 2022 ###########
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):
@ -174,6 +176,11 @@ class Project(models.Model):
if self.project_type == 'hours_in_consultant' and self.budgeted_hours > 0.0:
self.hourly_rate = (self.budgeted_revenue / self.budgeted_hours)
########### Added New code 14 March 2022 ###########
if self.project_type == 'hours_no_limit' and self.budgeted_hours2 > 0.0:
self.hourly_rate = (self.budgeted_revenue / self.budgeted_hours2)
###############
@api.depends('sale_line_employee_ids')
def onchange_compute_values(self):
for record in self: