summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2013-06-20 15:57:18 +0200
committerThibault Delavallée <tde@openerp.com>2013-06-20 15:57:18 +0200
commitff00a84d33881ef8ca8965a688a8ce05421528d1 (patch)
treed1485c9c38e392f728c7c7298c6b47dc23e2b6cd
parent4cb11273065b2aff443f3a2dafa706ca2f0e900f (diff)
[FIX] mail: fixed a glitch in message_subscribe sometimes overriding specified subtypes
bzr revid: tde@openerp.com-20130620135718-qi0d8fpqvombq3v1
-rw-r--r--addons/mail/mail_thread.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 349122e5942..a138aa230db 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1186,7 +1186,7 @@ class mail_thread(osv.AbstractModel):
], context=context)
mail_followers_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
# subtype_ids not specified: do not update already subscribed partner, fetch default subtypes for new partners
- else:
+ elif subtype_ids is None:
subtype_ids = subtype_obj.search(cr, uid, [
('default', '=', True),
'|',