From 47c6314c4488a42541155105dbc34b50d8da891e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 27 Sep 2013 14:10:12 +0200
Subject: [PATCH] [FIX] force-encode unicode stuff

bzr revid: xmo@openerp.com-20130927121012-28qllo0i3g62c7jw
---
 openerp/tools/qweb.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py
index 9868cb7babe..1f2a6ab63f6 100644
--- a/openerp/tools/qweb.py
+++ b/openerp/tools/qweb.py
@@ -223,7 +223,9 @@ class QWebXml(object):
         if name == "t":
             return inner
         elif len(inner) or name not in self._void_elements:
-            return "<%s%s>%s</%s>" % (name, g_att, inner, name)
+            return "<%s%s>%s</%s>" % tuple(
+                v if isinstance(v, str) else v.encode('utf-8')
+                for v in (name, g_att, inner, name))
         else:
             return "<%s%s/>" % (name, g_att)