diff --git a/account_payment_order/README.rst b/account_payment_order/README.rst
index b752fee40..44afd8afe 100644
--- a/account_payment_order/README.rst
+++ b/account_payment_order/README.rst
@@ -34,7 +34,7 @@ This module also adds a button *Add to Payment Order* on supplier invoices and a
 
 .. 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_order/__openerp__.py b/account_payment_order/__manifest__.py
similarity index 90%
rename from account_payment_order/__openerp__.py
rename to account_payment_order/__manifest__.py
index 391c1afbb..8104cb9c2 100644
--- a/account_payment_order/__openerp__.py
+++ b/account_payment_order/__manifest__.py
@@ -2,17 +2,17 @@
 # © 2009 EduSense BV (<http://www.edusense.nl>)
 # © 2011-2013 Therp BV (<http://therp.nl>)
 # © 2013-2014 ACSONE SA (<http://acsone.eu>).
-# © 2014-2016 Serv. Tecnol. Avanzados - Pedro M. Baeza
+# © 2014-2016 Tecnativa - Pedro M. Baeza
 # © 2016 Akretion (<http://www.akretion.com>).
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
     'name': 'Account Payment Order',
-    'version': '9.0.1.1.0',
+    'version': '10.0.1.1.0',
     'license': 'AGPL-3',
     'author': "ACSONE SA/NV, "
               "Therp BV, "
-              "Serv. Tecnol. Avanzados - Pedro M. Baeza, "
+              "Tecnativa, "
               "Akretion, "
               "Odoo Community Association (OCA)",
     'website': 'https://github.com/OCA/bank-payment',
diff --git a/account_payment_order/data/payment_mode_type.xml b/account_payment_order/data/payment_mode_type.xml
deleted file mode 100644
index 876778e62..000000000
--- a/account_payment_order/data/payment_mode_type.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- Add manual bank transfer as default payment option -->
-        <record model="payment.mode.type" id="manual_bank_tranfer">
-            <field name="name">Manual Bank Transfer</field>
-            <field name="code">BANKMAN</field>
-            <field name="suitable_bank_types"
-                eval="[(6,0,[ref('base.bank_normal'),ref('base_iban.bank_iban'),])]" />
-            <field name="ir_model_id"
-                   ref="model_payment_manual"/>
-            <field name="payment_order_type">payment</field>
-        </record>
-    </data>
-</openerp>
diff --git a/account_payment_order/data/payment_seq.xml b/account_payment_order/data/payment_seq.xml
index 9f89b95af..ff6c704c5 100644
--- a/account_payment_order/data/payment_seq.xml
+++ b/account_payment_order/data/payment_seq.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (C) 2015-2016 Akretion (http://www.akretion.com/)
-    @author: Alexis de Lattre <alexis.delattre@akretion.com>
-    The licence is in the file __openerp__.py
+  © 2015-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="bank_payment_line_seq" model="ir.sequence">
@@ -34,5 +33,4 @@
 </record>
 
 
-</data>
-</openerp>
+</odoo>
diff --git a/account_payment_order/demo/payment_demo.xml b/account_payment_order/demo/payment_demo.xml
index 1644a907a..900abe9e9 100644
--- a/account_payment_order/demo/payment_demo.xml
+++ b/account_payment_order/demo/payment_demo.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="1">
+<odoo noupdate="1">
 
 
 <record id="account_payment_mode.payment_mode_outbound_dd1" model="account.payment.mode">
@@ -30,5 +29,4 @@
 </record>
 
 
-</data>
-</openerp>
+</odoo>
diff --git a/account_payment_order/models/account_invoice.py b/account_payment_order/models/account_invoice.py
index e9cd0fe85..9da340809 100644
--- a/account_payment_order/models/account_invoice.py
+++ b/account_payment_order/models/account_invoice.py
@@ -4,8 +4,8 @@
 # © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api, _
-from openerp.exceptions import UserError
+from odoo import models, fields, api, _
+from odoo.exceptions import UserError
 
 
 class AccountInvoice(models.Model):
diff --git a/account_payment_order/models/account_move.py b/account_payment_order/models/account_move.py
index 1fda02896..85343f413 100644
--- a/account_payment_order/models/account_move.py
+++ b/account_payment_order/models/account_move.py
@@ -2,7 +2,7 @@
 # © 2016 Akretion (Alexis de Lattre <alexis.delattre@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 AccountMove(models.Model):
diff --git a/account_payment_order/models/account_move_line.py b/account_payment_order/models/account_move_line.py
index fa4578e7f..14cb05884 100644
--- a/account_payment_order/models/account_move_line.py
+++ b/account_payment_order/models/account_move_line.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 AccountMoveLine(models.Model):
diff --git a/account_payment_order/models/account_payment_line.py b/account_payment_order/models/account_payment_line.py
index a938cc7c6..b019c97ff 100644
--- a/account_payment_order/models/account_payment_line.py
+++ b/account_payment_order/models/account_payment_line.py
@@ -2,8 +2,8 @@
 # © 2015-2016 Akretion - Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api, _
-from openerp.exceptions import UserError
+from odoo import models, fields, api, _
+from odoo.exceptions import UserError
 
 
 class AccountPaymentLine(models.Model):
diff --git a/account_payment_order/models/account_payment_mode.py b/account_payment_order/models/account_payment_mode.py
index 9773ab8c0..bd97fe5bd 100644
--- a/account_payment_order/models/account_payment_mode.py
+++ b/account_payment_order/models/account_payment_mode.py
@@ -5,8 +5,8 @@
 # © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api, _
-from openerp.exceptions import ValidationError
+from odoo import models, fields, api, _
+from odoo.exceptions import ValidationError
 
 
 class AccountPaymentMode(models.Model):
diff --git a/account_payment_order/models/account_payment_order.py b/account_payment_order/models/account_payment_order.py
index c3f18a9e8..403f6a2aa 100644
--- a/account_payment_order/models/account_payment_order.py
+++ b/account_payment_order/models/account_payment_order.py
@@ -5,8 +5,8 @@
 # © 2016 Akretion (Alexis de Lattre - alexis.delattre@akretion.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api, _
-from openerp.exceptions import UserError, ValidationError
+from odoo import models, fields, api, _
+from odoo.exceptions import UserError, ValidationError
 
 
 class AccountPaymentOrder(models.Model):
diff --git a/account_payment_order/models/bank_payment_line.py b/account_payment_order/models/bank_payment_line.py
index 5e95e0667..095975d03 100644
--- a/account_payment_order/models/bank_payment_line.py
+++ b/account_payment_order/models/bank_payment_line.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-# © 2015 Akretion - Alexis de Lattre <alexis.delattre@akretion.com>
+# © 2015-2016 Akretion - Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, fields, api, _
-from openerp.exceptions import UserError
+from odoo import models, fields, api, _
+from odoo.exceptions import UserError
 
 
 class BankPaymentLine(models.Model):
diff --git a/account_payment_order/models/res_bank.py b/account_payment_order/models/res_bank.py
index 44dd6ecdb..0f0c7cdc3 100644
--- a/account_payment_order/models/res_bank.py
+++ b/account_payment_order/models/res_bank.py
@@ -2,8 +2,8 @@
 # © 2015-2016 Akretion - Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from openerp import models, api, _
-from openerp.exceptions import ValidationError
+from odoo import models, api, _
+from odoo.exceptions import ValidationError
 
 
 class ResBank(models.Model):
@@ -19,4 +19,4 @@ class ResBank(models.Model):
                     "contains %d characters, so it is not valid.")
                     % (bank.bic, len(bank.bic)))
 
-# in v9, on res.partner.bank bank_bic is a related of bank_id.bic
+# starting from v9, on res.partner.bank bank_bic is a related of bank_id.bic
diff --git a/account_payment_order/security/payment_security.xml b/account_payment_order/security/payment_security.xml
index 095059f2a..04f3561d5 100644
--- a/account_payment_order/security/payment_security.xml
+++ b/account_payment_order/security/payment_security.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
 <data noupdate="0">
 
 
@@ -11,9 +11,9 @@
 
 
 </data>
-
 <data noupdate="1">
 
+
 <record id="account_payment_order_company_rule" model="ir.rule">
     <field name="name">Payment order multi-company rule</field>
     <field name="model_id" ref="model_account_payment_order"/>
@@ -26,5 +26,6 @@
     <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
 </record>
 
+
 </data>
-</openerp>
+</odoo>
diff --git a/account_payment_order/views/account_invoice_view.xml b/account_payment_order/views/account_invoice_view.xml
index 2ca7919ff..228071395 100644
--- a/account_payment_order/views/account_invoice_view.xml
+++ b/account_payment_order/views/account_invoice_view.xml
@@ -5,7 +5,6 @@
 -->
 
 <odoo>
-<data>
 
 <record id="invoice_form" model="ir.ui.view">
     <field name="name">account_payment_order.invoice_form</field>
@@ -58,5 +57,4 @@
     view_mode="form"
     target="new"/>
 
-</data>
 </odoo>
diff --git a/account_payment_order/views/account_move_line.xml b/account_payment_order/views/account_move_line.xml
index 1179fe817..39dc7d848 100644
--- a/account_payment_order/views/account_move_line.xml
+++ b/account_payment_order/views/account_move_line.xml
@@ -1,13 +1,11 @@
 <?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 +22,4 @@
 </record>
 
 
-</data>
-</openerp>
+</odoo>
diff --git a/account_payment_order/views/account_payment_line.xml b/account_payment_order/views/account_payment_line.xml
index c1155ac03..54b89ba5e 100644
--- a/account_payment_order/views/account_payment_line.xml
+++ b/account_payment_order/views/account_payment_line.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
 
 <record id="account_payment_line_form" model="ir.ui.view">
@@ -65,5 +64,4 @@
 </record>
 
 
-</data>
-</openerp>
+</odoo>
diff --git a/account_payment_order/views/account_payment_mode.xml b/account_payment_order/views/account_payment_mode.xml
index 966f7b987..c8f3b628c 100644
--- a/account_payment_order/views/account_payment_mode.xml
+++ b/account_payment_order/views/account_payment_mode.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
 
 <record id="account_payment_mode_form" model="ir.ui.view">
@@ -70,5 +69,5 @@
     </field>
 </record>
 
-</data>
-</openerp>
+
+</odoo>
diff --git a/account_payment_order/views/account_payment_order.xml b/account_payment_order/views/account_payment_order.xml
index eec3c0e83..8846f0cc6 100644
--- a/account_payment_order/views/account_payment_order.xml
+++ b/account_payment_order/views/account_payment_order.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 
 
 <record id="account_payment_order_form" model="ir.ui.view">
@@ -159,5 +158,5 @@
 <menuitem id="account_payment_order_inbound_menu" action="account_payment_order_inbound_action"
     parent="payment_root" sequence="20"/>
 
-</data>
-</openerp>
+
+</odoo>
diff --git a/account_payment_order/views/bank_payment_line.xml b/account_payment_order/views/bank_payment_line.xml
index f5ce6742a..e045b3838 100644
--- a/account_payment_order/views/bank_payment_line.xml
+++ b/account_payment_order/views/bank_payment_line.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
+<odoo>
 <!--
-    Copyright (C) 2015-2016 Akretion (http://www.akretion.com/)
-    @author: Alexis de Lattre <alexis.delattre@akretion.com>
-    The licence is in the file __openerp__.py
+  © 2015-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).
 -->
 
 <record id="bank_payment_line_form" model="ir.ui.view">
@@ -79,5 +78,5 @@
 <menuitem id="bank_payment_line_menu" action="bank_payment_line_action"
     parent="payment_root" sequence="50" groups="group_account_payment"/>
 
-</data>
-</openerp>
+
+</odoo>
diff --git a/account_payment_order/views/ir_attachment.xml b/account_payment_order/views/ir_attachment.xml
index 98f5ac991..9d88181d0 100644
--- a/account_payment_order/views/ir_attachment.xml
+++ b/account_payment_order/views/ir_attachment.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- © 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>) -->
-<openerp>
-<data>
+<odoo>
+
 
 <record id="view_attachment_simplified_form" model="ir.ui.view">
     <field name="name">ir.attachment.simplified.form</field>
@@ -28,5 +28,5 @@
     </field>
 </record>
 
-</data>
-</openerp>
+
+</odoo>
diff --git a/account_payment_order/views/payment_order_create_view.xml b/account_payment_order/views/payment_order_create_view.xml
deleted file mode 100644
index 8a6d69a47..000000000
--- a/account_payment_order/views/payment_order_create_view.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2013 Akretion (http://www.akretion.com)
-  @author: Alexis de Lattre <alexis.delattre@akretion.com>
-  The licence is in the file __openerp__.py
--->
-<openerp>
-<data>
-
-<record id="view_create_payment_order_lines" model="ir.ui.view">
-    <field name="name">add.context.to.display.maturity.date</field>
-    <field name="model">payment.order.create</field>
-    <field name="inherit_id" ref="account_payment.view_create_payment_order_lines"/>
-    <field name="arch" type="xml">
-        <field name="entries" position="attributes">
-            <attribute name="context">{'journal_type': 'sale'}</attribute>
-            <attribute name="nolabel">1</attribute>
-        </field>
-    </field>
-</record>
-
-</data>
-</openerp>
diff --git a/account_payment_order/wizard/account_invoice_payment_line_multi.py b/account_payment_order/wizard/account_invoice_payment_line_multi.py
index 0abd67669..8b9df7c82 100644
--- a/account_payment_order/wizard/account_invoice_payment_line_multi.py
+++ b/account_payment_order/wizard/account_invoice_payment_line_multi.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, api
+from odoo import models, api
 
 
 class AccountInvoicePaymentLineMulti(models.TransientModel):
diff --git a/account_payment_order/wizard/account_payment_line_create.py b/account_payment_order/wizard/account_payment_line_create.py
index 0737b022e..a7e536284 100644
--- a/account_payment_order/wizard/account_payment_line_create.py
+++ b/account_payment_order/wizard/account_payment_line_create.py
@@ -5,7 +5,7 @@
 # © 2015-2016 Akretion (<http://www.akretion.com>)
 # 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 AccountPaymentLineCreate(models.TransientModel):
diff --git a/account_payment_order/wizard/account_payment_line_create_view.xml b/account_payment_order/wizard/account_payment_line_create_view.xml
index b53cca822..89227da2b 100644
--- a/account_payment_order/wizard/account_payment_line_create_view.xml
+++ b/account_payment_order/wizard/account_payment_line_create_view.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2013-2016 Akretion (http://www.akretion.com)
+  © 2013-2016 Akretion (http://www.akretion.com)
   @author: Alexis de Lattre <alexis.delattre@akretion.com>
-  The licence is in the file __openerp__.py
+  License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
-<openerp>
-<data>
+<odoo>
+
 
 <record id="account_payment_line_create_form" model="ir.ui.view">
     <field name="name">account_payment_line_create.form</field>
@@ -61,5 +61,5 @@
     <field name="target">new</field>
 </record>
 
-</data>
-</openerp>
+
+</odoo>