diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2012-08-17 12:26:50 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2012-08-17 12:26:50 +0200 |
| commit | 66ece041f0a423bc2526a894bae686dc1d8b41ce (patch) | |
| tree | 748a901598e4231d8300c518de97fb0d255bc9ed /addons/mail | |
| parent | b62858e83e21bdd80aaf38b6d1149e6c66dc54e1 (diff) | |
[IMP] append note
bzr revid: fp@tinyerp.com-20120817102650-1sglq1y2dbb3xqju
Diffstat (limited to 'addons/mail')
| -rw-r--r-- | addons/mail/data/mail_group_data.xml | 2 | ||||
| -rw-r--r-- | addons/mail/mail_thread.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index 2152706d056..10a94fd42f5 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -16,12 +16,12 @@ <function model="mail.group" name="message_append_note"> <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' --> <value eval="[ref('mail.group_all_employees')]"/> - <value>Welcome to OpenERP!</value> <value>Your homepage is a summary of messages you received and key information about documents you follow. The top menu bar contains all applications you installed. You can use this <i>Settings</i> menu to install more applications, activate others features or give access to new users. To setup your preferences (name, email signature, avatar), click on the top right corner.</value> + <value>Welcome to OpenERP!</value> </function> </data> diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 5f3167cda39..7f88ec2093a 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -751,7 +751,7 @@ class mail_thread(osv.Model): now deprecated res.log.") self.message_post(cr, uid, [id], message, context=context) - def message_post(self, cr, uid, res_id, body, + def message_post(self, cr, uid, res_id, body, subject=False, mtype='notification', attachments=None, context=None, **kwargs): context = context or {} @@ -776,6 +776,7 @@ class mail_thread(osv.Model): 'res_model': self._name, 'res_id': res_id, 'body': body, + 'subject': subject, 'type': mtype, 'attachment_ids': data_attach }) |