From 3fd8dfcd79d0926580599ed15035a1754c521446 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Wed, 25 Nov 2009 15:05:04 +0530
Subject: [PATCH] [FIX] Custom Object xml arch needed encoding.

lp bug: https://launchpad.net/bugs/487836 fixed

bzr revid: jvo@tinyerp.com-20091125093504-2tdb5sx3hltpxnjq
---
 bin/addons/base/ir/ir_translation.py | 4 ++--
 bin/osv/orm.py                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/ir/ir_translation.py b/bin/addons/base/ir/ir_translation.py
index b90fe79ef4e..8d4959f72b7 100644
--- a/bin/addons/base/ir/ir_translation.py
+++ b/bin/addons/base/ir/ir_translation.py
@@ -133,14 +133,14 @@ class ir_translation(osv.osv):
                         'and type=%s ' \
                         'and name=%s ' \
                         'and src=%s',
-                    (lang, tt, str(name), source))
+                    (lang, tt, tools.ustr(name), source))
         else:
             cr.execute('select value ' \
                     'from ir_translation ' \
                     'where lang=%s ' \
                         'and type=%s ' \
                         'and name=%s',
-                    (lang, tt, str(name)))
+                    (lang, tt, tools.ustr(name)))
         res = cr.fetchone()
         trad = res and res[0] or ''
         return trad
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 32006111fc6..c8469c1ccc5 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1326,7 +1326,7 @@ class orm_template(object):
                 xml = self.__get_default_calendar_view()
             else:
                 xml = ''
-            result['arch'] = etree.fromstring(xml)
+            result['arch'] = etree.fromstring(encode(xml))
             result['name'] = 'default'
             result['field_parent'] = False
             result['view_id'] = 0