Merge lp:~therp-nl/banking-addons/ba70-no_partner_on_payment_clearing_lines into lp:banking-addons

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 176
Proposed branch: lp:~therp-nl/banking-addons/ba70-no_partner_on_payment_clearing_lines
Merge into: lp:banking-addons
Diff against target: 40 lines (+4/-3)
2 files modified
account_banking_payment/model/account_payment.py (+2/-1)
account_direct_debit/view/account_payment.xml (+2/-2)
To merge this branch: bzr merge lp:~therp-nl/banking-addons/ba70-no_partner_on_payment_clearing_lines
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review, no test Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+174775@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

LGTM

review: Approve (code review, no test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_banking_payment/model/account_payment.py'
2--- account_banking_payment/model/account_payment.py 2013-06-26 21:10:06 +0000
3+++ account_banking_payment/model/account_payment.py 2013-07-15 14:30:15 +0000
4@@ -315,7 +315,7 @@
5 line.move_line_id.invoice.number or
6 line.move_line_id.name),
7 'move_id': move_id,
8- 'partner_id': line.partner_id.id,
9+ 'partner_id': False,
10 'account_id': order.mode.transfer_account_id.id,
11 'credit': (order.payment_order_type == 'payment'
12 and line.amount or 0.0),
13@@ -329,6 +329,7 @@
14
15 # create the debit move line on the receivable account
16 vals.update({
17+ 'partner_id': line.partner_id.id,
18 'account_id': line.move_line_id.account_id.id,
19 'credit': (order.payment_order_type == 'debit'
20 and line.amount or 0.0),
21
22=== modified file 'account_direct_debit/view/account_payment.xml'
23--- account_direct_debit/view/account_payment.xml 2013-05-28 15:18:26 +0000
24+++ account_direct_debit/view/account_payment.xml 2013-07-15 14:30:15 +0000
25@@ -32,13 +32,13 @@
26 <field name="reference" position="after">
27 <field name="payment_order_type"/>
28 </field>
29- <xpath expr="/form/group/button[@string='Select Invoices to Pay']"
30+ <xpath expr="//button[@string='Select Invoices to Pay']"
31 position="attributes">
32 <attribute name="attrs">
33 {'invisible':['|',('state','!=','draft'),('payment_order_type', '!=', 'payment')]}
34 </attribute>
35 </xpath>
36- <xpath expr="/form/group/button[@string='Select Invoices to Pay']"
37+ <xpath expr="//button[@string='Select Invoices to Pay']"
38 position="after">
39 <button colspan="2" name="%(account_payment.action_create_payment_order)s"
40 string="Select Invoices to Collect" type="action"

Subscribers

People subscribed via source and target branches

to status/vote changes: