From 98801be77f8bcd7fc249f9dd4884bc7577c787a6 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Tue, 2 Sep 2014 11:37:57 +0200
Subject: [PATCH] [FIX] account, bank statement reconciliation: fixed use cases
involving transactions made in a different currency than the company AND the
statement ones
---
addons/account/account_bank_statement.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 0bdc2a743a88..a8727f5f0778 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -754,7 +754,7 @@ class account_bank_statement_line(osv.osv):
aml_obj.create(cr, uid, bank_st_move_vals, context=context)
# Complete the dicts
st_line_currency = st_line.currency_id or statement_currency
- st_line_currency_rate = st_line.currency_id and statement_currency.id == company_currency.id and (st_line.amount_currency / st_line.amount) or False
+ st_line_currency_rate = st_line.currency_id and (st_line.amount_currency / st_line.amount) or False
to_create = []
for mv_line_dict in mv_line_dicts:
if mv_line_dict.get('is_tax_line'):
@@ -774,6 +774,9 @@ class account_bank_statement_line(osv.osv):
if st_line.currency_id and statement_currency.id == company_currency.id and st_line_currency_rate:
debit_at_current_rate = self.pool.get('res.currency').round(cr, uid, company_currency, mv_line_dict['debit'] / st_line_currency_rate)
credit_at_current_rate = self.pool.get('res.currency').round(cr, uid, company_currency, mv_line_dict['credit'] / st_line_currency_rate)
+ elif st_line.currency_id and st_line_currency_rate:
+ debit_at_current_rate = currency_obj.compute(cr, uid, statement_currency.id, company_currency.id, mv_line_dict['debit'] / st_line_currency_rate, context=context)
+ credit_at_current_rate = currency_obj.compute(cr, uid, statement_currency.id, company_currency.id, mv_line_dict['credit'] / st_line_currency_rate, context=context)
else:
debit_at_current_rate = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['debit'], context=context)
credit_at_current_rate = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['credit'], context=context)
--
GitLab