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

[Pedro Manuel Baeza]

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

More info on the bug report.

[Stefan Rijnhart (Opener) (stefan-opener)]

LGTM, thanks!

review: Approve

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve (code review)

=== modified file 'email_template/email_template.py'
--- email_template/email_template.py	2014-04-15 16:29:11 +0000
+++ email_template/email_template.py	2014-04-29 15:04:40 +0000
@@ -341,7 +341,8 @@
             service = netsvc.LocalService(report_service)
             (result, format) = service.create(cr, uid, [res_id], {'model': template.model}, ctx)
             # TODO in trunk, change return format to binary to match message_post expected format
-            result = base64.b64encode(result)
+            if not ctx['default_composition_mode'] == 'mass_mail':
+                result = base64.b64encode(result)
             if not report_name:
                 report_name = report_service
             ext = "." + format