diff --git a/cor_custom/models/project.py b/cor_custom/models/project.py index 37fa516..ecdbdfa 100755 --- a/cor_custom/models/project.py +++ b/cor_custom/models/project.py @@ -72,6 +72,7 @@ class Project(models.Model): project_cons_hrs = fields.One2many('project.consultant.hrs', 'project_id', 'Consultant Allocation', copy=False) comment = fields.Text(string='Comment') tag_ids = fields.Many2many('custom.project.tags', string='Tags') + is_check = fields.Boolean() @api.onchange('allowed_internal_user_ids') def onchange_add_allowed_internal_users(self): @@ -109,7 +110,7 @@ class Project(models.Model): 'employee_id': rec[1], 'timesheet_hour': rec[2]}) - @api.depends('cost', 'expenses_amt', 'budgeted_revenue') + @api.depends('cost', 'expenses_amt', 'budgeted_revenue', 'is_check') def _compute_calc(self): for record in self: consultant_cost = 0.0 @@ -139,8 +140,7 @@ class Project(models.Model): # record.profit_per = (record.profit_amt / record.budgeted_revenue) * 100 ##### CR Changes - if record.actual_revenue > record.total_expenses: - record.profit_amt = record.actual_revenue - record.total_expenses + record.profit_amt = record.actual_revenue - record.total_expenses if record.profit_amt > 0.0 and record.actual_revenue > 0.0: record.profit_per = (record.profit_amt / record.actual_revenue) * 100 ######################## diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml index f424b6f..52b08ce 100755 --- a/cor_custom/views/project_view.xml +++ b/cor_custom/views/project_view.xml @@ -59,6 +59,7 @@ +