diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 61694b0d632..d7edfaa7fa9 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -273,9 +273,6 @@ class crm_base(object): def _case_reset_notification(self, cr, uid, ids, context=None): return True - def _case_escalate_notification(self, cr, uid, ids, context=None): - return True - def _case_phonecall_notification(self, case, action, context=None): return True @@ -415,6 +412,9 @@ class crm_case(crm_base): default.update({ 'date_open': False }) return super(crm_case, self).copy(cr, uid, id, default, context=context) + def _case_escalate_notification(self, cr, uid, ids, context=None): + return True + def case_open(self, cr, uid, ids, context=None): """Opens Case""" cases = self.browse(cr, uid, ids) diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index 9bc5f44d1ce..033eb0da699 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -82,7 +82,7 @@ class crm_meeting(crm_base, osv.osv): def create(self, cr, uid, vals, context=None): obj_id = super(crm_meeting, self).create(cr, uid, vals, context=context) - self._case_opportunity_meeting_notification(cr, uid, [obj_id], context=context) + self._case_create_notification(cr, uid, [obj_id], context=context) return obj_id def get_needaction_user_id(self, cr, uid, ids, name, arg, context=None): @@ -93,11 +93,11 @@ class crm_meeting(crm_base, osv.osv): result[obj.id] = obj.user_id.id return result - def _case_opportunity_meeting_notification(self, cr, uid, ids, context=None): + def _case_create_notification(self, cr, uid, ids, context=None): lead_obj = self.pool.get('crm.lead') phonecall_obj = self.pool.get('crm.phonecall') for obj in self.browse(cr, uid, ids, context=context): - if(obj.opportunity_id.id): + if(obj.opportunity_id.id): # meeting can be create from phonecalls or opportunities, therefore checking for the parent newid = obj.opportunity_id.id message = _("Meeting has been scheduled on %s for opportunity.") % (obj.date) for lead in lead_obj.browse(cr, uid, [newid], context=context):