[MIG] Migrate to 10.0

OCA · Jan 13, 2017 · 49c738a · 49c738a
1 parent 80cd9e9
commit 49c738a
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 29 deletions.
diff --git a/help_online/README.rst b/help_online/README.rst
@@ -26,15 +26,15 @@ 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
 ======================
 
 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
@@ -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
@@ -2,8 +2,8 @@
 # Copyright 2014 ACSONE SA/NV (<http://acsone.eu>)
 # 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
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<openerp>
+<odoo>
 
     <data noupdate="1">
         <record id="help_online_autobackup_path" model="ir.config_parameter">
@@ -22,4 +22,4 @@
         </record>
     </data>
 
-</openerp>
+</odoo>
diff --git a/help_online/models/help_online.py b/help_online/models/help_online.py
@@ -2,8 +2,8 @@
 # Copyright 2014 ACSONE SA/NV (<http://acsone.eu>)
 # 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
@@ -2,7 +2,7 @@
 # Copyright 2014 ACSONE SA/NV (<http://acsone.eu>)
 # 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
@@ -9,7 +9,7 @@
         <field name="category_id" ref="base.module_category_documentation"/>
         <field name="implied_ids" eval="[
                                          (4, ref('help_online_group_reader')),
-                                         (4, ref('base.group_website_publisher')),
+                                         (4, ref('website.group_website_publisher')),
                                         ]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>

diff --git a/help_online/tests/common.py b/help_online/tests/common.py
@@ -6,7 +6,7 @@
 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
   <data>
     <record id="test_img_1" model="ir.attachment">
       <field name="datas">iVBORw0KGgoAAAANSUhEUgAAANwAAAAzCAIAAABzKvGBAAAOOUlEQVR42u1beVRU5xWfYcZh3wao
@@ -75,4 +75,4 @@ YFBaQ6YYbTbt679Y0nIRIfKXS1d/8J7oqRWRGxO2b92S+NyzK2n3aAwoCf/7jpEfsQAoxU3nESI/
       <field name="mimetype">image/png</field>
     </record>
   </data>
-</openerp>
+</odoo>
diff --git 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
@@ -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 @@ def test_get_page_url(self):
         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
@@ -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
@@ -9,10 +9,10 @@
 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 @@ def _get_qweb_views_data(self):
                   ('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
@@ -8,9 +8,9 @@
 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 → setup/help_online/odoo/__init__.py b/setup/help_online/odoo_addons/__init__.py → setup/help_online/odoo/__init__.py
diff --git a/setup/help_online/odoo/addons/__init__.py 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
@@ -0,0 +1 @@
+../../../../help_online
diff --git a/setup/help_online/odoo_addons/help_online b/setup/help_online/odoo_addons/help_online
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		__import__('pkg_resources').declare_namespace(__name__)