diff options
| author | Olivier Dony <odo@openerp.com> | 2013-04-29 17:14:10 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2013-04-29 17:14:10 +0200 |
| commit | 9c08e129625b0ccd3c795b95735dcdd9f15db2ac (patch) | |
| tree | cb1bec2bddf41d56d4d33a563e05ae3100ffca90 /addons/mail/wizard/invite.py | |
| parent | 609636d857960cca39a41a6fb0faf8cbc498fb0a (diff) | |
| parent | 56dbd6078e24aafce61153f144934b40bcd930a3 (diff) | |
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld
bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
Diffstat (limited to 'addons/mail/wizard/invite.py')
| -rw-r--r-- | addons/mail/wizard/invite.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py index 4ff6584d789..a6bfc34c213 100644 --- a/addons/mail/wizard/invite.py +++ b/addons/mail/wizard/invite.py @@ -75,7 +75,7 @@ class invite_wizard(osv.osv_memory): model_name = ir_model.name_get(cr, uid, model_ids, context=context)[0][1] # send an email if option checked and if a message exists (do not send void emails) - if wizard.send_mail and wizard.message: + if wizard.send_mail and wizard.message and not wizard.message == '<br>': # when deleting the message, cleditor keeps a <br> # add signature # FIXME 8.0: use notification_email_send, send a wall message and let mail handle email notification + message box signature_company = self.pool.get('mail.notification').get_signature_footer(cr, uid, user_id=uid, res_model=wizard.res_model, res_id=wizard.res_id, context=context) |