diff --git a/account_banking_payment/model/account_payment.py b/account_banking_payment/model/account_payment.py
index 30a283f33..b238cbeef 100644
--- a/account_banking_payment/model/account_payment.py
+++ b/account_banking_payment/model/account_payment.py
@@ -315,7 +315,7 @@ class payment_order(orm.Model):
                         line.move_line_id.invoice.number or 
                         line.move_line_id.name),
                     'move_id': move_id,
-                    'partner_id': line.partner_id.id,
+                    'partner_id': False,
                     'account_id': order.mode.transfer_account_id.id,
                     'credit': (order.payment_order_type == 'payment'
                                and line.amount or 0.0),
@@ -329,6 +329,7 @@ class payment_order(orm.Model):
 
                 # create the debit move line on the receivable account
                 vals.update({
+                        'partner_id': line.partner_id.id,
                         'account_id': line.move_line_id.account_id.id,
                         'credit': (order.payment_order_type == 'debit'
                                    and line.amount or 0.0),
diff --git a/account_direct_debit/view/account_payment.xml b/account_direct_debit/view/account_payment.xml
index 05797f0b1..74c6bc5a1 100644
--- a/account_direct_debit/view/account_payment.xml
+++ b/account_direct_debit/view/account_payment.xml
@@ -32,13 +32,13 @@
                     <field name="reference" position="after">
                         <field name="payment_order_type"/>
                     </field>
-                    <xpath expr="/form/group/button[@string='Select Invoices to Pay']"
+                    <xpath expr="//button[@string='Select Invoices to Pay']"
                            position="attributes">
                         <attribute name="attrs">
                             {'invisible':['|',('state','!=','draft'),('payment_order_type', '!=', 'payment')]}
                         </attribute>
                     </xpath>
-                    <xpath expr="/form/group/button[@string='Select Invoices to Pay']"
+                    <xpath expr="//button[@string='Select Invoices to Pay']"
                            position="after">
                         <button colspan="2" name="%(account_payment.action_create_payment_order)s"
                                 string="Select Invoices to Collect" type="action"