From 07eb329acb4f5c5877c34b6d14f22d8a5c911efe Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Wed, 13 May 2015 09:59:02 +0200 Subject: [PATCH] [IMP] crm_helpdesk : remove escalation feature --- addons/crm/__openerp__.py | 2 +- addons/crm_helpdesk/crm_helpdesk.py | 19 ------------------- addons/crm_helpdesk/crm_helpdesk_view.xml | 2 -- .../data/product_demo.xml | 5 ++--- addons/sales_team/sales_team.py | 4 ---- addons/sales_team/sales_team.xml | 7 ------- 6 files changed, 3 insertions(+), 36 deletions(-) diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 4fa7d2612b2..15763b33171 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -16,7 +16,7 @@ This application enables a group of people to intelligently and efficiently mana It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification. -OpenERP ensures that all cases are successfully tracked by users, customers and suppliers. It can automatically send reminders, escalate the request, trigger specific methods and many other actions based on your own enterprise rules. +OpenERP ensures that all cases are successfully tracked by users, customers and suppliers. It can automatically send reminders, trigger specific methods and many other actions based on your own enterprise rules. The greatest thing about this system is that users don't need to do anything special. The CRM module has an email gateway for the synchronization interface between mails and OpenERP. That way, users can just send emails to the request tracker. diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index 044ad113142..43190deac63 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -86,20 +86,6 @@ class crm_helpdesk(osv.osv): values['date_closed'] = fields.datetime.now() return super(crm_helpdesk, self).write(cr, uid, ids, values, context=context) - def case_escalate(self, cr, uid, ids, context=None): - """ Escalates case to parent level """ - data = {'active': True} - for case in self.browse(cr, uid, ids, context=context): - if case.team_id and case.team_id.parent_id: - parent_id = case.team_id.parent_id - data['team_id'] = parent_id.id - if parent_id.change_responsible and parent_id.user_id: - data['user_id'] = parent_id.user_id.id - else: - raise UserError(_('You can not escalate, you are already at the top level regarding your sales-team category.')) - self.write(cr, uid, [case.id], data, context=context) - return True - # ------------------------------------------------------- # Mail gateway # ------------------------------------------------------- @@ -131,8 +117,3 @@ class crm_helpdesk_category(osv.Model): 'team_id': fields.many2one('crm.team', 'Sales Team'), } -class sales_team(osv.Model): - _inherit = "crm.team" - _columns = { - 'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the salesman with the team leader."), - } diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index 35fa9366abb..fb11d7faf97 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -51,8 +51,6 @@
-
diff --git a/addons/product_email_template/data/product_demo.xml b/addons/product_email_template/data/product_demo.xml index 093ca8e3527..dd2bbce81bf 100644 --- a/addons/product_email_template/data/product_demo.xml +++ b/addons/product_email_template/data/product_demo.xml @@ -324,8 +324,8 @@
  • Projects
    • -
  • Tasks and tasks delegation
    • -
  • Issues and issues escalation
    • +
  • Tasks
    • +
  • Issues
@@ -334,7 +334,6 @@
  • Discover the Kanban view to quickly operate some actions and to quickly detect any bottlenecks in your projects flows
  • Discover the Gantt view to see how your project has been planned and adapt it according to new elements or to the people agenda
  • Define project members & delegate tasks
    • -
  • Register issues and escalate them
  • Create automatically timesheet lines in the Human Resources menu from recorded work activities
  • Track and invoice (to customers) the costs associated to a project
  • Manage a support ticket system
    • diff --git a/addons/sales_team/sales_team.py b/addons/sales_team/sales_team.py index aca9573c773..1d8b48c1b55 100644 --- a/addons/sales_team/sales_team.py +++ b/addons/sales_team/sales_team.py @@ -44,11 +44,7 @@ class crm_team(osv.Model): 'code': fields.char('Code', size=8), 'active': fields.boolean('Active', help="If the active field is set to "\ "true, it will allow you to hide the sales team without removing it."), -<<<<<<< HEAD 'company_id': fields.many2one('res.company', 'Company'), - 'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the salesman with the team leader."), -======= ->>>>>>> 7857b36... [IMP] sales_team : Remove the lead escalation feature 'user_id': fields.many2one('res.users', 'Team Leader'), 'member_ids': fields.many2many('res.users', 'sale_member_rel', 'team_id', 'member_id', 'Team Members'), 'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Odoo about cases in this sales team"), diff --git a/addons/sales_team/sales_team.xml b/addons/sales_team/sales_team.xml index 09afb49664f..c05e37caa40 100644 --- a/addons/sales_team/sales_team.xml +++ b/addons/sales_team/sales_team.xml @@ -92,13 +92,6 @@ -<<<<<<< HEAD - - - - -======= ->>>>>>> 7857b36... [IMP] sales_team : Remove the lead escalation feature