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

[IMP] res.users: modified added field name in mail.thread 

bzr revid: tde@openerp.com-20120404074652-ocywrzyb45pfeygr
This commit is contained in:
Thibault Delavallée 2012-04-04 09:46:52 +02:00
parent 931edc0075
commit ff65bcbb0a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/mail/res_users.py
View File

@ -31,17 +31,17 @@ class res_users(osv.osv):
_inherit = ['res.users', 'mail.thread']
_columns = {
'message_email_pref': fields.selection([
'notification_email_pref': fields.selection([
('all', 'All feeds'),
('comments', 'Only comments'),
('to_me', 'Only when sent directly to me'),
('none', 'Never'),
], string='Receive feeds by email', required=True,
('none', 'Never')
], 'Receive feeds by email', required=True,
help="Choose whether you want to receive an email when you receive new feeds."),
}
_default = {
'message_email_pref': 'all',
'notification_email_pref': 'all',
}
def create(self, cr, uid, data, context=None):

4
addons/mail/res_users_view.xml
View File

@ -10,7 +10,7 @@
<field name="arch" type="xml">
<data>
<xpath expr="/form/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
<field name="message_email_pref"/>
<field name="notification_email_pref"/>
</xpath>
</data>
</field>
@ -24,7 +24,7 @@
<field name="arch" type="xml">
<data>
<xpath expr="/form/notebook/page[@string='User']/group/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
<field name="message_email_pref"/>
<field name="notification_email_pref"/>
</xpath>
<xpath expr="/form/notebook" position="after">
<field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>