diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-02-08 15:24:41 +0100 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-02-08 15:24:41 +0100 |
| commit | 0fd2e8ea33af1bccf6dfa0351efccaa5696bd01d (patch) | |
| tree | 0a88a3b07e3148c71bb08e51d69793f4b7cafb97 /addons/mail/wizard/mail_compose_message.py | |
| parent | 75e1bf1787385187b66a3a0b34d223b8685fd511 (diff) | |
| parent | a5819a49d297bf5f6c4bab83485f9bc7600c7e75 (diff) | |
[MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120208142441-r51m3wxvpp6673dk
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 de4bcee4f76..27ec13b2147 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -228,7 +228,7 @@ class mail_compose_message(osv.osv_memory): # processed as soon as the mail scheduler runs. mail_message.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body, model=mail.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to, - attachments=attachment, references=references, res_id=int(mail.res_id), + attachments=attachment, references=references, res_id=active_id, subtype=mail.subtype, headers=headers, context=context) else: # normal mode - no mass-mailing |