[MOV] base: move res_* models into models/

13 files changed, 15 insertions, 11 deletions

diff --git a/odoo/addons/base/__init__.py b/odoo/addons/base/__init__.py
index 12e2abbe1e7..1ccabd78834 100644
--- a/odoo/addons/base/__init__.py
+++ b/odoo/addons/base/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from . import models
 from . import ir
 from . import module
 from . import res
diff --git a/odoo/addons/base/models/__init__.py b/odoo/addons/base/models/__init__.py
new file mode 100644
index 00000000000..0ecce19cda7
--- /dev/null
+++ b/odoo/addons/base/models/__init__.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import report_paperformat
+from . import res_country
+from . import res_lang
+from . import res_partner
+from . import res_bank
+from . import res_config
+from . import res_currency
+from . import res_company
+from . import res_users
diff --git a/odoo/addons/base/res/report_paperformat.py b/odoo/addons/base/models/report_paperformat.py
index 08235f3060b..08235f3060b 100644
--- a/odoo/addons/base/res/report_paperformat.py
+++ b/odoo/addons/base/models/report_paperformat.py
diff --git a/odoo/addons/base/res/res_bank.py b/odoo/addons/base/models/res_bank.py
index 5a397fcc831..5a397fcc831 100644
--- a/odoo/addons/base/res/res_bank.py
+++ b/odoo/addons/base/models/res_bank.py
diff --git a/odoo/addons/base/res/res_company.py b/odoo/addons/base/models/res_company.py
index b95b502f6a3..b95b502f6a3 100644
--- a/odoo/addons/base/res/res_company.py
+++ b/odoo/addons/base/models/res_company.py
diff --git a/odoo/addons/base/res/res_config.py b/odoo/addons/base/models/res_config.py
index d1efaa5c91a..81e62bdf2d8 100644
--- a/odoo/addons/base/res/res_config.py
+++ b/odoo/addons/base/models/res_config.py
@@ -633,7 +633,7 @@ class ResConfigSettings(models.TransientModel, ResConfigModuleInstallationMixin)
 
         Example of use:
         ---------------
-        from odoo.addons.base.res.res_config import get_warning_config
+        from odoo.addons.base.models.res_config import get_warning_config
         raise get_warning_config(cr, _("Error: this action is prohibited. You should check the field %(field:sale.config.settings.fetchmail_lead)s in %(menu:sales_team.menu_sale_config)s."), context=context)
 
         This will return an exception containing the following message:
diff --git a/odoo/addons/base/res/res_country.py b/odoo/addons/base/models/res_country.py
index a3984155b4e..a3984155b4e 100644
--- a/odoo/addons/base/res/res_country.py
+++ b/odoo/addons/base/models/res_country.py
diff --git a/odoo/addons/base/res/res_currency.py b/odoo/addons/base/models/res_currency.py
index 7a352e62587..7a352e62587 100644
--- a/odoo/addons/base/res/res_currency.py
+++ b/odoo/addons/base/models/res_currency.py
diff --git a/odoo/addons/base/res/res_lang.py b/odoo/addons/base/models/res_lang.py
index 38b4209cc6f..38b4209cc6f 100644
--- a/odoo/addons/base/res/res_lang.py
+++ b/odoo/addons/base/models/res_lang.py
diff --git a/odoo/addons/base/res/res_partner.py b/odoo/addons/base/models/res_partner.py
index 58ab2953e4e..58ab2953e4e 100644
--- a/odoo/addons/base/res/res_partner.py
+++ b/odoo/addons/base/models/res_partner.py
diff --git a/odoo/addons/base/res/res_users.py b/odoo/addons/base/models/res_users.py
index 5f136959014..5f136959014 100644
--- a/odoo/addons/base/res/res_users.py
+++ b/odoo/addons/base/models/res_users.py
diff --git a/odoo/addons/base/res/__init__.py b/odoo/addons/base/res/__init__.py
index a15f72c01f1..b681190c9d9 100644
--- a/odoo/addons/base/res/__init__.py
+++ b/odoo/addons/base/res/__init__.py
@@ -1,13 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import report_paperformat
-from . import res_country
-from . import res_lang
-from . import res_partner
-from . import res_bank
-from . import res_config
-from . import res_currency
-from . import res_company
-from . import res_users
 from . import ir_property
diff --git a/odoo/addons/base/tests/test_res_lang.py b/odoo/addons/base/tests/test_res_lang.py
index c6eab4ded78..3f6cf27b64e 100644
--- a/odoo/addons/base/tests/test_res_lang.py
+++ b/odoo/addons/base/tests/test_res_lang.py
@@ -6,7 +6,7 @@ from odoo.tests.common import TransactionCase
 class test_res_lang(TransactionCase):
 
     def test_00_intersperse(self):
-        from odoo.addons.base.res.res_lang import intersperse
+        from odoo.addons.base.models.res_lang import intersperse
 
         assert intersperse("", []) == ("", 0)
         assert intersperse("0", []) == ("0", 0)