diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py index c8595a8f999..d7a1d708c8b 100644 --- a/addons/account/models/partner.py +++ b/addons/account/models/partner.py @@ -7,7 +7,7 @@ import time from odoo import api, fields, models, _ from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT from odoo.exceptions import ValidationError -from odoo.addons.base.res.res_partner import WARNING_MESSAGE, WARNING_HELP +from odoo.addons.base.models.res_partner import WARNING_MESSAGE, WARNING_HELP class AccountFiscalPosition(models.Model): _name = 'account.fiscal.position' diff --git a/addons/account_bank_statement_import/account_bank_statement_import.py b/addons/account_bank_statement_import/account_bank_statement_import.py index afd62cc359b..5fd022681aa 100644 --- a/addons/account_bank_statement_import/account_bank_statement_import.py +++ b/addons/account_bank_statement_import/account_bank_statement_import.py @@ -4,7 +4,7 @@ import base64 from odoo import api, fields, models, _ from odoo.exceptions import UserError -from odoo.addons.base.res.res_bank import sanitize_account_number +from odoo.addons.base.models.res_bank import sanitize_account_number import logging _logger = logging.getLogger(__name__) diff --git a/addons/auth_crypt/models/res_users.py b/addons/auth_crypt/models/res_users.py index 708998acbde..ad66d0c7025 100644 --- a/addons/auth_crypt/models/res_users.py +++ b/addons/auth_crypt/models/res_users.py @@ -6,7 +6,7 @@ from passlib.context import CryptContext import odoo from odoo import api, fields, models -from odoo.addons.base.res import res_users +from odoo.addons.base.models import res_users res_users.USER_PRIVATE_FIELDS.append('password_crypt') _logger = logging.getLogger(__name__) diff --git a/addons/auth_oauth/models/res_users.py b/addons/auth_oauth/models/res_users.py index dd61505b485..fa052e41a1b 100644 --- a/addons/auth_oauth/models/res_users.py +++ b/addons/auth_oauth/models/res_users.py @@ -10,7 +10,7 @@ from odoo.exceptions import AccessDenied, UserError from odoo.addons.auth_signup.models.res_users import SignupError from odoo.addons import base -base.res.res_users.USER_PRIVATE_FIELDS.append('oauth_access_token') +base.models.res_users.USER_PRIVATE_FIELDS.append('oauth_access_token') class ResUsers(models.Model): _inherit = 'res.users' diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py index 8b44843e2c3..253ecf97d76 100644 --- a/addons/purchase/models/purchase.py +++ b/addons/purchase/models/purchase.py @@ -9,7 +9,7 @@ from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT from odoo.tools.float_utils import float_is_zero, float_compare from odoo.exceptions import UserError, AccessError from odoo.tools.misc import formatLang -from odoo.addons.base.res.res_partner import WARNING_MESSAGE, WARNING_HELP +from odoo.addons.base.models.res_partner import WARNING_MESSAGE, WARNING_HELP from odoo.addons import decimal_precision as dp diff --git a/addons/purchase/models/res_partner.py b/addons/purchase/models/res_partner.py index 8983a4b07b3..6ab2e577bd9 100644 --- a/addons/purchase/models/res_partner.py +++ b/addons/purchase/models/res_partner.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo import api, fields, models -from odoo.addons.base.res.res_partner import WARNING_MESSAGE, WARNING_HELP +from odoo.addons.base.models.res_partner import WARNING_MESSAGE, WARNING_HELP class res_partner(models.Model): diff --git a/addons/resource/models/resource.py b/addons/resource/models/resource.py index 6d215d7160a..27be5fa9992 100644 --- a/addons/resource/models/resource.py +++ b/addons/resource/models/resource.py @@ -12,7 +12,7 @@ from dateutil.relativedelta import relativedelta from operator import itemgetter from odoo import api, fields, models, _ -from odoo.addons.base.res.res_partner import _tz_get +from odoo.addons.base.models.res_partner import _tz_get from odoo.exceptions import ValidationError from odoo.tools.float_utils import float_compare diff --git a/addons/sale/models/product_template.py b/addons/sale/models/product_template.py index 7cdfc9817cf..65cbce49ab8 100644 --- a/addons/sale/models/product_template.py +++ b/addons/sale/models/product_template.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo import api, fields, models -from odoo.addons.base.res.res_partner import WARNING_MESSAGE, WARNING_HELP +from odoo.addons.base.models.res_partner import WARNING_MESSAGE, WARNING_HELP class ProductTemplate(models.Model): diff --git a/addons/sale/models/res_partner.py b/addons/sale/models/res_partner.py index cb80ca6cf35..f382de1e18c 100644 --- a/addons/sale/models/res_partner.py +++ b/addons/sale/models/res_partner.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo import fields, models -from odoo.addons.base.res.res_partner import WARNING_MESSAGE, WARNING_HELP +from odoo.addons.base.models.res_partner import WARNING_MESSAGE, WARNING_HELP class ResPartner(models.Model): diff --git a/addons/stock/models/res_partner.py b/addons/stock/models/res_partner.py index 4636338af7f..e585437e56a 100644 --- a/addons/stock/models/res_partner.py +++ b/addons/stock/models/res_partner.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo import fields, models -from odoo.addons.base.res.res_partner import WARNING_MESSAGE, WARNING_HELP +from odoo.addons.base.models.res_partner import WARNING_MESSAGE, WARNING_HELP class Partner(models.Model): 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 similarity index 100% rename from odoo/addons/base/res/report_paperformat.py rename to 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 similarity index 100% rename from odoo/addons/base/res/res_bank.py rename to 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 similarity index 100% rename from odoo/addons/base/res/res_company.py rename to 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 similarity index 99% rename from odoo/addons/base/res/res_config.py rename to 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 similarity index 100% rename from odoo/addons/base/res/res_country.py rename to 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 similarity index 100% rename from odoo/addons/base/res/res_currency.py rename to 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 similarity index 100% rename from odoo/addons/base/res/res_lang.py rename to 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 similarity index 100% rename from odoo/addons/base/res/res_partner.py rename to 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 similarity index 100% rename from odoo/addons/base/res/res_users.py rename to 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)