odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] mail_message: do not overwrite 'False' message_id when creating a new mail message 

bzr revid: tde@openerp.com-20131128133132-8oevlk1wyoqytebo
This commit is contained in:
Thibault Delavallée 2013-11-28 14:31:32 +01:00
parent 4f2e951cde
commit c553167ff8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/mail/mail_message.py
View File

@ -821,12 +821,11 @@ class mail_message(osv.Model):
# message-id with db
def _get_message_id(self, cr, uid, values, context=None):
message_id = None
if not values.get('message_id') and values.get('reply_to'):
if values.get('reply_to'):
message_id = tools.generate_tracking_message_id('reply_to')
elif not values.get('message_id') and values.get('res_id') and values.get('model'):
elif values.get('res_id') and values.get('model'):
message_id = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values)
elif not values.get('message_id'):
else:
message_id = tools.generate_tracking_message_id('private')
return message_id
@ -837,7 +836,7 @@ class mail_message(osv.Model):
if 'email_from' not in values: # needed to compute reply_to
values['email_from'] = self._get_default_from(cr, uid, context=context)
if not values.get('message_id'):
if 'message_id' not in values:
values['message_id'] = self._get_message_id(cr, uid, values, context=context)
if 'reply_to' not in values:
values['reply_to'] = self._get_reply_to(cr, uid, values, context=context)