From 2ff3c1eb1dfbace5e3c02215cd40c95eca79d5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 2 Apr 2012 18:06:04 +0200 Subject: [PATCH] [IMP] mail.thread: Small improvement in message_append_note, to avoid adding subject everywhere in addons. Backward compatible with old formatting to ease the forthcoming merge process :) bzr revid: tde@openerp.com-20120402160604-i5ac9sxpuijyvc79 --- addons/mail/mail_thread.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 6d91e126400..03045eda15b 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -667,7 +667,14 @@ class mail_thread(osv.osv): subject = _('Reply on %s at %s') % (self._name, fields.datetime.now()) return self.message_append(cr, uid, ids, subject, body_text=body, parent_id=parent_id, type=type, context=context) - def message_append_note(self, cr, uid, ids, subject, body, parent_id=False, type='notification', context=None): + def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False, type='notification', subtype='html', context=None): + if subject is None: + if type == 'notification': + subject = _('System notification') + elif type == 'comment' and not parent_id: + subject = _('Comment') + elif type == 'comment' and parent_id: + subject = _('Reply') return self.message_append(cr, uid, ids, subject, body_text=body, parent_id=parent_id, type=type, context=context) #------------------------------------------------------