Jalpesh Patel(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-po_email_template-pja into
lp:openobject-addons.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-po_email_template-pja/+merge/128249
Hello,
i have improve code email_template.py file in email_template module and fix
problem of send RFQ after optional report to attach and improve code
mail_compose_message.py wizard file in mail module and fix problem of send mail
(automated purchase order notification mail).
Thanks!
pja
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-po_email_template-pja/+merge/128249
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-po_email_template-pja.
=== modified file 'email_template/email_template.py'
--- email_template/email_template.py 2012-09-24 17:17:36 +0000
+++ email_template/email_template.py 2012-10-05 13:38:26 +0000
@@ -319,7 +319,7 @@
ext = "." + format
if not report_name.endswith(ext):
report_name += ext
- attachments.append(report_name, result)
+ attachments.append((report_name, result))
# Add template attachments
for attach in template.attachment_ids:
=== modified file 'mail/wizard/mail_compose_message.py'
--- mail/wizard/mail_compose_message.py 2012-10-03 15:33:06 +0000
+++ mail/wizard/mail_compose_message.py 2012-10-05 13:38:26 +0000
@@ -81,7 +81,8 @@
elif composition_mode == 'comment' and model and res_id:
vals = self.get_record_data(cr, uid, model, res_id, context=context)
elif composition_mode == 'mass_mail' and model and active_ids:
- vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
+ vals = self.pool.get('email.template').generate_email(cr, uid, context.get('default_template_id'), res_id, context=context)
+ vals.update({'content_subtype': 'html'})
else:
vals = {'model': model, 'res_id': res_id}
if composition_mode:
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
