diff --git a/delivery_partner/__manifest__.py b/delivery_partner/__manifest__.py
index ca0582e6..52bb240d 100755
--- a/delivery_partner/__manifest__.py
+++ b/delivery_partner/__manifest__.py
@@ -1,7 +1,7 @@
 {
     'name': 'Partner Shipping Accounts',
     'author': 'Hibou Corp. <hello@hibou.io>',
-    'version': '11.0.1.0.0',
+    'version': '13.0.1.0.0',
     'category': 'Stock',
     'sequence': 95,
     'summary': 'Record shipping account numbers on partners.',
diff --git a/delivery_partner/models/delivery.py b/delivery_partner/models/delivery.py
index 6838d384..72361774 100644
--- a/delivery_partner/models/delivery.py
+++ b/delivery_partner/models/delivery.py
@@ -24,7 +24,6 @@ class PartnerShippingAccount(models.Model):
     ], string='Carrier', required=True)
     note = fields.Text(string='Internal Note')
 
-    @api.multi
     def name_get(self):
         delivery_types = self._fields['delivery_type']._description_selection(self.env)
 
diff --git a/delivery_partner/views/delivery_views.xml b/delivery_partner/views/delivery_views.xml
index 7f888688..edfded9b 100644
--- a/delivery_partner/views/delivery_views.xml
+++ b/delivery_partner/views/delivery_views.xml
@@ -81,12 +81,12 @@
         </field>
     </record>
 
-    <record id="view_order_form_with_carrier_inherit" model="ir.ui.view">
-        <field name="name">delivery.sale.order.form.view.with_carrier.inherit</field>
+    <record id="view_order_form_inherit" model="ir.ui.view">
+        <field name="name">sale.order.form.inherit</field>
         <field name="model">sale.order</field>
-        <field name="inherit_id" ref="delivery.view_order_form_with_carrier"/>
+        <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='id']" position="before">
+            <xpath expr="//field[@name='payment_term_id']" position="before">
                 <field name="shipping_account_id" options="{'no_create': True, 'no_open': True}" domain="['|', ('partner_id', '=', False), ('partner_id', '=', partner_id)]"/>
             </xpath>
         </field>