Merge PR #609 into 12.0

Signed-off-by simahawk

mail_inline_css/models/mail_template.py

@@ -3,7 +3,7 @@
 
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import api, models
+from odoo import models
 
 try:
     from premailer import Premailer
@@ -16,22 +16,15 @@ except (ImportError, IOError) as err:  # pragma: no cover
 class MailTemplate(models.Model):
     _inherit = 'mail.template'
 
-    @api.multi
-    def generate_email(self, res_ids, fields=None):
-        """Use `premailer` to convert styles to inline styles."""
-        result = super().generate_email(res_ids, fields=fields)
-        if isinstance(res_ids, int):
-            result['body_html'] = \
-                self._premailer_apply_transform(result["body_html"])
-        else:
-            for __, data in result.items():
-                data['body_html'] = \
-                    self._premailer_apply_transform(data["body_html"])
-        return result
+    def render_post_process(self, html):
+        html = super().render_post_process(html)
+        return self._premailer_apply_transform(html)
 
-    def _premailer_apply_transform(self, data_html):
+    def _premailer_apply_transform(self, html):
+        if not html.strip():
+            return html
         premailer = Premailer(
-            html=data_html,
+            html=html,
             **self._get_premailer_options(),
         )
         return premailer.transform()