diff --git a/project_report/report/project_timesheet_report.py b/project_report/report/project_timesheet_report.py index 583cc9f..6a551fb 100755 --- a/project_report/report/project_timesheet_report.py +++ b/project_report/report/project_timesheet_report.py @@ -70,17 +70,20 @@ class ProjectTimelineReport(models.Model): CREATE OR REPLACE VIEW %s AS ( SELECT ROW_NUMBER() OVER() as id, - start_datetime::date as start_date, - employee_id, - project_id, - sub_project, + aal.start_datetime::date as start_date, + aal.employee_id, + aal.project_id, + aal.sub_project, unit_amount as duration, CONCAT(to_char((start_datetime at time zone 'utc') at time zone 'Asia/Jerusalem', 'HH24:MI'), '-', to_char((end_datetime at time zone 'utc') at time zone 'Asia/Jerusalem', 'HH24:MI')) as timestamp, --CONCAT(to_char(start_datetime at time zone 'utc', 'HH24:MI'), '-', to_char(end_datetime at time zone 'utc', 'HH24:MI')) as timestamp, task_id, - name as description - from account_analytic_line + aal.name as description + from account_analytic_line aal + left join project_project pro on pro.id = aal.project_id + --left join hr_employee emp on emp.id = aal.employee_id + where pro.active = True )""" % (self._table,))