From 86599bcc5a69788ffd5d97577611b717c882b785 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 25 Aug 2016 16:42:26 +0200
Subject: [PATCH] [REM] models: remove `_inherit_fields`

---
 openerp/models.py            | 22 ----------------------
 openerp/tools/yaml_import.py |  3 ++-
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/openerp/models.py b/openerp/models.py
index 582f4e66a65..8e127280e5b 100644
--- a/openerp/models.py
+++ b/openerp/models.py
@@ -340,13 +340,6 @@ class BaseModel(object):
     _group_by_full = {}         # {field: method}, where method returns (records
                                 # name_get, {id: fold}) used by read_group()
 
-    # Implementation-generated mapping for inherited fields (with _inherits)
-    # {fname: (mname, rname, column, oname)} where 'mname' is the model from
-    # which 'fname' is inherited, 'rname' is the many2one field towards 'mname',
-    # 'column' is the original _column object itself, and 'oname' is the
-    # original (i.e. top-most) parent model.
-    _inherit_fields = None
-
     CONCURRENCY_CHECK_FIELD = '__last_update'
 
     @api.model
@@ -2975,18 +2968,6 @@ class BaseModel(object):
             if name not in self._fields:
                 self._add_field(name, field)
 
-    @classmethod
-    def _inherits_reload(cls):
-        """ Recompute the _inherit_fields mapping. """
-        cls._inherit_fields = struct = {}
-        for parent_model, parent_field in cls._inherits.iteritems():
-            parent = cls.pool[parent_model]
-            parent._inherits_reload()
-            for name, column in parent._columns.iteritems():
-                struct[name] = (parent_model, parent_field, column, parent_model)
-            for name, source in parent._inherit_fields.iteritems():
-                struct[name] = (parent_model, parent_field, source[2], source[3])
-
     @api.model
     def _inherits_check(self):
         for table, field_name in self._inherits.items():
@@ -3135,9 +3116,6 @@ class BaseModel(object):
                 with tools.ignore(*exceptions):
                     field.setup_triggers(self)
 
-        # determine old-api structures about inherited fields
-        cls._inherits_reload()
-
         # register stuff about low-level function fields
         cls._init_function_fields(cls.pool, self._cr)
 
diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 5cc08bce5c3..8f96c881934 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -500,7 +500,8 @@ class YamlInterpreter(object):
         return {
             key: val
             for key, val in record_dict.iteritems()
-            if (key in model._columns or key in model._inherit_fields or model._fields[key].inverse)
+            for field in [model._fields[key].base_field]
+            if field.store or field.inverse
         }
 
     def process_ref(self, node, field=None):