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

[IMP] mail.thread: res.users model: removed comments only preference for emails when receiving notifications. 

bzr revid: tde@openerp.com-20120503134916-y031ko6ne94le6n0
This commit is contained in:
Thibault Delavallée 2012-05-03 15:49:16 +02:00
parent eb1a665715
commit ec432cea40
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/mail/mail_thread.py
View File

@ -149,7 +149,6 @@ class mail_thread(osv.osv):
email_to = ''
for user in res_users_obj.browse(cr, uid, user_to_push_ids, context=context):
if not user.notification_email_pref == 'all' and \
not (user.notification_email_pref == 'comments' and vals['type'] == 'comment') and \
not (user.notification_email_pref == 'to_me' and user.id in user_to_push_from_parse_ids):
continue
if not user.user_email:

8
addons/mail/res_users.py
View File

@ -33,15 +33,15 @@ class res_users(osv.osv):
_columns = {
'notification_email_pref': fields.selection([
('all', 'All feeds'),
('comments', 'Only comments'),
('to_me', 'Only when sent directly to me'),
('to_me', 'Only sent directly to me'),
('none', 'Never')
], 'Receive feeds by email', required=True,
help="Choose in which case you want to receive an email when you receive new feeds."),
help="Choose in which case you want to receive \
an email when you receive new feeds."),
}
_defaults = {
'notification_email_pref': 'none',
'notification_email_pref': 'to_me',
}
def __init__(self, pool, cr):