diff --git a/account_payment_partner/README.rst b/account_payment_partner/README.rst
index 704ca358a..4e9e8e684 100644
--- a/account_payment_partner/README.rst
+++ b/account_payment_partner/README.rst
@@ -38,7 +38,7 @@ Invoices without any payment mode are displayed to.
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/173/9.0
+   :target: https://runbot.odoo-community.org/runbot/173/10.0
 
 Known issues / Roadmap
 ======================
diff --git a/account_payment_partner/__openerp__.py b/account_payment_partner/__manifest__.py
similarity index 90%
rename from account_payment_partner/__openerp__.py
rename to account_payment_partner/__manifest__.py
index 8c1068021..59484804b 100644
--- a/account_payment_partner/__openerp__.py
+++ b/account_payment_partner/__manifest__.py
@@ -5,12 +5,12 @@
 
 {
     'name': 'Account Payment Partner',
-    'version': '9.0.1.0.0',
+    'version': '10.0.1.0.0',
     'category': 'Banking addons',
     'license': 'AGPL-3',
     'summary': 'Adds payment mode on partners and invoices',
     'author': "Akretion, "
-              "Serv. Tecnol. Avanzados - Pedro M. Baeza, "
+              "Tecnativa, "
               "Odoo Community Association (OCA)",
     'website': 'https://github.com/OCA/bank-payment',
     'depends': ['account_payment_mode'],
diff --git a/account_payment_partner/demo/partner_demo.xml b/account_payment_partner/demo/partner_demo.xml
index 20545d978..bf5b8b751 100644
--- a/account_payment_partner/demo/partner_demo.xml
+++ b/account_payment_partner/demo/partner_demo.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
 
-<openerp>
-<data noupdate="1">
 
 <record id="default_supplier_payment_mode_id" model="ir.property" forcecreate="True">
     <field name="name">Default Supplier Payment Mode</field>
@@ -21,5 +20,5 @@
     <field name="company_id" ref="base.main_company"/>
 </record>
 
-</data>
-</openerp>
+
+</odoo>
diff --git a/account_payment_partner/models/account_invoice.py b/account_payment_partner/models/account_invoice.py
index 14ac17a77..6f33546e3 100644
--- a/account_payment_partner/models/account_invoice.py
+++ b/account_payment_partner/models/account_invoice.py
@@ -3,7 +3,7 @@
 # © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api
+from odoo import models, fields, api
 
 
 class AccountInvoice(models.Model):
diff --git a/account_payment_partner/models/account_move_line.py b/account_payment_partner/models/account_move_line.py
index 080e73369..e5fa4d492 100644
--- a/account_payment_partner/models/account_move_line.py
+++ b/account_payment_partner/models/account_move_line.py
@@ -2,7 +2,7 @@
 # © 2016 Akretion (http://www.akretion.com/)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields
+from odoo import models, fields
 
 
 class AccountMoveLine(models.Model):
diff --git a/account_payment_partner/models/res_partner.py b/account_payment_partner/models/res_partner.py
index b7a35e93c..9b8357141 100644
--- a/account_payment_partner/models/res_partner.py
+++ b/account_payment_partner/models/res_partner.py
@@ -3,7 +3,7 @@
 # © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api
+from odoo import models, fields, api
 
 
 class ResPartner(models.Model):
diff --git a/account_payment_partner/views/account_invoice_view.xml b/account_payment_partner/views/account_invoice_view.xml
index 0e59c514d..b2553be57 100644
--- a/account_payment_partner/views/account_invoice_view.xml
+++ b/account_payment_partner/views/account_invoice_view.xml
@@ -5,7 +5,6 @@
 -->
 
 <odoo>
-<data>
 
     <record id="view_account_invoice_filter" model="ir.ui.view">
         <field name="name">account_payment_partner.account_invoice_search</field>
@@ -25,7 +24,7 @@
         <field name="model">account.invoice</field>
         <field name="inherit_id" ref="account.invoice_form" />
         <field name="arch" type="xml">
-            <field name="partner_bank_id" position="after">
+            <field name="payment_term_id" position="after">
                 <field name="payment_mode_id"
                        domain="[('payment_type', '=', 'inbound')]"
                        widget="selection"/>
@@ -43,7 +42,7 @@
         <field name="model">account.invoice</field>
         <field name="inherit_id" ref="account.invoice_supplier_form" />
         <field name="arch" type="xml">
-            <field name="partner_bank_id" position="before">
+            <field name="payment_term_id" position="after">
                 <field name="payment_mode_id"
                        domain="[('payment_type', '=', 'outbound')]"
                        widget="selection"/>
@@ -81,5 +80,4 @@
     </record>
 
 
-</data>
 </odoo>
diff --git a/account_payment_partner/views/account_move_line.xml b/account_payment_partner/views/account_move_line.xml
index b0d0ca102..51cba50df 100644
--- a/account_payment_partner/views/account_move_line.xml
+++ b/account_payment_partner/views/account_move_line.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-    Copyright (C) 2016 Akretion (http://www.akretion.com/)
-    @author Alexis de Lattre <alexis.delattre@akretion.com>
-    The licence is in the file __openerp__.py
+  © 2016 Akretion (http://www.akretion.com/)
+  @author Alexis de Lattre <alexis.delattre@akretion.com>
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
 
-<openerp>
-<data>
+<odoo>
 
 
 <record id="view_move_line_form" model="ir.ui.view">
@@ -24,5 +23,4 @@
 </record>
 
 
-</data>
-</openerp>
+</odoo>
diff --git a/account_payment_partner/views/report_invoice.xml b/account_payment_partner/views/report_invoice.xml
index 9368238f1..068dbf672 100644
--- a/account_payment_partner/views/report_invoice.xml
+++ b/account_payment_partner/views/report_invoice.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <template id="report_invoice_payment_mode" inherit_id="account.report_invoice_document">
-            <xpath expr="//p[@t-if='o.payment_term_id']" position="after">
-                <p t-if="o.payment_mode_id.note">
-                    <strong>Payment Mode:</strong>
-                    <span t-field="o.payment_mode_id.note" />
-                </p>
-                <p t-if="o.partner_bank_id">
-                    <strong>Bank Account:</strong>
-                    <span t-field="o.partner_bank_id.acc_number" />
-                </p>
-            </xpath>
-        </template>
-    </data>
-</openerp>
+<odoo>
+
+    <template id="report_invoice_payment_mode" inherit_id="account.report_invoice_document">
+        <xpath expr="//p[@t-if='o.payment_term_id']" position="after">
+            <p t-if="o.payment_mode_id.note">
+                <strong>Payment Mode:</strong>
+                <span t-field="o.payment_mode_id.note" />
+            </p>
+            <p t-if="o.partner_bank_id">
+                <strong>Bank Account:</strong>
+                <span t-field="o.partner_bank_id.acc_number" />
+            </p>
+        </xpath>
+    </template>
+
+</odoo>
diff --git a/account_payment_partner/views/res_partner_view.xml b/account_payment_partner/views/res_partner_view.xml
index 3d06ee856..bf545cb1d 100644
--- a/account_payment_partner/views/res_partner_view.xml
+++ b/account_payment_partner/views/res_partner_view.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2014-2016 Akretion (http://www.akretion.com/)
-    @author Alexis de Lattre <alexis.delattre@akretion.com>
-    The licence is in the file __openerp__.py
+  © 2014-2016 Akretion (http://www.akretion.com/)
+  @author Alexis de Lattre <alexis.delattre@akretion.com>
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
 
-<openerp>
-<data>
+<odoo>
 
 
 <record id="view_partner_property_form" model="ir.ui.view">
@@ -24,5 +23,4 @@
 </record>
 
 
-</data>
-</openerp>
+</odoo>