diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml
index 43a1fc2fdcf..d9280d18aa9 100644
--- a/bin/addons/base/ir/ir.xml
+++ b/bin/addons/base/ir/ir.xml
@@ -700,9 +700,9 @@
                                     <group colspan="2" col="2">
                                         <separator string="Field Type" colspan="2"/>
                                         <field name="ttype" select="2"/>
-                                        <field name="relation_id" select="2" attrs="{'required': [('ttype','in',['many2one','one2many','many2many'])],
+                                        <field name="relation" attrs="{'required': [('ttype','in',['many2one','one2many','many2many'])],
                                                                                   'readonly': [('ttype','!=','one2many'), ('ttype','!=','many2one'), ('ttype','!=','many2many')]}"/>
-                                        <field name="relation_field_id" domain="[('model_id','=',relation_id)]" attrs="{'required': [('ttype','=','one2many')],
+                                        <field name="relation_field" attrs="{'required': [('ttype','=','one2many')],
                                                                              'readonly': [('ttype','!=','one2many')]}"/>
                                         <field name="selection" attrs="{'required': [('ttype','=','selection')], 'readonly': [('ttype','!=','selection')]}"/>
                                         <field name="size" attrs="{'required': [('ttype','=','char')], 'readonly': [('ttype','!=','char')]}"/>
@@ -779,12 +779,9 @@
                         <page string="Properties">
                             <group colspan="2" col="2">
                                 <field name="ttype" select="2"/>
-                                <field name="relation_id" select="2" on_change="on_relation_change(relation_id)" attrs="{'required': [('ttype','in', ['many2one','one2many','many2many'])],
+                                <field name="relation" select="2" attrs="{'required': [('ttype','in', ['many2one','one2many','many2many'])],
                                                                           'readonly': [('ttype','not in', ['many2one','one2many','many2many'])]}"/>
-<!--                                <field name="relation" select="2" attrs="{'required': [('ttype','in', ['many2one','one2many','many2many'])],-->
-<!--                                                                          'readonly': [('ttype','not in', ['many2one','one2many','many2many'])]}"/>-->
-                                <field name="relation_field_id" domain="[('model_id','=',relation_id)]" attrs="{'required': [('ttype','=','one2many')],
-                                                                     'readonly': [('ttype','!=','one2many')]}"/>
+                                <field name="relation_field" attrs="{'required': [('ttype','=','one2many')], 'readonly': [('ttype','!=','one2many')]}"/>
                                 <field name="selection" attrs="{'required': [('ttype','=','selection')], 'readonly': [('ttype','!=','selection')]}"/>
                                 <field name="size" attrs="{'required': [('ttype','=','char')], 'readonly': [('ttype','!=','char')]}"/>
                                 <field name="state"/>
diff --git a/bin/addons/base/ir/ir_model.py b/bin/addons/base/ir/ir_model.py
index 471d4d2f6d9..8120e4e3bd4 100644
--- a/bin/addons/base/ir/ir_model.py
+++ b/bin/addons/base/ir/ir_model.py
@@ -193,9 +193,7 @@ class ir_model_fields(osv.osv):
     _columns = {
         'name': fields.char('Name', required=True, size=64, select=1),
         'model': fields.char('Object Name', size=64, required=True),
-        'relation_id':fields.many2one('ir.model', 'Object Relation'),
         'relation': fields.char('Object Relation', size=64),
-        'relation_field_id':fields.many2one('ir.model.fields', 'Relation Field'),
         'relation_field': fields.char('Relation Field', size=64),
         'model_id': fields.many2one('ir.model', 'Object id', required=True, select=True, ondelete='cascade'),
         'field_description': fields.char('Field Label', required=True, size=256),
@@ -234,25 +232,7 @@ class ir_model_fields(osv.osv):
         #
         return super(ir_model_fields, self).unlink(cr, user, ids, context)
 
-    def write(self, cr, uid, ids, vals, context=None):
-        res = False
-        if 'relation_id' in vals:
-            model_data = self.pool.get('ir.model').browse(cr, uid, vals['relation_id'])
-            vals['relation'] = model_data.model
-        if 'relation_field_id' in vals:
-            field_data = self.pool.get('ir.model.fields').browse(cr, uid, vals['relation_field_id'])
-            vals['relation'] = field_data.name
-
-        res = super(ir_model_fields, self).write(cr, uid, ids, vals, context)
-        return res
-
     def create(self, cr, user, vals, context=None):
-        if 'relation_id' in vals:
-            model_data = self.pool.get('ir.model').browse(cr, user, vals['relation_id'])
-            vals['relation']=model_data.model
-        if 'relation_field_id' in vals:
-            field_data = self.pool.get('ir.model.fields').browse(cr, user, vals['relation_field_id'])
-            vals['relation_field'] = field_data.name
         if 'model_id' in vals:
             model_data = self.pool.get('ir.model').browse(cr, user, vals['model_id'])
             vals['model'] = model_data.model
diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 6b86eb7bc7a..d528c5ef90a 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -426,6 +426,7 @@ class one2many(_column):
             context = {}
         if not values:
             return
+        print obj, id, field, values
         _table = obj.pool.get(self._obj)._table
         obj = obj.pool.get(self._obj)
         for act in values:
@@ -633,6 +634,7 @@ class function(_column):
         return res
 
     def set(self, cr, obj, id, name, value, user=None, context=None):
+        print obj,name,value
         if not context:
             context = {}
         if self._fnct_inv: