Merge lp:~openerp-dev/openobject-addons/trunk-bug-1227608-avo into lp:openobject-addons

[Amit Vora(OpenERP)]

Hello,
      I have add condition in loop to stop traceback when click on save as new template.
Thanks.
Amit.

Unmerged revisions

8913. By Amit Vora(OpenERP) on 2013-09-20

[FIX] add condition in loop

=== modified file 'email_template/email_template.py'
--- email_template/email_template.py	2013-09-12 07:40:55 +0000
+++ email_template/email_template.py	2013-09-25 12:34:10 +0000
@@ -102,24 +102,24 @@
 
         # prepare template variables
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        records = self.pool[model].browse(cr, uid, res_ids, context=context) or [None]
         variables = {
             'user': user,
             'ctx': context,  # context kw would clash with mako internals
         }
-        for record in records:
-            res_id = record.id if record else None
-            variables['object'] = record
-            try:
-                render_result = template.render(variables)
-            except Exception:
-                _logger.exception("Failed to render template %r using values %r" % (template, variables))
-                render_result = u""
-            if render_result == u"False":
-                render_result = u""
-            results[res_id] = render_result
-        return results
-
+        for res_id in res_ids:
+            if res_id:
+                record = self.pool[model].browse(cr, uid, res_id, context=context)      
+                res_id = record.id if record else None
+                variables['object'] = record
+                try:
+                    render_result = template.render(variables)
+                except Exception:
+                    _logger.exception("Failed to render template %r using values %r" % (template, variables))
+                    render_result = u""
+                if render_result == u"False":
+                    render_result = u""
+                results[res_id] = render_result   
+        return results 
     def get_email_template_batch(self, cr, uid, template_id=False, res_ids=None, context=None):
         if context is None:
             context = {}