diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py index ae6a1e2696c..65ca7626468 100644 --- a/addons/crm/crm_mailgate.py +++ b/addons/crm/crm_mailgate.py @@ -32,6 +32,8 @@ import tools from osv import fields,osv,orm from osv.orm import except_orm +from tools import command_re + class crm_cases(osv.osv): """ crm cases """ @@ -39,7 +41,7 @@ class crm_cases(osv.osv): _inherit = "crm.case" def message_new(self, cr, uid, msg, context): - """ + """ Automatically calls when new email message arrives @param self: The object pointer diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index 5fe6b18d06b..be53b457c12 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -132,11 +132,6 @@ class crm_send_new_email(osv.osv_memory): getattr(case_pool, act)(cr, uid, [case.id]) cr.commit() -# Commented because form does not close due to raise -# raise osv.except_osv(_('Email!'), ("Email Successfully Sent")) -# else: -# raise osv.except_osv(_('Warning!'), _("Email not sent !")) - return {} def default_get(self, cr, uid, fields, context=None):