updated profit per
This commit is contained in:
parent
6d1f27a4a8
commit
9e171bbcf7
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue