From 216e8c5279cfa47c16dcbfa9b3b6555f11858eaa Mon Sep 17 00:00:00 2001 From: prakash Date: Mon, 28 Mar 2022 15:18:31 +0530 Subject: [PATCH] Budgeted data issue fixed in report --- project_report/report/project_revenue_custom_report.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project_report/report/project_revenue_custom_report.py b/project_report/report/project_revenue_custom_report.py index 6296498..7fa6237 100755 --- a/project_report/report/project_revenue_custom_report.py +++ b/project_report/report/project_revenue_custom_report.py @@ -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,