From 8326813d2bc59b21d74538c1eda44161d5ee01ed Mon Sep 17 00:00:00 2001 From: Rafis Bikbov Date: Thu, 1 Nov 2018 13:14:57 +0500 Subject: [PATCH] :rainbow: file location path changed in the new version of odoo --- ir_attachment_url/models/ir_http.py | 2 +- .../models/ir_config_parameter.py | 2 +- res_users_signature/res_users_signature_models.py | 4 ++-- theme_kit/models/theme.py | 2 +- web_sessions_management/res_users.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ir_attachment_url/models/ir_http.py b/ir_attachment_url/models/ir_http.py index 9ff4c83f46..77f756dcf8 100644 --- a/ir_attachment_url/models/ir_http.py +++ b/ir_attachment_url/models/ir_http.py @@ -88,7 +88,7 @@ def binary_content(cls, xmlid=None, model='ir.attachment', id=None, field='datas status = 301 content = module_resource_path else: - # begin redefined part of original binary_content of odoo/base/addons/ir/ir_http + # begin redefined part of original binary_content of odoo/base/addons/models/ir_http is_attachment = env[model]._fields[field].attachment if is_attachment: domain = [ diff --git a/ir_config_parameter_multi_company/models/ir_config_parameter.py b/ir_config_parameter_multi_company/models/ir_config_parameter.py index 221ab7a3eb..29e65cad7a 100644 --- a/ir_config_parameter_multi_company/models/ir_config_parameter.py +++ b/ir_config_parameter_multi_company/models/ir_config_parameter.py @@ -1,7 +1,7 @@ import logging from odoo import models, fields, api, tools -from odoo.addons.base.ir.ir_config_parameter import IrConfigParameter as IrConfigParameterOriginal +from odoo.addons.base.models.ir_config_parameter import IrConfigParameter as IrConfigParameterOriginal _logger = logging.getLogger(__name__) diff --git a/res_users_signature/res_users_signature_models.py b/res_users_signature/res_users_signature_models.py index 3579eea1d1..71a9af4c6c 100644 --- a/res_users_signature/res_users_signature_models.py +++ b/res_users_signature/res_users_signature_models.py @@ -21,7 +21,7 @@ import re import base64 -from openerp.addons.base.ir.ir_mail_server import encode_rfc2822_address_header, encode_header, encode_header_param +from openerp.addons.base.models.ir_mail_server import encode_rfc2822_address_header, encode_header, encode_header_param class ResUsers(models.Model): @@ -112,7 +112,7 @@ class IrMailServer(models.Model): def build_email(self, email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False, attachments=None, message_id=None, references=None, object_id=False, subtype='plain', headers=None, body_alternative=None, subtype_alternative='plain'): - """ copy-pasted from openerp/addons/base/ir/ir_mail_server.py::build_email """ + """ copy-pasted from openerp/addons/base/models/ir_mail_server.py::build_email """ ftemplate = '__image-%s__' fcounter = 0 diff --git a/theme_kit/models/theme.py b/theme_kit/models/theme.py index e68660c528..40e67ca319 100644 --- a/theme_kit/models/theme.py +++ b/theme_kit/models/theme.py @@ -3,7 +3,7 @@ # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). from odoo import models, fields, api -from odoo.addons.base.ir.ir_qweb.assetsbundle import AssetsBundle, LessStylesheetAsset +from odoo.addons.base.models.assetsbundle import AssetsBundle, LessStylesheetAsset class Theme(models.Model): diff --git a/web_sessions_management/res_users.py b/web_sessions_management/res_users.py index 21daeeb90e..5cd05d5420 100644 --- a/web_sessions_management/res_users.py +++ b/web_sessions_management/res_users.py @@ -27,7 +27,7 @@ from datetime import datetime from openerp import SUPERUSER_ID from openerp.http import request -from openerp.addons.base.ir.ir_cron import _intervalTypes +from openerp.addons.base.models.ir_cron import _intervalTypes from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT