From ab90a5e0b596aabb5f53d53ad1da6809cd998217 Mon Sep 17 00:00:00 2001
From: Niki Waibel <niki.waibel@gmx.net>
Date: Sat, 5 Nov 2016 18:46:53 +0100
Subject: [PATCH] [MIG] web_favicon: Migrated to 10.0 (#459)

---
 web_favicon/README.rst                        |  4 ++--
 .../{__openerp__.py => __manifest__.py}       |  2 +-
 web_favicon/controllers/web_favicon.py        |  4 ++--
 web_favicon/models/res_company.py             |  2 +-
 web_favicon/tests/test_web_favicon.py         |  8 +++----
 web_favicon/views/res_company.xml             | 22 +++++++++----------
 web_favicon/views/templates.xml               | 16 ++++++--------
 7 files changed, 28 insertions(+), 30 deletions(-)
 rename web_favicon/{__openerp__.py => __manifest__.py} (95%)

diff --git a/web_favicon/README.rst b/web_favicon/README.rst
index ff1ffa99..a95c5d43 100644
--- a/web_favicon/README.rst
+++ b/web_favicon/README.rst
@@ -35,7 +35,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
 ======================
@@ -55,7 +55,7 @@ In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed feedback
 `here <https://github.com/OCA/web/issues/new?body=module:%20
 web_favicon%0Aversion:%20
-9.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+10.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Credits
 =======
diff --git a/web_favicon/__openerp__.py b/web_favicon/__manifest__.py
similarity index 95%
rename from web_favicon/__openerp__.py
rename to web_favicon/__manifest__.py
index e18e739f..ab515f38 100644
--- a/web_favicon/__openerp__.py
+++ b/web_favicon/__manifest__.py
@@ -5,7 +5,7 @@
 
 {
     "name": "Custom shortcut icon",
-    "version": "9.0.1.0.0",
+    "version": "10.0.1.0.0",
     "author": "Therp BV, "
               "Tecnativa, "
               "Odoo Community Association (OCA)",
diff --git a/web_favicon/controllers/web_favicon.py b/web_favicon/controllers/web_favicon.py
index f0b92aa0..7585ce15 100644
--- a/web_favicon/controllers/web_favicon.py
+++ b/web_favicon/controllers/web_favicon.py
@@ -4,8 +4,8 @@
 
 import StringIO
 import base64
-from openerp import http
-from openerp.tools.misc import file_open
+from odoo import http
+from odoo.tools.misc import file_open
 
 
 class WebFavicon(http.Controller):
diff --git a/web_favicon/models/res_company.py b/web_favicon/models/res_company.py
index e30c1b2a..9fdd8ace 100644
--- a/web_favicon/models/res_company.py
+++ b/web_favicon/models/res_company.py
@@ -3,7 +3,7 @@
 # © 2016 Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from openerp import models, fields
+from odoo import models, fields
 
 
 class ResCompany(models.Model):
diff --git a/web_favicon/tests/test_web_favicon.py b/web_favicon/tests/test_web_favicon.py
index 2af4f83c..90414956 100644
--- a/web_favicon/tests/test_web_favicon.py
+++ b/web_favicon/tests/test_web_favicon.py
@@ -3,9 +3,9 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import base64
-from openerp.tests.common import TransactionCase
-from openerp.tools.misc import file_open
-from openerp import http
+from odoo.tests.common import TransactionCase
+from odoo.tools.misc import file_open
+from odoo import http
 
 
 class FakeRequest(object):
@@ -26,7 +26,7 @@ class TestWebFavicon(TransactionCase):
     def test_web_favicon(self):
         original_request = http.request
         http.request = FakeRequest(self.env)
-        from openerp.addons.web_favicon.controllers.web_favicon import\
+        from odoo.addons.web_favicon.controllers.web_favicon import\
             WebFavicon
         company = self.env['res.company'].search([], limit=1)
         # default icon
diff --git a/web_favicon/views/res_company.xml b/web_favicon/views/res_company.xml
index fa270399..b8d138d3 100644
--- a/web_favicon/views/res_company.xml
+++ b/web_favicon/views/res_company.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="view_company_form" model="ir.ui.view">
-            <field name="model">res.company</field>
-            <field name="inherit_id" ref="base.view_company_form" />
-            <field name="arch" type="xml">
-                <page name="configuration" position="inside">
+<odoo>
+    <record id="view_company_form" model="ir.ui.view">
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="base.view_company_form" />
+        <field name="arch" type="xml">
+            <notebook position="inside">
+                <page string="Web Favicon" name="favicon">
                     <group string="Favicon" name="favicon">
                         <field name="favicon_backend" widget="image" />
                         <field name="favicon_backend_mimetype" attrs="{'required': [('favicon_backend', '!=', False)]}" />
                     </group>
                 </page>
-            </field>
-        </record>
-    </data>
-</openerp>
+            </notebook>
+        </field>
+    </record>
+</odoo>
diff --git a/web_favicon/views/templates.xml b/web_favicon/views/templates.xml
index ed80510a..32385c84 100644
--- a/web_favicon/views/templates.xml
+++ b/web_favicon/views/templates.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <template id="layout" inherit_id="web.layout">
-            <xpath expr="//link[@rel='shortcut icon']" position="replace">
-                <link rel="icon" href="/web_favicon/favicon" />
-            </xpath>
-        </template>
-    </data>
-</openerp>
+<odoo>
+    <template id="layout" inherit_id="web.layout">
+        <xpath expr="//link[@rel='shortcut icon']" position="replace">
+            <link rel="icon" href="/web_favicon/favicon" />
+        </xpath>
+    </template>
+</odoo>