diff --git a/addons/project_issue/models/project_issue.py b/addons/project_issue/models/project_issue.py index 64e027d6b356ff2de47411efdd2d66a46e0df117..f2d667a4a500ad014e40073679ed7f993f7e1854 100644 --- a/addons/project_issue/models/project_issue.py +++ b/addons/project_issue/models/project_issue.py @@ -41,7 +41,7 @@ class ProjectIssue(models.Model): date_closed = fields.Datetime(string='Closed', readonly=True, index=True) date = fields.Datetime('Date') date_last_stage_update = fields.Datetime(string='Last Stage Update', index=True, default=fields.Datetime.now) - channel = fields.Char(string='Channel', help="Communication channel.") + channel = fields.Char(string='Channel', help="Communication channel.") # TDE note: is it still used somewhere ? tag_ids = fields.Many2many('project.tags', string='Tags') priority = fields.Selection([('0', 'Low'), ('1', 'Normal'), ('2', 'High')], 'Priority', index=True, default='0') stage_id = fields.Many2one('project.task.type', string='Stage', track_visibility='onchange', index=True, diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 2fd80ed6485311bbccc49e88f640ccb0b7182ea8..c81f5ccc23cba3afcff9c9e5268bec589c36c388 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -25,8 +25,6 @@ class ProjectIssueReport(models.Model): project_id = fields.Many2one('project.project', 'Project', readonly=True) user_id = fields.Many2one('res.users', 'Assigned to', readonly=True) partner_id = fields.Many2one('res.partner', 'Contact') - channel = fields.Char('Channel', readonly=True, help="Communication Channel.") - task_id = fields.Many2one('project.task', 'Task') email = fields.Integer('# Emails', readonly=True) @api.model_cr @@ -49,11 +47,9 @@ class ProjectIssueReport(models.Model): c.project_id as project_id, 1 as nbr_issues, c.partner_id, - c.channel, - c.task_id, c.day_open as delay_open, c.day_close as delay_close, - (SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email + (SELECT count(id) FROM mail_message WHERE model='project.issue' AND message_type IN ('email', 'comment') AND res_id=c.id) AS email FROM project_issue c diff --git a/addons/project_issue/report/project_issue_report_views.xml b/addons/project_issue/report/project_issue_report_views.xml index 5f2d2260fdb20812201e33cf945bc2bf6c160720..e5aeefedfc49b393259656183fb56940c9789871 100644 --- a/addons/project_issue/report/project_issue_report_views.xml +++ b/addons/project_issue/report/project_issue_report_views.xml @@ -48,8 +48,6 @@ <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/> <field name="stage_id"/> <filter string="Unassigned" name="unassigned" domain="[('user_id','=',False)]"/> - <separator/> - <filter string="New" name="new" domain="[('stage_id.sequence', '<=', 1)]"/> <group expand="1" string="Group By"> <filter string="Assigned to" name="Responsible" context="{'group_by':'user_id'}" /> <filter string="Project" name="project" context="{'group_by':'project_id'}" />