projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1fb1a6f
)
[FIX] mail: traceback when mass mailing with several partners and removing default...
author
Denis Ledoux
<dle@openerp.com>
Sat, 25 Jan 2014 10:28:40 +0000
(11:28 +0100)
committer
Denis Ledoux
<dle@openerp.com>
Sat, 25 Jan 2014 10:28:40 +0000
(11:28 +0100)
bzr revid: dle@openerp.com-
20140125102840
-7z2w2na7pmy2kda0
addons/mail/wizard/mail_compose_message.py
patch
|
blob
|
history
diff --git
a/addons/mail/wizard/mail_compose_message.py
b/addons/mail/wizard/mail_compose_message.py
index
833811c
..
74aea3d
100644
(file)
--- 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: