From c1c8fe64545c9fe903823a1daf2a411bf62ee8f9 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Thu, 22 Feb 2007 08:04:56 +0000
Subject: [PATCH] KERNEL: Fix deleted property and many2one

bzr revid: ced-a251396cdb6b946022863e56889585f6b6c59e66
---
 bin/osv/fields.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 65e42505a68..752b87bff5c 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -277,10 +277,10 @@ class many2one(_column):
 		# build a dictionary of the form {'id_of_distant_resource': name_of_distant_resource}
 		names = dict(obj.name_get(cr, user, filter(None, res.values()), context))
 		for r in res.keys():
-			if res[r]:
-				res[r] = (res[r], names.get(res[r], False))
+			if res[r] and res[r] in names:
+				res[r] = (res[r], names[res[r]])
 			else:
-				res[r] = None
+				res[r] = False
 		return res
 
 	def set(self, cr, obj_src, id, field, values, user=None, context={}):
@@ -526,10 +526,10 @@ class property(function):
 		obj = self.pool.get(self2._obj)
 		names = dict(obj.name_get(cr, uid, filter(None, res.values()), context))
 		for r in res.keys():
-			if res[r]:
-				res[r] = (res[r], names.get(res[r], False))
+			if res[r] and res[r] in names:
+				res[r] = (res[r], names[res[r]])
 			else:
-				res[r] = None
+				res[r] = False
 		return res
 
 	def _field_get(self, self2, cr, uid, prop):