Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-bug-1122155-chandni into lp:openobject-addons

  1. trunk-bug-1122155-chandni
  2. Merge into trunk
Proposed by Chandni Machchhar(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1122155-chandni
Merge into: lp:openobject-addons
Diff against target: 13 lines (+2/-1)
1 file modified
email_template/email_template.py (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1122155-chandni
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza (community) code review and test Approve
OpenERP Core Team Pending
Review via email: mp+157839@code.launchpad.net

Description of the change

Hello,

 I have solved the problem of corrupted pdf when sending mail from the email template.

Thanks,
Chandni

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

I confirm that it works.

Regards.

review: Approve (code review and test)
Reply

Unmerged revisions

8665. By Chandni Machchhar(OpenERP)

[FIX] problem of corrupted pdf when sending email from email-template.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'email_template/email_template.py'
2--- email_template/email_template.py 2013-03-22 13:49:58 +0000
3+++ email_template/email_template.py 2013-04-09 10:23:28 +0000
4@@ -342,7 +342,8 @@
5 if template.lang:
6 ctx['lang'] = self.render_template(cr, uid, template.lang, template.model, res_id, context)
7 result, format = openerp.report.render_report(cr, uid, [res_id], report_service, {'model': template.model}, ctx)
8- result = base64.b64encode(result)
9+ if not ctx['default_composition_mode'] == 'mass_mail':
10+ result = base64.b64encode(result)
11 if not report_name:
12 report_name = 'report.' + report_service
13 ext = "." + format

Subscribers

People subscribed via source and target branches

to all changes: