From 5d09bce9205785f8eaacef041a76218f3b415b3e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 23 Nov 2010 13:56:38 +0100
Subject: [PATCH] [IMP] orm: proper test for column names in check_recursion()

bzr revid: odo@openerp.com-20101123125638-dhd95d6a6xg912ls
---
 bin/osv/orm.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index e168146b595..55ba80624ea 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -4222,7 +4222,8 @@ class orm(orm_template):
     def check_recursion(self, cr, uid, ids, parent=None):
         warnings.warn("You are using deprecated %s.check_recursion(). Please use the '_check_recursion()' instead!" % \
                         self._name, DeprecationWarning, stacklevel=3)
-        assert ' ' not in (parent or '')
+        assert parent is None or parent in self._columns or parent in self._inherit_fields,\
+                    "The 'parent' parameter passed to check_recursion() must be None or a valid field name"
         return self._check_recursion(cr, uid, ids, parent)
 
     def _check_recursion(self, cr, uid, ids, parent=None):