From 501b20f3681e2e6c66ba81aeb84a2fca5734cb61 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Sat, 18 Feb 2012 14:25:05 +0100 Subject: [PATCH] [FIX] Reconciling raises error when partial reconciliation is present [FIX] Wrong sign in residual write-off in some cases --- account_banking/banking_import_transaction.py | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/account_banking/banking_import_transaction.py b/account_banking/banking_import_transaction.py index 0b9636fa7..a2112a926 100644 --- a/account_banking/banking_import_transaction.py +++ b/account_banking/banking_import_transaction.py @@ -486,11 +486,11 @@ class banking_import_transaction(osv.osv): line_partial_ids = line_ids[:] line_ids = [] reconcile_obj.write( - cr, uid, reconcile_id, + cr, uid, reconcile.id, { 'line_id': [(6, 0, line_ids)], 'line_partial_ids': [(6, 0, line_partial_ids)], }, context=context) - return reconcile_id + return reconcile.id def _do_move_unreconcile(self, cr, uid, move_line_ids, currency, context=None): """ @@ -820,18 +820,12 @@ class banking_import_transaction(osv.osv): 'name': '(write-off) %s' % ( trans.move_line_id.move_id.name or '') }, context=context) - writeoff_debit = False - writeoff_credit = False - if trans.statement_line_id.amount > 0: - if trans.residual > 0: - writeoff_debit = trans.residual - else: - writeoff_credit = - trans.residual + if trans.residual > 0: + writeoff_debit = trans.residual + writeoff_credit = False else: - if trans.residual > 0: - writeoff_credit = trans.residual - else: - writeoff_debit = - trans.residual + writeoff_debit = False + writeoff_credit = - trans.residual vals = { 'name': trans.statement_line_id.name, 'date': trans.statement_line_id.date,