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
=== 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 @@
315 line.move_line_id.invoice.number or 315 line.move_line_id.invoice.number or
316 line.move_line_id.name),316 line.move_line_id.name),
317 'move_id': move_id,317 'move_id': move_id,
318 'partner_id': line.partner_id.id,318 'partner_id': False,
319 'account_id': order.mode.transfer_account_id.id,319 'account_id': order.mode.transfer_account_id.id,
320 'credit': (order.payment_order_type == 'payment'320 'credit': (order.payment_order_type == 'payment'
321 and line.amount or 0.0),321 and line.amount or 0.0),
@@ -329,6 +329,7 @@
329329
330 # create the debit move line on the receivable account330 # create the debit move line on the receivable account
331 vals.update({331 vals.update({
332 'partner_id': line.partner_id.id,
332 'account_id': line.move_line_id.account_id.id,333 'account_id': line.move_line_id.account_id.id,
333 'credit': (order.payment_order_type == 'debit'334 'credit': (order.payment_order_type == 'debit'
334 and line.amount or 0.0),335 and line.amount or 0.0),
335336
=== 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 @@
32 <field name="reference" position="after">32 <field name="reference" position="after">
33 <field name="payment_order_type"/>33 <field name="payment_order_type"/>
34 </field>34 </field>
35 <xpath expr="/form/group/button[@string='Select Invoices to Pay']"35 <xpath expr="//button[@string='Select Invoices to Pay']"
36 position="attributes">36 position="attributes">
37 <attribute name="attrs">37 <attribute name="attrs">
38 {'invisible':['|',('state','!=','draft'),('payment_order_type', '!=', 'payment')]}38 {'invisible':['|',('state','!=','draft'),('payment_order_type', '!=', 'payment')]}
39 </attribute>39 </attribute>
40 </xpath>40 </xpath>
41 <xpath expr="/form/group/button[@string='Select Invoices to Pay']"41 <xpath expr="//button[@string='Select Invoices to Pay']"
42 position="after">42 position="after">
43 <button colspan="2" name="%(account_payment.action_create_payment_order)s"43 <button colspan="2" name="%(account_payment.action_create_payment_order)s"
44 string="Select Invoices to Collect" type="action" 44 string="Select Invoices to Collect" type="action"

Subscribers

People subscribed via source and target branches

to status/vote changes: