From ebb2bb5c2b94d29119adb9a220f5520568b181f4 Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Sun, 6 Oct 2013 21:03:02 +0200 Subject: [PATCH] [RFR] Revert previous commit, problem between keyboard and chair --- .../model/account_bank_statement.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/account_bank_statement_tax/model/account_bank_statement.py b/account_bank_statement_tax/model/account_bank_statement.py index d0d734b15..b6c940aed 100644 --- a/account_bank_statement_tax/model/account_bank_statement.py +++ b/account_bank_statement_tax/model/account_bank_statement.py @@ -66,6 +66,11 @@ class AccountBankStatement(orm.Model): update_move_line['tax_code_id'] = tax['base_code_id'] update_move_line['tax_amount'] = tax['base_sign'] * ( computed_taxes.get('total', 0.0)) + # As the tax is inclusive, we need to correct the amount on the + # original move line + amount = computed_taxes.get('total', 0.0) + update_move_line['credit'] = ((amount < 0) and -amount) or 0.0 + update_move_line['debit'] = ((amount > 0) and amount) or 0.0 move_lines.append({ 'move_id': defaults['move_id'], @@ -82,13 +87,6 @@ class AccountBankStatement(orm.Model): 'account_id': tax.get('account_collected_id', defaults['account_id']), }) - if move_lines: - # As the tax is inclusive, we need to correct the amount on the - # original move line - amount = computed_taxes.get('total', 0.0) - update_move_line['credit'] = ((amount < 0) and -amount) or 0.0 - update_move_line['debit'] = ((amount > 0) and amount) or 0.0 - return move_lines, update_move_line def _prepare_bank_move_line(