From 6cdc76a02e2fc2f11875358bf9c8b2544f372442 Mon Sep 17 00:00:00 2001
From: root <prakash.jain@sunarctechnologies.com>
Date: Tue, 30 Aug 2022 10:04:00 +0530
Subject: [PATCH] Report sub project issue fixed

---
 .../report/project_revenue_custom_report3.py  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/project_report/report/project_revenue_custom_report3.py b/project_report/report/project_revenue_custom_report3.py
index 95c68ca..41447cb 100644
--- a/project_report/report/project_revenue_custom_report3.py
+++ b/project_report/report/project_revenue_custom_report3.py
@@ -59,7 +59,6 @@ with pro_data as (
         PRO.project_type,
         PRO.pricing_type,
        (select PRO.id from project_subproject_rel as PAR where PRO.id=PAR.project_id limit 1) as parent_project,
-        PRO.sub_project as sub_project,
         STRING_AGG(distinct tag_master.name, ', ') as tag_name,
         PRO.partner_id AS partner_id,
         PRO.budgeted_revenue as budgeted_revenue,
@@ -128,7 +127,7 @@ data1 as (
         pro_data.project_type,
         pro_data.pricing_type,
         pro_data.parent_project,
-        pro_data.sub_project,
+        AAL.sub_project,
         null::char as role,
         pro_data.tag_name,
         pro_data.partner_id,
@@ -160,7 +159,7 @@ data1 as (
         pro_data.project_type,
         pro_data.pricing_type,
         pro_data.parent_project,
-        pro_data.sub_project,
+        AAL.sub_project,
         pro_data.tag_name,
         pro_data.partner_id,
         --pro_tsheet.timesheet_id,
@@ -177,7 +176,7 @@ data2 as (
         pro_data.project_type,
         pro_data.pricing_type,
         pro_data.parent_project,
-        pro_data.sub_project,
+        null::int as sub_project,
         null::char as role,
         pro_data.tag_name,
         pro_data.partner_id,
@@ -208,7 +207,7 @@ data2 as (
         pro_data.project_type,
         pro_data.pricing_type,
         pro_data.parent_project,
-        pro_data.sub_project,
+        sub_project,
         pro_data.tag_name,
         pro_data.partner_id,
         drange_data1.employee_id,
@@ -224,7 +223,7 @@ SELECT
         pro_data.project_type,
         pro_data.pricing_type,
         pro_data.parent_project,
-        pro_data.sub_project,
+        AAL.sub_project,
         null::char as role,
         pro_data.tag_name,
         pro_data.partner_id,
@@ -257,7 +256,7 @@ SELECT
         pro_data.project_type,
         pro_data.pricing_type,
         pro_data.parent_project,
-        pro_data.sub_project,
+        AAL.sub_project,
         pro_data.tag_name,
         pro_data.partner_id,
         drange_data1.employee_id,
@@ -277,7 +276,7 @@ SELECT
     pro_data.project_type,
     pro_data.pricing_type,
     pro_data.parent_project,
-    pro_data.sub_project,
+    AAL.sub_project,
     cons_data1.role,
     pro_data.tag_name,
     pro_data.partner_id,
@@ -310,7 +309,7 @@ SELECT
     pro_data.project_active,
     pro_data.project_type,
     pro_data.parent_project,
-    pro_data.sub_project,
+    AAL.sub_project,
     cons_data1.role,
     pro_data.tag_name,
     pro_data.pricing_type,
@@ -332,7 +331,7 @@ SELECT
     pro_data.project_type,
     pro_data.pricing_type,
     pro_data.parent_project,
-    pro_data.sub_project,
+    null::int as sub_project,
     cons_data1.role,
     pro_data.tag_name,
     pro_data.partner_id,
@@ -359,7 +358,7 @@ SELECT
     pro_data.project_type,
     pro_data.pricing_type,
     pro_data.parent_project,
-    pro_data.sub_project,
+    sub_project,
     cons_data1.role,
     pro_data.tag_name,
     pro_data.partner_id,
@@ -381,7 +380,7 @@ invoice_data as (SELECT
     pro_data.project_type,
     pro_data.pricing_type,
     pro_data.parent_project,
-    pro_data.sub_project,
+    null::int as sub_project,
     null::char as role,
     pro_data.tag_name,
     pro_data.partner_id,