Merge lp:~pedro.baeza/ocb-addons/7.0-lp1122155 into lp:ocb-addons

Proposed by Pedro Manuel Baeza
Status: Merged
Merged at revision: 10214
Proposed branch: lp:~pedro.baeza/ocb-addons/7.0-lp1122155
Merge into: lp:ocb-addons
Diff against target: 13 lines (+2/-1)
1 file modified
email_template/ (+2/-1)
To merge this branch: bzr merge lp:~pedro.baeza/ocb-addons/7.0-lp1122155
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review Approve
Holger Brunn (Therp) code review Approve
Stefan Rijnhart (Opener) Approve
Review via email:

Description of the change

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

More info on the bug report.

To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

LGTM, thanks!

review: Approve
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) :
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'email_template/'
2--- email_template/ 2014-04-15 16:29:11 +0000
3+++ email_template/ 2014-04-29 15:04:40 +0000
4@@ -341,7 +341,8 @@
5 service = netsvc.LocalService(report_service)
6 (result, format) = service.create(cr, uid, [res_id], {'model': template.model}, ctx)
7 # TODO in trunk, change return format to binary to match message_post expected format
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_service
13 ext = "." + format