From 49c738a4c40e4fb6a3bd396041f120e5e836225e Mon Sep 17 00:00:00 2001 From: Laurent Mignon Date: Fri, 13 Jan 2017 11:33:49 +0100 Subject: [PATCH] [MIG] Migrate to 10.0 --- help_online/README.rst | 4 ++-- help_online/__manifest__.py | 3 +-- help_online/controllers/help_online_controllers.py | 4 ++-- help_online/data/ir_config_parameter_data.xml | 4 ++-- help_online/models/help_online.py | 4 ++-- help_online/models/ir_model.py | 2 +- help_online/security/help_online_groups.xml | 2 +- help_online/tests/common.py | 2 +- help_online/tests/data/help_test_data.xml | 4 ++-- help_online/tests/test_export_help_wizard.py | 2 +- help_online/tests/test_help_online.py | 7 ++++--- help_online/tests/test_import_help_wizard.py | 2 +- help_online/wizards/export_help_wizard.py | 10 +++++----- help_online/wizards/import_help_wizard.py | 6 +++--- setup/help_online/{odoo_addons => odoo}/__init__.py | 0 setup/help_online/odoo/addons/__init__.py | 1 + setup/help_online/odoo/addons/help_online | 1 + setup/help_online/odoo_addons/help_online | 1 - 18 files changed, 30 insertions(+), 29 deletions(-) rename setup/help_online/{odoo_addons => odoo}/__init__.py (100%) create mode 100644 setup/help_online/odoo/addons/__init__.py create mode 120000 setup/help_online/odoo/addons/help_online delete mode 120000 setup/help_online/odoo_addons/help_online diff --git a/help_online/README.rst b/help_online/README.rst index 375c8514..8e1a0ff7 100644 --- a/help_online/README.rst +++ b/help_online/README.rst @@ -26,7 +26,7 @@ Usage .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/162/9.0 + :target: https://runbot.odoo-community.org/runbot/162/10.0 Known issues / Roadmap @@ -34,7 +34,7 @@ Known issues / Roadmap Even if the generated urls to the documentation contains an anchor (website/hel-xx#view_type), it's no more possible to insert/edit anchors elements into the website since this functionnality is not supported -by the new html editor in Odoo 9.0 (summernote). +by the new html editor in Odoo 10.0 (summernote). Bug Tracker diff --git a/help_online/__manifest__.py b/help_online/__manifest__.py index cf3440fd..aa0db85d 100644 --- a/help_online/__manifest__.py +++ b/help_online/__manifest__.py @@ -4,14 +4,13 @@ { 'name': 'Help Online', - 'version': '9.0.1.0.0', + 'version': '10.0.1.0.0', 'author': "ACSONE SA/NV,Odoo Community Association (OCA)", 'maintainer': 'ACSONE SA/NV', 'website': 'http://www.acsone.eu', 'license': 'AGPL-3', 'category': 'Documentation', 'depends': [ - 'base', 'website', ], 'data': [ diff --git a/help_online/controllers/help_online_controllers.py b/help_online/controllers/help_online_controllers.py index 1dc8522e..e0ed5919 100644 --- a/help_online/controllers/help_online_controllers.py +++ b/help_online/controllers/help_online_controllers.py @@ -2,8 +2,8 @@ # Copyright 2014 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -import openerp.http as http -from openerp.http import request +import odoo.http as http +from odoo.http import request class HelpOnlineController(http.Controller): diff --git a/help_online/data/ir_config_parameter_data.xml b/help_online/data/ir_config_parameter_data.xml index 3f3cf68f..213c3d5e 100644 --- a/help_online/data/ir_config_parameter_data.xml +++ b/help_online/data/ir_config_parameter_data.xml @@ -1,5 +1,5 @@ - + @@ -22,4 +22,4 @@ - + diff --git a/help_online/models/help_online.py b/help_online/models/help_online.py index 975cba70..4eb4fd86 100644 --- a/help_online/models/help_online.py +++ b/help_online/models/help_online.py @@ -2,8 +2,8 @@ # Copyright 2014 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, exceptions -from openerp.tools.translate import _ +from odoo import models, exceptions +from odoo.tools.translate import _ class HelpOnline(models.TransientModel): diff --git a/help_online/models/ir_model.py b/help_online/models/ir_model.py index fd79f099..8a136c12 100644 --- a/help_online/models/ir_model.py +++ b/help_online/models/ir_model.py @@ -2,7 +2,7 @@ # Copyright 2014 ACSONE SA/NV () # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, api +from odoo import models, api from lxml import etree as ET diff --git a/help_online/security/help_online_groups.xml b/help_online/security/help_online_groups.xml index 92c5ff72..971582ce 100644 --- a/help_online/security/help_online_groups.xml +++ b/help_online/security/help_online_groups.xml @@ -9,7 +9,7 @@ diff --git a/help_online/tests/common.py b/help_online/tests/common.py index 51fc02ae..a2d5e842 100644 --- a/help_online/tests/common.py +++ b/help_online/tests/common.py @@ -6,7 +6,7 @@ import os import sys from lxml import etree as ET -from openerp.tools.convert import convert_xml_import +from odoo.tools.convert import convert_xml_import class TestWizardCommon(object): diff --git a/help_online/tests/data/help_test_data.xml b/help_online/tests/data/help_test_data.xml index 55723379..cfc8b038 100644 --- a/help_online/tests/data/help_test_data.xml +++ b/help_online/tests/data/help_test_data.xml @@ -1,5 +1,5 @@ - + iVBORw0KGgoAAAANSUhEUgAAANwAAAAzCAIAAABzKvGBAAAOOUlEQVR42u1beVRU5xWfYcZh3wao @@ -75,4 +75,4 @@ YFBaQ6YYbTbt679Y0nIRIfKXS1d/8J7oqRWRGxO2b92S+NyzK2n3aAwoCf/7jpEfsQAoxU3nESI/ image/png - + diff --git a/help_online/tests/test_export_help_wizard.py b/help_online/tests/test_export_help_wizard.py index b9fcdc2e..fb0ec1f2 100644 --- a/help_online/tests/test_export_help_wizard.py +++ b/help_online/tests/test_export_help_wizard.py @@ -5,7 +5,7 @@ import base64 from lxml import etree as ET -import openerp.tests.common as common +import odoo.tests.common as common from .common import TestWizardCommon diff --git a/help_online/tests/test_help_online.py b/help_online/tests/test_help_online.py index e1f5815c..8c963576 100644 --- a/help_online/tests/test_help_online.py +++ b/help_online/tests/test_help_online.py @@ -4,7 +4,7 @@ import mock -import openerp.tests.common as common +import odoo.tests.common as common from .common import TestWizardCommon @@ -17,8 +17,9 @@ class TestHelpOnline(TestWizardCommon, common.TransactionCase): group_writer = self.env.ref('help_online.help_online_group_writer') group_reader = self.env.ref('help_online.help_online_group_reader') self.assertTrue(user.has_group('help_online.help_online_group_writer')) - with mock.patch('openerp.addons.website.models.website' - '.website.search_pages') as search_pages: + website = self.env['website'] + with mock.patch.object(website.__class__, + 'search_pages') as search_pages: # The expected page dosn't exist search_pages.return_value = [] info = help_online.get_page_url(model, 'form') diff --git a/help_online/tests/test_import_help_wizard.py b/help_online/tests/test_import_help_wizard.py index 818a9284..d9b64e86 100644 --- a/help_online/tests/test_import_help_wizard.py +++ b/help_online/tests/test_import_help_wizard.py @@ -4,7 +4,7 @@ import base64 -import openerp.tests.common as common +import odoo.tests.common as common from .common import TestWizardCommon diff --git a/help_online/wizards/export_help_wizard.py b/help_online/wizards/export_help_wizard.py index 3f62621e..aad0f08d 100644 --- a/help_online/wizards/export_help_wizard.py +++ b/help_online/wizards/export_help_wizard.py @@ -9,10 +9,10 @@ import copy import urlparse from werkzeug.routing import Map, Rule from lxml import etree as ET -from openerp import models, fields, api, exceptions -from openerp.tools.translate import _ -from openerp.addons.web.controllers.main import Binary -from openerp.addons.website.controllers.main import WebsiteBinary +from odoo import models, fields, api, exceptions +from odoo.tools.translate import _ +from odoo.addons.web.controllers.main import Binary +from odoo.addons.website.controllers.main import WebsiteBinary _logger = logging.getLogger(__name__) @@ -224,7 +224,7 @@ class ExportHelpWizard(models.TransientModel): ('name', 'like', '%s%%' % template_prefix)] ir_ui_views = self.env['ir.ui.view'].search(domain, order='name') - xml_to_export = ET.Element('openerp') + xml_to_export = ET.Element('odoo') data_node = ET.SubElement(xml_to_export, 'data') exported_resources = set() for ir_ui_view in ir_ui_views: diff --git a/help_online/wizards/import_help_wizard.py b/help_online/wizards/import_help_wizard.py index 77694d20..07517d50 100644 --- a/help_online/wizards/import_help_wizard.py +++ b/help_online/wizards/import_help_wizard.py @@ -8,9 +8,9 @@ from lxml import etree import logging import os -from openerp import api, fields, models -from openerp.tools import convert, misc -from openerp.tools.config import config +from odoo import api, fields, models +from odoo.tools import convert, misc +from odoo.tools.config import config _logger = logging.getLogger(__name__) diff --git a/setup/help_online/odoo_addons/__init__.py b/setup/help_online/odoo/__init__.py similarity index 100% rename from setup/help_online/odoo_addons/__init__.py rename to setup/help_online/odoo/__init__.py diff --git a/setup/help_online/odoo/addons/__init__.py b/setup/help_online/odoo/addons/__init__.py new file mode 100644 index 00000000..de40ea7c --- /dev/null +++ b/setup/help_online/odoo/addons/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/setup/help_online/odoo/addons/help_online b/setup/help_online/odoo/addons/help_online new file mode 120000 index 00000000..7b389642 --- /dev/null +++ b/setup/help_online/odoo/addons/help_online @@ -0,0 +1 @@ +../../../../help_online \ No newline at end of file diff --git a/setup/help_online/odoo_addons/help_online b/setup/help_online/odoo_addons/help_online deleted file mode 120000 index 1f1bc8e3..00000000 --- a/setup/help_online/odoo_addons/help_online +++ /dev/null @@ -1 +0,0 @@ -../../../help_online \ No newline at end of file