[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:
parent
15d997d37b
commit
a381c0adce
|
@ -35,7 +35,7 @@ class res_users(osv.osv):
|
||||||
- add a welcome message
|
- add a welcome message
|
||||||
"""
|
"""
|
||||||
_name = 'res.users'
|
_name = 'res.users'
|
||||||
_inherit = ['res.users', 'mail.thread']
|
_inherit = ['res.users']
|
||||||
_inherits = {'mail.alias': 'alias_id'}
|
_inherits = {'mail.alias': 'alias_id'}
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
|
@ -47,8 +47,8 @@ class res_users(osv.osv):
|
||||||
help="Choose in which case you want to receive an email when you "\
|
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,
|
'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
|
||||||
help="Email address internally associated with this user. Incoming emails will appear "
|
help="Email address internally associated with this user. Incoming "\
|
||||||
"in the user's notifications."),
|
"emails will appear in the user's notifications."),
|
||||||
}
|
}
|
||||||
|
|
||||||
_defaults = {
|
_defaults = {
|
||||||
|
|
Loading…
Reference in New Issue