From 0c98b8b3112e6904755b08b07da3b38eb526a1ea Mon Sep 17 00:00:00 2001 From: Arthur Maniet Date: Mon, 19 Jan 2015 12:36:48 +0100 Subject: [PATCH] [FIX] account: fautly behaviour introduced by 16e6919abc85e984e2a58f62902be05f6723ee81 --- addons/account/account_bank_statement.py | 10 +--------- addons/account/account_move_line.py | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 3b513faa3e1..d06f85e5115 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -770,15 +770,7 @@ class account_bank_statement_line(osv.osv): move_id = am_obj.create(cr, uid, move_vals, context=context) # Create the move line for the statement line - if st_line.statement_id.currency.id != company_currency.id: - if st_line.currency_id == company_currency: - st_line_amount = st_line.amount_currency - else: - ctx = context.copy() - ctx['date'] = st_line.date - st_line_amount = currency_obj.compute(cr, uid, st_line.statement_id.currency.id, company_currency.id, st_line.amount, context=ctx) - else: - st_line_amount = st_line.amount + st_line_amount = st_line.currency_id and st_line.amount_currency or st_line.amount if to_reconcile_mv_line_ids: already_reconciled_amount = reduce(add, [x['credit'] - x['debit'] for x in mv_line_dicts if x.get('already_paid', False)]) st_line_amount -= already_reconciled_amount diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 41ba8d231a6..20e8a0e9036 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1391,7 +1391,6 @@ class account_move_line(osv.osv): 'credit': tax['amount']<0 and -tax['amount'] or 0.0, 'debit': tax['amount']>0 and tax['amount'] or 0.0, } - import pprint; pp = pprint.PrettyPrinter(indent=4); pp.pprint(tax['amount']) self.create(cr, uid, data, context) del vals['account_tax_id']