From db110b250ab7929cb364447f8cec2cee6fdcb115 Mon Sep 17 00:00:00 2001 From: Jigar Patel Date: Mon, 8 Sep 2014 14:20:44 +0530 Subject: [PATCH] [REM] project : Remove reviewer field --- addons/project/project.py | 7 ------- addons/project/project_view.xml | 4 ---- addons/project/report/project_report.py | 3 --- addons/project/report/project_report_view.xml | 6 ------ addons/project_issue/report/project_issue_report.py | 4 +--- 5 files changed, 1 insertion(+), 23 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index 4310cc4361a..94d0ec92ac8 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -774,7 +774,6 @@ class task(osv.osv): 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10), 'project.task.work': (_get_task, ['hours'], 10), }), - 'reviewer_id': fields.many2one('res.users', 'Reviewer', select=True, track_visibility='onchange'), 'user_id': fields.many2one('res.users', 'Assigned to', select=True, track_visibility='onchange'), 'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'), 'partner_id': fields.many2one('res.partner', 'Customer'), @@ -794,7 +793,6 @@ class task(osv.osv): 'progress': 0, 'sequence': 10, 'active': True, - 'reviewer_id': lambda obj, cr, uid, ctx=None: uid, 'user_id': lambda obj, cr, uid, ctx=None: uid, 'company_id': lambda self, cr, uid, ctx=None: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=ctx), 'partner_id': lambda self, cr, uid, ctx=None: self._get_default_partner(cr, uid, context=ctx), @@ -1084,11 +1082,6 @@ class task(osv.osv): # Mail gateway # --------------------------------------------------- - def _message_get_auto_subscribe_fields(self, cr, uid, updated_fields, auto_follow_fields=None, context=None): - if auto_follow_fields is None: - auto_follow_fields = ['user_id', 'reviewer_id'] - return super(task, self)._message_get_auto_subscribe_fields(cr, uid, updated_fields, auto_follow_fields, context=context) - def message_get_reply_to(self, cr, uid, ids, context=None): """ Override to get the reply_to of the parent project. """ tasks = self.browse(cr, SUPERUSER_ID, ids, context=context) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index c35954d251d..dac7c3026e2 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -28,7 +28,6 @@ - @@ -397,9 +396,6 @@ - diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index e1e68050056..63650f9774b 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -30,7 +30,6 @@ class report_project_task_user(osv.osv): _columns = { 'name': fields.char('Task Summary', readonly=True), 'user_id': fields.many2one('res.users', 'Assigned To', readonly=True), - 'reviewer_id': fields.many2one('res.users', 'Reviewer', readonly=True), 'date_start': fields.datetime('Assignation Date', readonly=True), 'no_of_days': fields.integer('# of Days', size=128, readonly=True), 'date_end': fields.datetime('Ending Date', readonly=True), @@ -71,7 +70,6 @@ class report_project_task_user(osv.osv): t.date_deadline as date_deadline, abs((extract('epoch' from (t.write_date-t.date_start)))/(3600*24)) as no_of_days, t.user_id, - t.reviewer_id, progress as progress, t.project_id, t.effective_hours as hours_effective, @@ -105,7 +103,6 @@ class report_project_task_user(osv.osv): date_deadline, date_last_stage_update, t.user_id, - t.reviewer_id, t.project_id, t.priority, name, diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index b441a592c54..24ac1c466b5 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -36,12 +36,6 @@ {'group_by': ['project_id', 'user_id']} - - By Reviewer - report.project.task.user - - {'group_by': ['project_id', 'reviewer_id']} - report.project.task.user.search diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 77894b0be81..25802a1ad05 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -52,7 +52,6 @@ class project_issue_report(osv.osv): 'channel': fields.char('Channel', readonly=True, help="Communication Channel."), 'task_id': fields.many2one('project.task', 'Task'), 'email': fields.integer('# Emails', size=128, readonly=True), - 'reviewer_id': fields.many2one('res.users', 'Reviewer', readonly=True), } def init(self, cr): @@ -80,8 +79,7 @@ class project_issue_report(osv.osv): 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, - t.reviewer_id + (SELECT count(id) FROM mail_message WHERE model='project.issue' AND res_id=c.id) AS email FROM project_issue c