pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] plugin: Email pushed from Outlook plugin does not have body content. (Maintenance Case: 593592)

Browse Source 
bzr revid: rgo@tinyerp.com-20130708062121-4vcev1jjcz9tbvi0
This commit is contained in:
Ravi Gohil (OpenERP)
2013-07-08 11:51:21 +05:30
parent c0119a87c1 62035e967e
commit d170edee37
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/mail_thread.py
+3 -3
View File
@@ -810,11 +810,11 @@ class mail_thread(osv.AbstractModel):
message = message.encode('utf-8')
message = email.message_from_string(message)
message_id = message['message-id']
message_id = message['Message-Id']
if not message_id:
# Very unusual situation, be we should be fault-tolerant here
message_id = "<%s@localhost>" % time.time()
_logger.debug('Parsing Message without message-id, generating a random one: %s', message_id)
_logger.debug('Parsing Message without Message-Id, generating a random one: %s', message_id)
msg_dict['message_id'] = message_id
if message.get('Subject'):
@@ -846,7 +846,7 @@ class mail_thread(osv.AbstractModel):
stored_date = parsed_date.astimezone(tz=pytz.utc)
except Exception:
_logger.warning('Failed to parse Date header %r in incoming mail '
'with message-id %r, assuming current date/time.',
'with Message-Id %r, assuming current date/time.',
message.get('Date'), message_id)
stored_date = datetime.datetime.now()
msg_dict['date'] = stored_date.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
addons/plugin/plugin_handler.py
+6 -4
View File
@@ -4,6 +4,7 @@ Created on 18 oct. 2011
@author: openerp
'''
from openerp import tools
from openerp.osv import osv
from openerp.tools.translate import _
@@ -94,7 +95,7 @@ class plugin_handler(osv.osv_memory):
mail_message = self.pool.get('mail.message')
model_obj = self.pool.get(model)
msg = self.pool.get('mail.thread').message_parse(cr, uid, email)
message_id = msg.get('message-id')
message_id = msg.get('message_id')
mail_ids = mail_message.search(cr, uid, [('message_id', '=', message_id), ('res_id', '=', res_id), ('model', '=', model)])
if message_id and mail_ids:
mail_record = mail_message.browse(cr, uid, mail_ids)[0]
@@ -112,7 +113,8 @@ class plugin_handler(osv.osv_memory):
subject=msg.get('subject'),
type='comment' if model == 'res.partner' else 'email',
parent_id=msg.get('parent_id'),
attachments=msg.get('attachments'))
attachments=msg.get('attachments'),
message_id=message_id)
notify = _("Mail successfully pushed")
url = self._make_url(cr, uid, res_id, model)
return (model, res_id, url, notify)
@@ -151,7 +153,7 @@ class plugin_handler(osv.osv_memory):
ir_attachment_obj = self.pool.get('ir.attachment')
attach_ids = []
msg = self.pool.get('mail.thread').message_parse(cr, uid, headers)
message_id = msg.get('message-id')
message_id = msg.get('message_id')
push_mail = self.push_message(cr, uid, model, headers, res_id)
res_id = push_mail[1]
model = push_mail[0]
@@ -165,6 +167,6 @@ class plugin_handler(osv.osv_memory):
attach_ids.append(ir_attachment_obj.create(cr, uid, vals))
mail_ids = mail_message.search(cr, uid, [('message_id', '=', message_id), ('res_id', '=', res_id), ('model', '=', model)])
if mail_ids:
mail_message.write(cr, uid, mail_ids[0], {'attachment_ids': [(6, 0, attach_ids)], 'body': body, 'body_html': body_html})
mail_message.write(cr, uid, mail_ids[0], {'attachment_ids': [(6, 0, attach_ids)], 'body': tools.plaintext2html(body), 'body_html': body_html})
url = self._make_url(cr, uid, res_id, model)
return (model, res_id, url, notify)