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

Budgeted data issue fixed in report

This commit is contained in:
prakash 2022-03-28 15:18:31 +05:30
parent 8820fb9115
commit 216e8c5279
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
project_report/report/project_revenue_custom_report.py
View File

@ -108,7 +108,7 @@ class ProjectRevenueCustomReport(models.Model):
pro.project_type AS project_type,
pro.pricing_type as pricing_type,
AAL.employee_id AS employee_id,
0.0 AS budgeted_revenue,
0.0 AS budgeted_revenue,
0.0 AS budgeted_hours,
0.0 AS pro_hourly_rate,
(AAL.unit_amount * pro.hourly_rate) AS actual_revenue,
@ -132,7 +132,7 @@ class ProjectRevenueCustomReport(models.Model):
pro_emp.employee_id AS employee_id,
pro_emp.cost AS budgeted_revenue,
pro_emp.budgeted_qty AS budgeted_hours,
0.0 as pro_hourly_rate,
COALESCE(pro_emp.price_unit, 0) as pro_hourly_rate,
0.0 AS actual_revenue,
0.0 AS actual_cost,
0.0 as profit_per,
@ -173,8 +173,8 @@ class ProjectRevenueCustomReport(models.Model):
pro.project_type AS project_type,
pro.pricing_type as pricing_type,
AAL.employee_id AS employee_id,
COALESCE(pro_emp.price_unit, 0) as pro_hourly_rate,
0.0 AS budgeted_revenue,
0.0 AS pro_hourly_rate,
0.0 AS budgeted_revenue,
0.0 AS budgeted_hours,
(AAL.unit_amount * pro_emp.price_unit) AS actual_revenue,
case when pro_emp.employee_price is null then (AAL.amount * -1) else (AAL.unit_amount * pro_emp.employee_price) end as actual_cost,