diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-15 12:43:38 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-15 12:43:38 +0100 |
| commit | 4484a3197ca558341ce595df41ffdc072a8d05d2 (patch) | |
| tree | 160895b3cd052ef5a0661ed2ee02a53494dab207 /addons/mail/wizard/invite.py | |
| parent | 4387187b8bdac6223979e9a652b6ef6a19096804 (diff) | |
| parent | d0f5b28bd0da703e3d5a23cb68db91a6a87482dc (diff) | |
[MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0
bzr revid: tde@openerp.com-20130315114338-54scb00rkp7zwr30
Diffstat (limited to 'addons/mail/wizard/invite.py')
| -rw-r--r-- | addons/mail/wizard/invite.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py index c3953818b4c..d3ec9a1ec14 100644 --- a/addons/mail/wizard/invite.py +++ b/addons/mail/wizard/invite.py @@ -77,6 +77,7 @@ class invite_wizard(osv.osv_memory): # send an email if option checked and if a message exists (do not send void emails) if wizard.send_mail and wizard.message: # 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) wizard.message = tools.append_content_to_html(wizard.message, signature_company, plaintext=False, container_tag='div') |