[MERGE] forward port branch saas-13 up to de77992

addons/product/models/__init__.py

@@ -1,12 +1,18 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+# flake8: noqa: F401
+
 import base_config_settings
 import decimal_precision
+
+# don't try to be a good boy and sort imports alphabetically.
+# `product.template` should be initialised before `product.product`
+import product_template
 import product
+
 import product_attribute
 import product_pricelist
-import product_template
 import product_uom
 import res_currency
 import res_company

odoo/modules/registry.py

@@ -234,7 +234,7 @@ class Registry(Mapping):
         queue = deque(model_names)
         while queue:
             model = self[queue.popleft()]
-            models.add(model)
+            models.add(model._name)
             for func in funcs:
                 queue.extend(func(model))
         return models