From aa3732272d53ca36d76f8a4f1d4805458f3819d2 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Tue, 25 May 2010 18:33:06 +0530 Subject: [PATCH] [IMP]: mailgate, crm: Added subject of sent mail as mailgate.message name bzr revid: rpa@tinyerp.com-20100525130306-5rcy4n1gw0a0f360 --- addons/crm/crm.py | 9 +++++---- addons/crm/wizard/crm_send_email.py | 4 ++-- addons/mail_gateway/mail_gateway.py | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 968900e07f6..d3c640efca3 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -203,12 +203,13 @@ class crm_case(object): address = self.pool.get('res.partner.address').browse(cr, uid, add) return {'value': {'email_from': address.email}} - def _history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, attach=[], context={}): + def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}): mailgate_pool = self.pool.get('mailgate.thread') return mailgate_pool._history(cr, uid, cases, keyword, history=history,\ - email=email, details=details, \ - email_from=email_from, message_id=message_id,\ - attach=attach, context=context) + subject=subject, email=email, \ + details=details, email_from=email_from,\ + message_id=message_id, attach=attach, \ + context=context) def case_open(self, cr, uid, ids, *args): """Opens Case diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index e302ab27b5a..8bc63f2f1a1 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -110,8 +110,8 @@ class crm_send_new_email(osv.osv_memory): case_pool._history(cr, uid, [case], _('Send'), history=True, \ email=obj.email_to, details=body, \ - email_from=email_from, message_id=message_id, \ - attach=attach) + subject=obj.subject, email_from=email_from, \ + message_id=message_id, attach=attach) x_headers = dict() #x_headers = { diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py index 500c293dd9a..30f22a4bc3f 100644 --- a/addons/mail_gateway/mail_gateway.py +++ b/addons/mail_gateway/mail_gateway.py @@ -55,7 +55,7 @@ class mailgate_thread(osv.osv): 'log_ids': one2many_domain('mailgate.message', 'thread_id', 'Logs', domain=[('history', '=', False)], required=False), } - def __history(self, cr, uid, cases, keyword, history=False, email=False, details=None, email_from=False, message_id=False, attach=[], context={}): + def __history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}): """ @param self: The object pointer @param cr: the current row, from the database cursor, @@ -93,7 +93,7 @@ class mailgate_thread(osv.osv): attachments.append(att_obj.create(cr, uid, {'name': att[0], 'datas': base64.encodestring(att[1])})) data = { - 'name': keyword, + 'name': subject or 'History', 'history': True, 'user_id': uid, 'model_id' : model_ids and model_ids[0] or False,