diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-05-15 15:33:32 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-05-15 15:33:32 +0200 |
| commit | 8a0adc0f33a273a2e4cae600c25bbdcf9cbeffb5 (patch) | |
| tree | daf85d0f4dbc7347f9f4fa38f442e2d8b2c14b4d /addons | |
| parent | 19c7bfa1798462eb9f783410ab5ea03fc17fbb4c (diff) | |
[FIX] mail: notification email: notification sent for private discussions now have a correct subject, aka the subject of the original email.
bzr revid: tde@openerp.com-20130515133332-g3wtttsnasfz0y8b
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mail/mail_mail.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index 351ff0130e5..2cbfec2f72a 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -157,8 +157,10 @@ class mail_mail(osv.Model): :param browse_record mail: mail.mail browse_record :param browse_record partner: specific recipient partner """ - if force or (not mail.subject and mail.model and mail.res_id): + if (force or not mail.subject) and mail.record_name: return 'Re: %s' % (mail.record_name) + elif (force or not mail.subject) and mail.parent_id and mail.parent_id.subject: + return 'Re: %s' % (mail.parent_id.subject) return mail.subject def send_get_mail_body(self, cr, uid, mail, partner=None, context=None): |