banking-addons-team team mailing list archive

["Stefan Rijnhart \(Therp\)" <stefan@xxxxxxxx>]

Stefan Rijnhart (Therp) has proposed merging lp:~therp-nl/banking-addons/ba70-no_partner_on_payment_clearing_lines into lp:banking-addons/banking-addons-70.

Requested reviews:
  Banking Addons Core Editors (banking-addons-team)

For more details, see:
https://code.launchpad.net/~therp-nl/banking-addons/ba70-no_partner_on_payment_clearing_lines/+merge/174775
-- 
https://code.launchpad.net/~therp-nl/banking-addons/ba70-no_partner_on_payment_clearing_lines/+merge/174775
Your team Banking Addons Core Editors is requested to review the proposed merge of lp:~therp-nl/banking-addons/ba70-no_partner_on_payment_clearing_lines into lp:banking-addons/banking-addons-70.

=== modified file 'account_banking_payment/model/account_payment.py'
--- account_banking_payment/model/account_payment.py	2013-06-26 21:10:06 +0000
+++ account_banking_payment/model/account_payment.py	2013-07-15 14:30:15 +0000
@@ -315,7 +315,7 @@
                         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 @@
 
                 # 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),

=== modified file 'account_direct_debit/view/account_payment.xml'
--- account_direct_debit/view/account_payment.xml	2013-05-28 15:18:26 +0000
+++ account_direct_debit/view/account_payment.xml	2013-07-15 14:30:15 +0000
@@ -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"