summaryrefslogtreecommitdiff
path: root/addons/mail/wizard/mail_compose_message.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-05-21 14:50:39 +0200
committerChristophe Simonis <chs@odoo.com>2015-05-21 14:50:39 +0200
commit14a7d52307fe30443e8f08a262d46f6d2f804bc1 (patch)
treeb8183ae7549206f27bac51d9f2eaaa5ce3e4a818 /addons/mail/wizard/mail_compose_message.py
parent5cff8fbb7c70a372cb5116c2fb98fd622c4d4358 (diff)
parent327e471c9b5d30317b69396b0f0932ff445e3694 (diff)
[MERGE] forward port of branch 8.0 up to 327e471
Diffstat (limited to 'addons/mail/wizard/mail_compose_message.py')
-rw-r--r--addons/mail/wizard/mail_compose_message.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 2e0823add68..ac4154e80d0 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -319,7 +319,7 @@ class mail_compose_message(osv.TransientModel):
# static wizard (mail.message) values
mail_values = {
'subject': wizard.subject,
- 'body': wizard.body,
+ 'body': wizard.body or '',
'parent_id': wizard.parent_id and wizard.parent_id.id,
'partner_ids': [partner.id for partner in wizard.partner_ids],
'attachment_ids': [attach.id for attach in wizard.attachment_ids],