diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-22 17:22:57 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-22 17:22:57 +0200 |
| commit | b2804b1d2ae5fd7ec5c0eca79a8db77476badc84 (patch) | |
| tree | adc76c775e4c2a390fe1bf06e6036107463ffe8f | |
| parent | f308b09a9ab3f3bf452fdd1ac6c2c86812732110 (diff) | |
| parent | de77992320c450a6b4a494db70d49af2386a0142 (diff) | |
[MERGE] forward port branch saas-13 up to de77992
| -rw-r--r-- | addons/product/models/__init__.py | 8 | ||||
| -rw-r--r-- | odoo/modules/registry.py | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/product/models/__init__.py b/addons/product/models/__init__.py index 418438395a9..6c62fd17331 100644 --- a/addons/product/models/__init__.py +++ b/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 diff --git a/odoo/modules/registry.py b/odoo/modules/registry.py index 8de7172ae89..9be7fa15ae9 100644 --- a/odoo/modules/registry.py +++ b/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 |