From 9e171bbcf78596f33e047e1e8978833e7656d852 Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Wed, 16 Dec 2020 12:29:30 +0530 Subject: [PATCH] updated profit per --- cor_custom/models/project_overview.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cor_custom/models/project_overview.py b/cor_custom/models/project_overview.py index 3c1b54c..82f0f9c 100755 --- a/cor_custom/models/project_overview.py +++ b/cor_custom/models/project_overview.py @@ -98,9 +98,6 @@ class Project(models.Model): profit['expense_amount_untaxed_invoiced'] += data.get('expense_amount_untaxed_invoiced', 0.0) profit['other_revenues'] = other_revenues or 0 profit['total'] = sum([profit[item] for item in profit.keys()]) - dashboard_values['profit'] = profit - - values['dashboard'] = dashboard_values # Profit Percentage added in COR Project try: @@ -110,6 +107,13 @@ class Project(models.Model): profit['profit_percent'] = profit_percent except Exception: profit['profit_percent'] = 0 + # End + + dashboard_values['profit'] = profit + + + values['dashboard'] = dashboard_values + # # Time Repartition (per employee per billable types)