diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-05-21 14:11:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-05-21 14:11:39 +0200 |
| commit | b62ee0734cf291271ef7e79325db5e631edd0616 (patch) | |
| tree | 44484cfb3c8557bdea7276415ba40b50550f2ac9 /addons/mail/wizard/mail_compose_message.py | |
| parent | 2c0529858fb2119252a4c04a0018ee6adaa2d520 (diff) | |
| parent | eaaca6559429a8d36c7f6dc1f8232cf222ad2a32 (diff) | |
[MERGE] forward port of branch 7.0 up to eaaca65
Diffstat (limited to 'addons/mail/wizard/mail_compose_message.py')
| -rw-r--r-- | addons/mail/wizard/mail_compose_message.py | 2 |
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 e5ff2b51fcd..acde22399b2 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -299,7 +299,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], |