From 910e8a2adcd3121045d6d389608ad51a9e8f974d Mon Sep 17 00:00:00 2001
From: "Amit (OpenERP)" <amp@tinyerp.com>
Date: Sat, 31 Mar 2012 14:08:35 +0530
Subject: [PATCH 1/2] [FIX] project_gtd : Fixes the unicode problem on my tasks
 fields_view_get

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

bzr revid: amp@tinyerp.com-20120331083835-ad1l6e4stzy2ia77
---
 addons/project_gtd/project_gtd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index bec70779551..fb8bb459c55 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -115,7 +115,7 @@ class project_task(osv.osv):
                 search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''" context="{'user_invisible': True}"/>\n'''
             search_extended +='''<separator orientation="vertical"/>'''
 
-            res['arch'] = res['arch'].replace('<separator name="gtdsep"/>', search_extended)
+            res['arch'] = unicode(res['arch'], 'utf-8').replace('<separator name="gtdsep"/>', search_extended)
 
         return res
 

From 2157901b067831ec5cfd078f28570f7c06f7ffcd Mon Sep 17 00:00:00 2001
From: "Amit (OpenERP)" <amp@tinyerp.com>
Date: Wed, 2 May 2012 19:05:21 +0530
Subject: [PATCH 2/2] [IMP] project_gtd : Used the tools.ustr() instead of
 unicode utf-8

bzr revid: amp@tinyerp.com-20120502133521-ohn7xh1vl7xlbewm
---
 addons/project_gtd/project_gtd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index fb8bb459c55..5eb19ca1831 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -115,7 +115,7 @@ class project_task(osv.osv):
                 search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''" context="{'user_invisible': True}"/>\n'''
             search_extended +='''<separator orientation="vertical"/>'''
 
-            res['arch'] = unicode(res['arch'], 'utf-8').replace('<separator name="gtdsep"/>', search_extended)
+            res['arch'] = tools.ustr(res['arch']).replace('<separator name="gtdsep"/>', search_extended)
 
         return res