diff --git a/project_report/report/project_revenue_custom_report2.py b/project_report/report/project_revenue_custom_report2.py index 3a8b418..4388793 100755 --- a/project_report/report/project_revenue_custom_report2.py +++ b/project_report/report/project_revenue_custom_report2.py @@ -11,6 +11,7 @@ class ProjectRevenueCustomReport2(models.Model): _auto = False project_id = fields.Many2one('project.project', string='Project', readonly=True) + timesheet_id = fields.Integer(string='Timesheet ID', readonly=True) parent_project = fields.Many2one('project.project', string='Parent Project', readonly=True) partner_id = fields.Many2one('res.partner', string='Client', readonly=True) pricing_type = fields.Selection([ @@ -45,6 +46,7 @@ class ProjectRevenueCustomReport2(models.Model): CREATE OR REPLACE VIEW %s AS ( SELECT ROW_NUMBER() OVER() as id, project_id, + timesheet_id, project_active, parentproject as parent_project, project_type, @@ -66,6 +68,7 @@ class ProjectRevenueCustomReport2(models.Model): timesheet_sdatetime from ( select pro.id AS project_id, + AAL.id as timesheet_id, pro.active as project_active, (select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject, pro.partner_id AS partner_id, @@ -92,6 +95,7 @@ class ProjectRevenueCustomReport2(models.Model): UNION select pro.id AS project_id, + null as timesheet_id, pro.active as project_active, (select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject, pro.partner_id AS partner_id, @@ -116,6 +120,7 @@ class ProjectRevenueCustomReport2(models.Model): UNION select pro.id AS project_id, + AAL.id as timesheet_id, pro.active as project_active, (select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject, pro.partner_id AS partner_id, @@ -142,6 +147,7 @@ class ProjectRevenueCustomReport2(models.Model): UNION select pro.id AS project_id, + null as timesheet_id, pro.active as project_active, (select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject, pro.partner_id AS partner_id, @@ -169,6 +175,7 @@ class ProjectRevenueCustomReport2(models.Model): UNION select pro.id AS project_id, + null as timesheet_id, pro.active as project_active, (select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject, pro.partner_id AS partner_id, @@ -193,6 +200,7 @@ class ProjectRevenueCustomReport2(models.Model): UNION select pro.id AS project_id, + AAL.id as timesheet_id, pro.active as project_active, (select project_id from project_subproject_rel as par where pro.id=par.id limit 1) as parentproject, pro.partner_id AS partner_id,