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

Parent sub project wrong field issue fixed

This commit is contained in:
root 2022-09-30 15:52:02 +05:30
parent 77216be798
commit 54da864d9d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
project_report/report/project_revenue_custom_report3.py
View File

@ -472,7 +472,8 @@ data3_sub_project as (
SELECT
min(sub_pro_data.pro_sdate) as start_date,
max(sub_pro_data.pro_edate) as end_date,
sub_pro_data.parent_project as project_id,
--sub_pro_data.parent_project as project_id,
sub_pro_data.pproject_id as project_id,
sub_pro_data.project_active,
sub_pro_data.project_type,
sub_pro_data.pricing_type,
@ -500,7 +501,7 @@ SELECT
where sub_pro_data.pricing_type='employee_rate' and sub_pro_data.project_type='hours_in_consultant'
and sub_pro_data.is_sub_project = True
group by
sub_pro_data.parent_project,
sub_pro_data.pproject_id,
sub_pro_data.project_active,
sub_pro_data.project_type,
sub_pro_data.parent_project,
@ -515,7 +516,8 @@ UNION
SELECT
drange_data2.start_date,
drange_data2.end_date,
sub_pro_data.parent_project as project_id,
sub_pro_data.pproject_id as project_id,
--sub_pro_data.parent_project as project_id,
--drange_data2.project_id,
sub_pro_data.project_active,
sub_pro_data.project_type,
@ -552,7 +554,8 @@ SELECT
group by
drange_data2.start_date,
drange_data2.end_date,
sub_pro_data.parent_project,
sub_pro_data.pproject_id,
--sub_pro_data.parent_project,
drange_data2.employee_id,
sub_pro_data.project_active,
sub_pro_data.project_type,