subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revenue report updated

This commit is contained in:
prakash 2022-04-28 12:55:09 +05:30
parent 111822605a
commit 912cf53fff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project_report/report/project_revenue_custom_report.py
View File

@ -237,10 +237,10 @@ class ProjectRevenueCustomReport(models.Model):
actual_cost = line['actual_cost']
if 'pro_hourly_rate' in line:
hourly_rate = line['pro_hourly_rate']
if 'unit_amount' in line and 'pro_hourly_rate' in line: # and 'id' in line
if 'unit_amount' in line and not 'id' in line: # and 'pro_hourly_rate' in line and 'id' in line
if hourly_rate != 0:
line['actual_revenue'] = hourly_rate * line['unit_amount']
if 'unit_amount' in line and 'timesheet_cost' in line:
if 'unit_amount' in line and 'timesheet_cost' in line and not 'id' in line:
line['actual_cost'] = line['timesheet_cost'] * line['unit_amount']
if 'overall_budgeted_revenue' in line and 'budgeted_hours' in line:
if line['budgeted_hours'] > 0: