Banking Addons

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

  1. ba70-remove_leftover_manual_move_line_id
  2. Merge into banking-addons-70
Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 181
Proposed branch: lp:~therp-nl/banking-addons/ba70-remove_leftover_manual_move_line_id
Merge into: lp:banking-addons
Diff against target: 43 lines (+1/-10)
3 files modified
account_banking/banking_import_transaction.py (+0/-2)
account_banking/wizard/banking_transaction_wizard.py (+0/-7)
account_banking_payment/view/banking_transaction_wizard.xml (+1/-1)
To merge this branch: bzr merge lp:~therp-nl/banking-addons/ba70-remove_leftover_manual_move_line_id
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review, no test Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+176786@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/banking_import_transaction.py'
2--- account_banking/banking_import_transaction.py 2013-06-26 21:14:41 +0000
3+++ account_banking/banking_import_transaction.py 2013-07-24 21:14:26 +0000
4@@ -1211,8 +1211,6 @@
5 'match_type',
6 'move_line_id',
7 'invoice_id',
8- 'manual_invoice_id',
9- 'manual_move_line_id',
10 ]] +
11 [(x, [(6, 0, [])]) for x in [
12 'move_line_ids',
13
14=== modified file 'account_banking/wizard/banking_transaction_wizard.py'
15--- account_banking/wizard/banking_transaction_wizard.py 2013-06-26 21:14:41 +0000
16+++ account_banking/wizard/banking_transaction_wizard.py 2013-07-24 21:14:26 +0000
17@@ -363,13 +363,6 @@
18 ('payment_order_manual', 'Payment order (manual)'),
19 ],
20 string='Match type', readonly=True),
21- 'manual_invoice_id': fields.many2one(
22- 'account.invoice', 'Match this invoice',
23- domain=[('reconciled', '=', False)]),
24- 'manual_move_line_id': fields.many2one(
25- 'account.move.line', 'Or match this entry',
26- domain=[('account_id.reconcile', '=', True),
27- ('reconcile_id', '=', False)]),
28 'manual_invoice_ids': fields.many2many(
29 'account.invoice',
30 'banking_transaction_wizard_account_invoice_rel',
31
32=== modified file 'account_banking_payment/view/banking_transaction_wizard.xml'
33--- account_banking_payment/view/banking_transaction_wizard.xml 2013-05-29 22:26:36 +0000
34+++ account_banking_payment/view/banking_transaction_wizard.xml 2013-07-24 21:14:26 +0000
35@@ -26,7 +26,7 @@
36 domain="[('id', 'in', payment_order_ids[0][2])]"
37 />
38 </field>
39- <field name="manual_move_line_id" position="after">
40+ <field name="manual_move_line_ids" position="after">
41 <field name="manual_payment_line_id"/>
42 <field name="manual_payment_order_id"/>
43 </field>

Subscribers

People subscribed via source and target branches

to status/vote changes: