diff --git a/project_report/report/project_revenue_custom_report3.py b/project_report/report/project_revenue_custom_report3.py
index c2ce86b..20137de 100644
--- a/project_report/report/project_revenue_custom_report3.py
+++ b/project_report/report/project_revenue_custom_report3.py
@@ -12,7 +12,7 @@ class ProjectRevenueCustomReport3(models.Model):
start_date = fields.Date(string='Start Date', readonly=True)
#start_datetime = fields.Datetime(string='Start Datetime111111111', readonly=True)
- end_date = fields.Date(string='End Date', readonly=True)
+ #end_date = fields.Date(string='End Date', readonly=True)
project_id = fields.Many2one('project.project', string='Project', readonly=True)
parent_project = fields.Many2one('project.project', string='Parent Project', readonly=True)
partner_id = fields.Many2one('res.partner', string='Client', readonly=True)
@@ -141,7 +141,6 @@ invoice_date as (
data1 as (
SELECT
TO_CHAR(start_datetime, 'YYYY-MM-01')::date as start_date,
- (date_trunc('month', end_datetime) + interval '1 month' - interval '1 day')::date as end_date,
pro_data.pproject_id as project_id,
pro_data.project_active,
pro_data.project_type,
@@ -187,7 +186,6 @@ data1 as (
data1_sub as (
SELECT
TO_CHAR(start_datetime, 'YYYY-MM-01')::date as start_date,
- (date_trunc('month', end_datetime) + interval '1 month' - interval '1 day')::date as end_date,
sub_pro_data.parent_project as project_id,
sub_pro_data.project_active,
sub_pro_data.project_type,
@@ -232,10 +230,7 @@ data1_sub as (
),
data2 as (
SELECT
- --coalesce(min(pro_data.pro_sdate), min(AAL.start_datetime::date)) as start_date,
- --coalesce(max(pro_data.pro_edate), max(AAL.end_datetime::date)) as end_date,
null::date as start_date,
- null::date as end_date,
pro_data.pproject_id as project_id,
pro_data.project_active,
pro_data.project_type,
@@ -261,9 +256,7 @@ 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
WHERE pro_data.pricing_type='employee_rate' and pro_data.project_type='hours_no_limit'
- --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 or pro_data.expenses_amt>0)
group by
@@ -280,8 +273,7 @@ data2 as (
pro_data.expenses_amt
UNION
SELECT
- TO_CHAR(start_datetime, 'YYYY-MM-01')::date as start_date,
- (date_trunc('month', end_datetime) + interval '1 month' - interval '1 day')::date as end_date,
+ TO_CHAR(AAL.start_datetime, 'YYYY-MM-01')::date as start_date,
pro_data.pproject_id as project_id,
pro_data.project_active,
pro_data.project_type,
@@ -312,8 +304,8 @@ SELECT
AND AAL.sub_project is null
AND COALESCE(pro_data.is_sub_project, FALSE) = False
group by
- pro_data.pro_sdate,
- pro_data.pro_edate,
+ --pro_data.pro_sdate,
+ --pro_data.pro_edate,
pro_data.pproject_id,
pro_data.project_active,
pro_data.project_type,
@@ -333,10 +325,7 @@ SELECT
),
data2_sub_project as (
SELECT
- --min(sub_pro_data.pro_sdate) as start_date,
- --max(sub_pro_data.pro_edate)as end_date,
null::date as start_date,
- null::date as end_date,
sub_pro_data.parent_project as project_id,
sub_pro_data.project_active,
sub_pro_data.project_type,
@@ -380,7 +369,6 @@ data2_sub_project as (
UNION
SELECT
TO_CHAR(start_datetime, 'YYYY-MM-01')::date as start_date,
- (date_trunc('month', end_datetime) + interval '1 month' - interval '1 day')::date as end_date,
sub_pro_data.pproject_id as project_id,
sub_pro_data.project_active,
sub_pro_data.project_type,
@@ -432,10 +420,7 @@ SELECT
),
data3 as (
SELECT
- --coalesce(min(pro_data.pro_sdate), min(AAL.start_datetime::date)) as start_date,
- --coalesce(max(pro_data.pro_edate), max(AAL.end_datetime::date)) as end_date,
null::date as start_date,
- null::date as end_date,
pro_data.pproject_id as project_id,
pro_data.project_active,
pro_data.project_type,
@@ -480,7 +465,6 @@ SELECT
UNION
SELECT
null::date as start_date,
- null::date as end_date,
cons_data1.project_id,
pro_data.project_active,
pro_data.project_type,
@@ -523,7 +507,6 @@ SELECT
UNION
SELECT
TO_CHAR(start_datetime, 'YYYY-MM-01')::date as start_date,
- (date_trunc('month', end_datetime) + interval '1 month' - interval '1 day')::date as end_date,
pro_data.pproject_id as project_id,
pro_data.project_active,
pro_data.project_type,
@@ -584,10 +567,7 @@ SELECT
),
data3_sub_project as (
SELECT
- --min(sub_pro_data.pro_sdate) as start_date,
- --max(sub_pro_data.pro_edate) as end_date,
null::date as start_date,
- null::date as end_date,
--sub_pro_data.parent_project as project_id,
sub_pro_data.pproject_id as project_id,
sub_pro_data.project_active,
@@ -632,7 +612,6 @@ SELECT
UNION
SELECT
null::date as start_date,
- null::date as end_date,
sub_pro_data.pproject_id as project_id,
sub_pro_data.project_active,
sub_pro_data.project_type,
@@ -676,7 +655,6 @@ SELECT
UNION
SELECT
TO_CHAR(start_datetime, 'YYYY-MM-01')::date as start_date,
- (date_trunc('month', end_datetime) + interval '1 month' - interval '1 day')::date as end_date,
sub_pro_data.pproject_id as project_id,
sub_pro_data.project_active,
sub_pro_data.project_type,
@@ -737,7 +715,6 @@ SELECT
),
invoice_data as (SELECT
invoice_date.date as start_date,
- invoice_date.date as end_date,
invoice_date.project_id,
pro_data.project_active,
pro_data.project_type,
@@ -768,8 +745,6 @@ invoice_data as (SELECT
),
invoice_data_sub as (SELECT
invoice_date.date as start_date,
- invoice_date.date as end_date,
- --invoice_date.project_id,
sub_pro_data.parent_project as project_id,
sub_pro_data.project_active,
sub_pro_data.project_type,
@@ -818,7 +793,6 @@ select * from invoice_data_sub
select
ROW_NUMBER() OVER() as id,
start_date,
- end_date,
project_id,
project_active,
project_type,
@@ -846,7 +820,6 @@ select
from res
group by
start_date,
- end_date,
project_id,
project_active,
project_type,
diff --git a/project_report/report/project_revenue_custom_report3_views.xml b/project_report/report/project_revenue_custom_report3_views.xml
index 0c2d4d2..20ef8d4 100644
--- a/project_report/report/project_revenue_custom_report3_views.xml
+++ b/project_report/report/project_revenue_custom_report3_views.xml
@@ -56,7 +56,6 @@
-