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

Merge branch 'cor_cr' into 'master' 

report bud hrs and rev display updated

See merge request prakash.jain/cor-odoo!264
This commit is contained in:
prakash.jain 2022-10-21 14:51:39 +05:30
parent 642c93f04c dfc9116dd2
commit aa41d29a36
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_report3.py
View File

@ -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,