[FIX] res_currency: Removing unnecessary 'browse'
bzr revid: rim@openerp.com-20140423073511-kkjkt0a0baxz3466
This commit is contained in:
parent
a684b9a96a
commit
22df13f4fd
|
@ -46,18 +46,19 @@ class res_currency(osv.osv):
|
||||||
currency_rate_type = context.get('currency_rate_type_id') or None
|
currency_rate_type = context.get('currency_rate_type_id') or None
|
||||||
# ... and use 'is NULL' instead of '= some-id'.
|
# ... and use 'is NULL' instead of '= some-id'.
|
||||||
operator = '=' if currency_rate_type else 'is'
|
operator = '=' if currency_rate_type else 'is'
|
||||||
for currency in self.browse(cr, uid, ids, context=context):
|
for id in ids:
|
||||||
cr.execute('SELECT rate FROM res_currency_rate '
|
cr.execute('SELECT rate FROM res_currency_rate '
|
||||||
'WHERE currency_id = %s '
|
'WHERE currency_id = %s '
|
||||||
'AND name <= %s '
|
'AND name <= %s '
|
||||||
'AND currency_rate_type_id ' + operator + ' %s '
|
'AND currency_rate_type_id ' + operator + ' %s '
|
||||||
'ORDER BY name desc LIMIT 1',
|
'ORDER BY name desc LIMIT 1',
|
||||||
(currency.id, date, currency_rate_type))
|
(id, date, currency_rate_type))
|
||||||
if cr.rowcount:
|
if cr.rowcount:
|
||||||
res[currency.id] = cr.fetchone()[0]
|
res[id] = cr.fetchone()[0]
|
||||||
elif not raise_on_no_rate:
|
elif not raise_on_no_rate:
|
||||||
res[currency.id] = 0
|
res[id] = 0
|
||||||
else:
|
else:
|
||||||
|
currency = self.browse(cr, uid, id, context=context)
|
||||||
raise osv.except_osv(_('Error!'),_("No currency rate associated for currency '%s' for the given period" % (currency.name)))
|
raise osv.except_osv(_('Error!'),_("No currency rate associated for currency '%s' for the given period" % (currency.name)))
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue