Merge lp:~openerp-dev/openobject-server/6.0-opw-441976-rgo into lp:openobject-server/6.0

[Ravi Gohil (OpenERP)]

Hello,

When an Integer 'ids' is supplied as parameter of read() method, a traceback is caused because a dict will be return by the execution of next statement(when passed 'ids' as integer) that is 'res=super(osv.osv, self).read(cr, user, ids, fields, context, load)' whereas a list of dict is expected to execute the code within next looping statement.

I modified the code accordingly. Kindly review it.

Thanks.

[lp:~openerp-dev/openobject-server/6.0-opw-441976-rgo]

3594. By Xavier ALT on 2012-02-28

[REVERT] r3583: revert back res.log context field to fields.char(size=255)

3595. By Ravi Gohil (OpenERP) on 2012-02-29

[FIX] res_currency: When passed integer 'ids' as parameter to read() of res_currency instead of 'ids' as list, traceback is caused(Maintenance Case : 441976)

[Naresh(OpenERP) (nch-openerp)]

review: Approve

=== modified file 'bin/addons/base/res/res_currency.py'
--- bin/addons/base/res/res_currency.py	2011-10-12 14:15:50 +0000
+++ bin/addons/base/res/res_currency.py	2012-02-29 10:52:20 +0000
@@ -78,7 +78,10 @@
     _constraints = [(_check_rounding, "The rounding factor cannot be 0 !", ['rounding'])]
 
     def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
-        res=super(osv.osv, self).read(cr, user, ids, fields, context, load)
+        select = ids
+        if isinstance(ids, (int, long)):
+            select = [select]
+        res = super(osv.osv, self).read(cr, user, select, fields, context, load)
         for r in res:
             if r.__contains__('rate_ids'):
                 rates=r['rate_ids']
@@ -86,6 +89,8 @@
                     currency_rate_obj=  self.pool.get('res.currency.rate')
                     currency_date = currency_rate_obj.read(cr,user,rates[0],['name'])['name']
                     r['date'] = currency_date
+        if isinstance(ids, (int, long)):
+            return res and res[0] or False
         return res
 
     def round(self, cr, uid, currency, amount):