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

[REVIEW] res_users in mail_thread: no Chatter-compatible anymore ! Some cleaning will follow. Also reidented some code. 

bzr revid: tde@openerp.com-20120814152053-edu3i87uzd8ev0u0
This commit is contained in:
Thibault Delavallée 2012-08-14 17:20:53 +02:00
parent 15d997d37b
commit a381c0adce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/mail/res_users.py
View File

@ -35,7 +35,7 @@ class res_users(osv.osv):
- add a welcome message
"""
_name = 'res.users'
_inherit = ['res.users', 'mail.thread']
_inherit = ['res.users']
_inherits = {'mail.alias': 'alias_id'}
_columns = {
@ -45,10 +45,10 @@ class res_users(osv.osv):
('none', 'Never')
], 'Receive Feeds by Email', required=True,
help="Choose in which case you want to receive an email when you "\
"receive new feeds."),
"receive new feeds."),
'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
help="Email address internally associated with this user. Incoming emails will appear "
"in the user's notifications."),
help="Email address internally associated with this user. Incoming "\
"emails will appear in the user's notifications."),
}
_defaults = {