[MERGE] MErged from main server of trunk

bzr revid: jvo@tinyerp.com-20100520061516-32etumcd9b9az0su
This commit is contained in:
Jay (Open ERP) 2010-05-20 11:45:16 +05:30
commit fe7673b7ba
1 changed files with 1 additions and 2 deletions

View File

@ -40,8 +40,7 @@ class ir_property(osv.osv):
return res
def _models_get(self, cr, uid, context=None):
return self._models_field_get(cr, uid, 'model_id.model', 'model_id.name',
context)
return self._models_field_get(cr, uid, 'model', 'name', context)
def _models_get2(self, cr, uid, context=None):
return self._models_field_get(cr, uid, 'relation', 'relation', context)