diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2014-02-03 18:30:00 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2014-02-03 18:30:00 +0100 |
| commit | 753f7541db67d03e85bde6eb1c56ef2bb7468c7f (patch) | |
| tree | ef621e6370d1c6b6ce3f60f990c5b03cbe086d60 /addons/mail/wizard/mail_compose_message.py | |
| parent | 3d392cab4ec961b9d5d3e65f79f146d0bc5e1aa6 (diff) | |
| parent | c25827f84544b6ea3004c7a354122284310c528b (diff) | |
[MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
Diffstat (limited to 'addons/mail/wizard/mail_compose_message.py')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 833811c07a1..74aea3dfc01 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -322,9 +322,9 @@ class mail_compose_message(osv.TransientModel): mail_values['email_from'] = email_dict.pop('email_from') # replies redirection: mass mailing only if not wizard.same_thread: - mail_values['reply_to'] = email_dict.pop('reply_to') + mail_values['reply_to'] = email_dict.pop('reply_to', None) else: - email_dict.pop('reply_to') + email_dict.pop('reply_to', None) mail_values.update(email_dict) # mass mailing without post: mail_mail values if mass_mail_mode and not wizard.post: |