From 5c7075cac6ae44b6daf2bb55793f10aa855c0a44 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Tue, 12 Jul 2011 17:06:01 +0530 Subject: [PATCH] [IMP] base: Added a condition to check currency rate type. bzr revid: uco@tinyerp.com-20110712113601-slvo0c3590a7dkxf --- openerp/addons/base/res/res_currency.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py index 957c0fb625f..46b4dd45207 100644 --- a/openerp/addons/base/res/res_currency.py +++ b/openerp/addons/base/res/res_currency.py @@ -36,8 +36,12 @@ class res_currency(osv.osv): else: date = time.strftime('%Y-%m-%d') date = date or time.strftime('%Y-%m-%d') + currency_rate_type_id = context.get('currency_rate_type_id', 0) for id in ids: - cr.execute("SELECT currency_id, rate FROM res_currency_rate WHERE currency_id = %s AND name <= %s ORDER BY name desc LIMIT 1" ,(id, date)) + cr.execute("SELECT currency_id, rate FROM res_currency_rate "\ + "WHERE currency_id = %s AND name <= %s AND currency_rate_type_id = %s "\ + "ORDER BY name desc LIMIT 1" ,(id, date, currency_rate_type_id)) + if cr.rowcount: id, rate = cr.fetchall()[0] res[id] = rate