From dfc9116dd2dc4b638d3a6b6b12cf1dd57e3f1225 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 21 Oct 2022 14:49:14 +0530 Subject: [PATCH] report bud hrs and rev display updated --- project_report/report/project_revenue_custom_report3.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project_report/report/project_revenue_custom_report3.py b/project_report/report/project_revenue_custom_report3.py index a4bd4ef..c2ce86b 100644 --- a/project_report/report/project_revenue_custom_report3.py +++ b/project_report/report/project_revenue_custom_report3.py @@ -261,11 +261,11 @@ data2 as ( 0.0 AS profit_amt, 0.0 AS profit_per FROM pro_data - right join account_analytic_line AAL on AAL.project_id=pro_data.pproject_id + --right join account_analytic_line AAL on AAL.project_id=pro_data.pproject_id WHERE pro_data.pricing_type='employee_rate' and pro_data.project_type='hours_no_limit' - and AAL.sub_project is null + --and AAL.sub_project is null and COALESCE(pro_data.is_sub_project, FALSE) = False - and (pro_data.budgeted_revenue>0 or pro_data.budgeted_hours>0) + and (pro_data.budgeted_revenue>0 or pro_data.budgeted_hours>0 or pro_data.expenses_amt>0) group by pro_data.pproject_id, pro_data.project_active, @@ -364,7 +364,7 @@ data2_sub_project as ( FROM sub_pro_data WHERE sub_pro_data.pricing_type='employee_rate' and sub_pro_data.project_type='hours_no_limit' and sub_pro_data.is_sub_project = TRUE - and (sub_pro_data.budgeted_revenue>0 or sub_pro_data.budgeted_hours>0) + and (sub_pro_data.budgeted_revenue>0 or sub_pro_data.budgeted_hours>0 or sub_pro_data.expenses_amt>0) group by sub_pro_data.parent_project, sub_pro_data.project_active,