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

Timeline diff query updated

This commit is contained in:
projectsodoo 2021-03-01 12:24:08 +05:30
parent 5f712f2b54
commit 1d7eae7061
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project_report/report/project_timeline_report.py
View File

@ -56,7 +56,8 @@ class ProjectTimelineReport(models.Model):
date AS enddate,
'Budgeted' as timeline_type,
pro.budgeted_hours2 as hours,
DATE_PART('day', AGE(date, date_start)) AS timeline,
(date - datestart) as timeline,
--DATE_PART('day', AGE(date, date_start)) AS timeline,
pro.*
FROM
project_project PRO
@ -70,7 +71,8 @@ class ProjectTimelineReport(models.Model):
(select max(al.end_datetime::date) from account_analytic_line as al where pro.id=al.project_id) as enddate,
'Actual' as timeline_type,
sum(unit_amount) as hours,
DATE_PART('day', AGE((select max(al.end_datetime::date) from account_analytic_line as al where pro.id=al.project_id), (select min(al.start_datetime::date) from account_analytic_line as al where pro.id=al.project_id))) AS timeline,
((select max(al.end_datetime::date) from account_analytic_line as al where pro.id=al.project_id) - (select min(al.start_datetime::date) from account_analytic_line as al where pro.id=al.project_id)) AS timeline,
--DATE_PART('day', AGE((select max(al.end_datetime::date) from account_analytic_line as al where pro.id=al.project_id), (select min(al.start_datetime::date) from account_analytic_line as al where pro.id=al.project_id))) AS timeline,
pro.*
FROM project_project PRO
LEFT JOIN account_analytic_account AA ON PRO.analytic_account_id = AA.id