diff --git a/account_banking_mandate_sale/__manifest__.py b/account_banking_mandate_sale/__manifest__.py
index d5031421d..92f57d6ff 100644
--- a/account_banking_mandate_sale/__manifest__.py
+++ b/account_banking_mandate_sale/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Account Banking Mandate Sale",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "category": "Banking addons",
     "license": "AGPL-3",
     "summary": "Adds mandates on sale orders",
@@ -14,8 +14,6 @@
         "account_payment_sale",
         "account_banking_mandate",
     ],
-    "data": [
-        "views/sale_order.xml",
-    ],
+    "data": ["views/sale_order.xml"],
     "installable": True,
 }
diff --git a/account_banking_mandate_sale/oca_dependencies.txt b/account_banking_mandate_sale/oca_dependencies.txt
deleted file mode 100644
index 5cdbc1a4e..000000000
--- a/account_banking_mandate_sale/oca_dependencies.txt
+++ /dev/null
@@ -1 +0,0 @@
-sale-workflow
diff --git a/account_banking_mandate_sale/views/sale_order.xml b/account_banking_mandate_sale/views/sale_order.xml
index 5d1470d84..ef8ecbea8 100644
--- a/account_banking_mandate_sale/views/sale_order.xml
+++ b/account_banking_mandate_sale/views/sale_order.xml
@@ -10,14 +10,14 @@
     <field name="model">sale.order</field>
     <field name="inherit_id" ref="account_payment_sale.view_order_form" />
     <field name="arch" type="xml">
-        <field name="fiscal_position_id" position="after">
+        <xpath expr="//field[@name='fiscal_position_id']/parent::div" position="after">
             <field
                     name="mandate_id"
                     attrs="{'invisible': [('mandate_required', '=', False)]}"
                 />
             <field name="mandate_required" invisible="1" />
             <field name="commercial_invoice_partner_id" invisible="1" />
-        </field>
+        </xpath>
     </field>
 </record>
 
diff --git a/account_banking_mandate_sale/wizard/sale_make_invoice_advance.py b/account_banking_mandate_sale/wizard/sale_make_invoice_advance.py
index 17037cec0..b62799387 100644
--- a/account_banking_mandate_sale/wizard/sale_make_invoice_advance.py
+++ b/account_banking_mandate_sale/wizard/sale_make_invoice_advance.py
@@ -7,9 +7,9 @@ from odoo import models
 class SaleAdvancePaymentInv(models.TransientModel):
     _inherit = "sale.advance.payment.inv"
 
-    def _prepare_invoice_values(self, order, name, amount, so_line):
+    def _prepare_invoice_values(self, order, so_line):
         """Copy mandate from sale order to invoice"""
-        vals = super()._prepare_invoice_values(order, name, amount, so_line)
+        vals = super()._prepare_invoice_values(order, so_line)
         if order.mandate_id:
             vals["mandate_id"] = order.mandate_id.id
         return vals