diff options
| author | Thibault Delavallée <tde@openerp.com> | 2016-08-09 16:17:17 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2016-08-10 15:48:07 +0200 |
| commit | c8a313d51e57e9db52758a2c92c13044efef5a6a (patch) | |
| tree | 5d213f21f33e815804206e36bf4f6c807a6a122c /addons/web | |
| parent | 5ce159924c235c06e4b1f6f653fe305932b83b5a (diff) | |
[IMP] various: use odoo for imports instead of openerp and update class names
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/models/ir_http.py | 5 | ||||
| -rw-r--r-- | addons/web/tests/test_js.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/addons/web/models/ir_http.py b/addons/web/models/ir_http.py index 6af9431bada..aea99b06111 100644 --- a/addons/web/models/ir_http.py +++ b/addons/web/models/ir_http.py @@ -3,10 +3,11 @@ import json -import openerp from odoo import models from odoo.http import request +import odoo + class Http(models.AbstractModel): _inherit = 'ir.http' @@ -20,7 +21,7 @@ class Http(models.AbstractModel): def session_info(self): user = request.env.user display_switch_company_menu = user.has_group('base.group_multi_company') and len(user.company_ids) > 1 - version_info = openerp.service.common.exp_version() + version_info = odoo.service.common.exp_version() return { "session_id": request.session_id, "uid": request.session.uid, diff --git a/addons/web/tests/test_js.py b/addons/web/tests/test_js.py index 1dab0f8436b..c134074e789 100644 --- a/addons/web/tests/test_js.py +++ b/addons/web/tests/test_js.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import openerp.tests +import odoo.tests -class WebSuite(openerp.tests.HttpCase): +class WebSuite(odoo.tests.HttpCase): def test_01_js(self): self.phantom_js('/web/tests?mod=web',"","", login='admin') |