diff options
| author | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2013-09-16 12:36:18 +0530 |
|---|---|---|
| committer | Turkesh Patel (Open ERP) <tpa@tinyerp.com> | 2013-09-16 12:36:18 +0530 |
| commit | a2b6b5df02b63f1e6537dd4c2fdafbd5b6970eec (patch) | |
| tree | 1a3a605895bf7e0b1c3e2f510987993411e81ee5 /addons/mail/wizard/mail_compose_message.py | |
| parent | 3413d5364fe1eddafd467b69782e96877d8d3a49 (diff) | |
| parent | bc0d066505a054389525cdf7601b35751ea3efbb (diff) | |
[MRG] merge with lp:openobejct-addons contains changes on justguage and sparklinebar library.
bzr revid: tpa@tinyerp.com-20130916070618-l59jaz9tbrmv5y6r
Diffstat (limited to 'addons/mail/wizard/mail_compose_message.py')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 6ab1f0e81ff..88c8abe74c0 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -66,7 +66,6 @@ class mail_compose_message(osv.TransientModel): if context is None: context = {} result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context) - # get some important values from context composition_mode = context.get('default_composition_mode', context.get('mail.compose.message.mode')) model = context.get('default_model', context.get('active_model')) @@ -78,7 +77,6 @@ class mail_compose_message(osv.TransientModel): result['active_domain'] = '%s' % context.get('active_domain') else: result['active_domain'] = '' - # get default values according to the composition mode if composition_mode == 'reply': vals = self.get_message_data(cr, uid, message_id, context=context) @@ -212,7 +210,8 @@ class mail_compose_message(osv.TransientModel): # get partner_ids from original message partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else [] partner_ids += context.get('default_partner_ids', []) - + if context.get('is_private',False) and message_data.author_id : #check message is private then add author also in partner list. + partner_ids += [message_data.author_id.id] # update the result result = { 'record_name': message_data.record_name, |