Merge lp:~unifield-team/unifield-server/UF_938 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/base/res/res_currency.py'
--- bin/addons/base/res/res_currency.py	2012-03-08 14:26:02 +0000
+++ bin/addons/base/res/res_currency.py	2012-04-17 13:59:24 +0000
@@ -100,12 +100,12 @@
         if from_currency['rate'] == 0 or to_currency['rate'] == 0:
             date = context.get('date', time.strftime('%Y-%m-%d'))
             if from_currency['rate'] == 0:
-                currency_symbol = from_currency.symbol
+                currency_name = from_currency.name
             else:
-                currency_symbol = to_currency.symbol
+                currency_name = to_currency.name
             raise osv.except_osv(_('Error'), _('No rate found \n' \
                     'for the currency: %s \n' \
-                    'at the date: %s') % (currency_symbol, date))
+                    'at the date: %s') % (currency_name, date))
         return to_currency.rate/from_currency.rate
 
     def compute(self, cr, uid, from_currency_id, to_currency_id, from_amount, round=True, context=None):