audrius/bank-payment
1
0
Fork 1
mirror of https://github.com/OCA/bank-payment.git synced 2025-02-02 10:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] Calculation of residual in the case of split transactions

Browse Source 
[FIX] Transaction amount when credit amounts are split
[FIX] Restore bank account's partner when disabling match
This commit is contained in:
Stefan Rijnhart
2013-05-31 15:57:21 +02:00
parent 146aa8007e
commit de237618a4
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account_banking/banking_import_transaction.py
View File

@@ -1500,7 +1500,7 @@ class banking_import_transaction(osv.osv):
not(transaction.move_currency_amount is False)):
res[transaction.id] = (
transaction.move_currency_amount -
transaction.transferred_amount
transaction.statement_line_id.amount
)
return res

9
account_banking/wizard/banking_transaction_wizard.py
View File

@@ -221,7 +221,7 @@ class banking_transaction_wizard(osv.osv_memory):
if len(todo) > 0:
statement_line_id = wiz.statement_line_id.split_off(
move_line.credit or move_line.debit)[0]
move_line.debit or -move_line.credit)[0]
transaction_id = statement_line_obj.browse(
cr,
uid,
@@ -285,7 +285,12 @@ class banking_transaction_wizard(osv.osv_memory):
account_id = setting.default_debit_account_id and setting.default_debit_account_id.id
statement_pool.write(cr, uid, wiz.statement_line_id.id, {'account_id':account_id})
wiz.write({'partner_id': False})
# Restore partner id from the bank account or else reset
partner_id = False
if (wiz.statement_line_id.partner_bank_id and
wiz.statement_line_id.partner_bank_id.partner_id):
partner_id = wiz.statement_line_id.partner_bank_id.partner_id.id
wiz.write({'partner_id': partner_id})
if wiz.statement_line_id:
#delete splits causing an unsplit if this is a split