diff --git a/project_report/report/project_timesheet_report.py b/project_report/report/project_timesheet_report.py index 13b7862..e9bd9aa 100755 --- a/project_report/report/project_timesheet_report.py +++ b/project_report/report/project_timesheet_report.py @@ -15,17 +15,17 @@ class ProjectTimelineReport(models.Model): start_date = fields.Date(string='Start Time', readonly=True) employee_id = fields.Many2one('hr.employee', string='Employee', readonly=True) project_id = fields.Many2one('project.project', string='Project', readonly=True) - #sub_project = fields.Many2one('project.project', string='Sub Project', readonly=True) + sub_project = fields.Many2one('project.project', string='Sub Project', readonly=True) duration = fields.Float('Duration', readonly=True) timestamp = fields.Char('Timestamp', readonly=True) task_id = fields.Many2one('project.task', string='Task', readonly=True) description = fields.Char('Description', readonly=True) - sub_project = fields.Many2many('project.project', compute='_compute_related_subproject') + #sub_project = fields.Many2many('project.project', compute='_compute_related_subproject') - @api.depends('project_id') + """@api.depends('project_id') def _compute_related_subproject(self): for val in self: - val.sub_project = val.project_id.sub_project.ids + val.sub_project = val.project_id.sub_project.ids""" @api.model def export_data(self, fields): @@ -73,6 +73,7 @@ class ProjectTimelineReport(models.Model): start_datetime::date as start_date, employee_id, project_id, + sub_project, unit_amount as duration, 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, diff --git a/project_report/report/project_timesheet_report_views.xml b/project_report/report/project_timesheet_report_views.xml index 8d724da..288edb9 100755 --- a/project_report/report/project_timesheet_report_views.xml +++ b/project_report/report/project_timesheet_report_views.xml @@ -10,7 +10,7 @@ - +