[MERGE] forward port branch 12.0 up to 82a8cdd6f2f

1 files changed, 6 insertions, 6 deletions

diff --git a/odoo/fields.py b/odoo/fields.py
index 5529288d177..1ba30e17f3f 100644
--- a/odoo/fields.py
+++ b/odoo/fields.py
@@ -490,6 +490,10 @@ class Field(MetaField('DummyField', (object,), {})):
 
     def _setup_regular_base(self, model):
         """ Setup the attributes of a non-related field. """
+        pass
+
+    def _setup_regular_full(self, model):
+        """ Determine the dependencies and inverse field(s) of ``self``. """
         if self.depends is not None:
             return
 
@@ -507,10 +511,6 @@ class Field(MetaField('DummyField', (object,), {})):
         else:
             self.depends = tuple(get_depends(self.compute))
 
-    def _setup_regular_full(self, model):
-        """ Setup the inverse field(s) of ``self``. """
-        pass
-
     #
     # Setup of related fields
     #
@@ -2364,8 +2364,8 @@ class _RelationalMulti(_Relational):
             for record in records:
                 record[self.name] = record[self.name].filtered(accessible)
 
-    def _setup_regular_base(self, model):
-        super(_RelationalMulti, self)._setup_regular_base(model)
+    def _setup_regular_full(self, model):
+        super(_RelationalMulti, self)._setup_regular_full(model)
         if isinstance(self.domain, list):
             self.depends += tuple(
                 self.name + '.' + arg[0]