From 18603858e514c0f2c863c50ffd5bd98076b39dee Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Tue, 9 Feb 2010 19:16:52 +0530
Subject: [PATCH] [IMP] user: context_get

bzr revid: hmo@tinyerp.com-20100209134652-528dzv3j73hu3i0h
---
 bin/addons/base/base_update.xml | 2 +-
 bin/addons/base/res/res_user.py | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 275a7278a0c..a033724b3d3 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -78,7 +78,7 @@
                 <form string="Users">
                 	<notebook colspan="4">
                 		<page string="Current Activity">
-                    		<field name="company_id" widget="selection" readonly="0" context="{'prefence_company':True}"/>
+                    		<field name="company_id" widget="selection" readonly="0" context="{'user_prefence':True}"/>
                     		<newline/>
                     		<separator colspan="4" string="Preferences"/>
                     	</page>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index b8c6ff54251..d3e72831c12 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import fields,osv
-from osv.orm import except_orm
+from osv.orm import except_orm, browse_record
 import tools
 import pytz
 import pooler
@@ -296,7 +296,10 @@ class users(osv.osv):
         result = {}
         for k in self._columns.keys():
             if k.startswith('context_'):
-                result[k[8:]] = getattr(user,k)
+                res = getattr(user,k)
+                if isinstance(res, browse_record):
+                    res = res.id 
+                result[k[8:]] = res        
         return result