Banking Addons

Merge lp:~therp-nl/banking-addons/6.1-match_multiple_invoices_split-fixes into lp:~therp-nl/banking-addons/6.1-match_multiple_invoices_split

  1. 6.1-match_multiple_invoices_split-fixes
  2. Merge into 6.1-match_multiple_invoice...
Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 170
Proposed branch: lp:~therp-nl/banking-addons/6.1-match_multiple_invoices_split-fixes
Merge into: lp:~therp-nl/banking-addons/6.1-match_multiple_invoices_split
Diff against target: 39 lines (+8/-3)
2 files modified
account_banking/banking_import_transaction.py (+1/-1)
account_banking/wizard/banking_transaction_wizard.py (+7/-2)
To merge this branch: bzr merge lp:~therp-nl/banking-addons/6.1-match_multiple_invoices_split-fixes
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Approve
Review via email: mp+166804@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve

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-05-03 15:10:17 +0000
3+++ account_banking/banking_import_transaction.py 2013-05-31 14:01:28 +0000
4@@ -1500,7 +1500,7 @@
5 not(transaction.move_currency_amount is False)):
6 res[transaction.id] = (
7 transaction.move_currency_amount -
8- transaction.transferred_amount
9+ transaction.statement_line_id.amount
10 )
11 return res
12
13
14=== modified file 'account_banking/wizard/banking_transaction_wizard.py'
15--- account_banking/wizard/banking_transaction_wizard.py 2013-05-02 15:13:33 +0000
16+++ account_banking/wizard/banking_transaction_wizard.py 2013-05-31 14:01:28 +0000
17@@ -221,7 +221,7 @@
18
19 if len(todo) > 0:
20 statement_line_id = wiz.statement_line_id.split_off(
21- move_line.credit or move_line.debit)[0]
22+ move_line.debit or -move_line.credit)[0]
23 transaction_id = statement_line_obj.browse(
24 cr,
25 uid,
26@@ -285,7 +285,12 @@
27 account_id = setting.default_debit_account_id and setting.default_debit_account_id.id
28 statement_pool.write(cr, uid, wiz.statement_line_id.id, {'account_id':account_id})
29
30- wiz.write({'partner_id': False})
31+ # Restore partner id from the bank account or else reset
32+ partner_id = False
33+ if (wiz.statement_line_id.partner_bank_id and
34+ wiz.statement_line_id.partner_bank_id.partner_id):
35+ partner_id = wiz.statement_line_id.partner_bank_id.partner_id.id
36+ wiz.write({'partner_id': partner_id})
37
38 if wiz.statement_line_id:
39 #delete splits causing an unsplit if this is a split

Subscribers

People subscribed via source and target branches

to all changes: