Skip to content

Commit

Permalink
🌈 file location path changed in the new version of odoo
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafis Bikbov committed Nov 8, 2018
1 parent 7c867e7 commit 8326813
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ir_attachment_url/models/ir_http.py
Expand Up @@ -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 = [
Expand Down
@@ -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__)

Expand Down
4 changes: 2 additions & 2 deletions res_users_signature/res_users_signature_models.py
Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion theme_kit/models/theme.py
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion web_sessions_management/res_users.py
Expand Up @@ -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


Expand Down

0 comments on commit 8326813

Please sign in to comment.