diff options
| author | Raphael Collet <rco@openerp.com> | 2012-06-28 15:12:10 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-06-28 15:12:10 +0200 |
| commit | 1debe0efcd00a294fa436a8a13416ccb1de0e919 (patch) | |
| tree | a9a7209823affdaedb129f6f1cd1c0173fa11a6e /addons/mail/mail_message.py | |
| parent | 083deae5a4845cb9578b318ec08bd2d62b79a755 (diff) | |
| parent | a6e3d4bf0029d879e008414090d54499ffe358f4 (diff) | |
[MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
Diffstat (limited to 'addons/mail/mail_message.py')
| -rw-r--r-- | addons/mail/mail_message.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index e45d4f07807..1c1e980e3ed 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -202,10 +202,10 @@ class mail_message(osv.osv): _columns = { 'type': fields.selection([ - ('email', 'e-mail'), + ('email', 'email'), ('comment', 'Comment'), ('notification', 'System notification'), - ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"), + ], 'Type', help="Message type: email for email message, notification for system message, comment for other messages such as user replies"), 'partner_id': fields.many2one('res.partner', 'Related partner'), 'user_id': fields.many2one('res.users', 'Related User', readonly=1), 'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'), @@ -228,7 +228,7 @@ class mail_message(osv.osv): } #------------------------------------------------------ - # E-Mail api + # Email api #------------------------------------------------------ def init(self, cr): |