Rucha (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-email_template-fixes-rpa into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-email_template-fixes-rpa/+merge/94951
* Fixed problem of sending email.
* Fixed wrong attachment content.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-email_template-fixes-rpa/+merge/94951
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-email_template-fixes-rpa.
=== modified file 'email_template/email_template.py'
--- email_template/email_template.py 2012-02-13 14:35:31 +0000
+++ email_template/email_template.py 2012-02-28 12:28:45 +0000
@@ -57,6 +57,8 @@
:param int res_id: id of the document record this mail is related to.
"""
if not template: return u""
+ if context is None:
+ context = {}
try:
template = tools.ustr(template)
record = None
=== modified file 'email_template/wizard/mail_compose_message.py'
--- email_template/wizard/mail_compose_message.py 2012-01-31 13:36:57 +0000
+++ email_template/wizard/mail_compose_message.py 2012-02-28 12:28:45 +0000
@@ -95,7 +95,7 @@
for fname, fcontent in attachment.iteritems():
data_attach = {
'name': fname,
- 'datas': base64.b64encode(fcontent),
+ 'datas': fcontent,
'datas_fname': fname,
'description': fname,
'res_model' : self._name,
_______________________________________________
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
