1
=== modified file 'bin/addons/base/res/res_currency.py'
2
--- bin/addons/base/res/res_currency.py	2012-03-08 14:26:02 +0000
3
+++ bin/addons/base/res/res_currency.py	2012-04-17 13:59:24 +0000
4
@@ -100,12 +100,12 @@
5
100
        if from_currency['rate'] == 0 or to_currency['rate'] == 0:
100
        if from_currency['rate'] == 0 or to_currency['rate'] == 0:
6
101
            date = context.get('date', time.strftime('%Y-%m-%d'))
101
            date = context.get('date', time.strftime('%Y-%m-%d'))
7
102
            if from_currency['rate'] == 0:
102
            if from_currency['rate'] == 0:
9
103
                currency_symbol = from_currency.symbol
103
                currency_name = from_currency.name
10
104
            else:
104
            else:
12
105
                currency_symbol = to_currency.symbol
105
                currency_name = to_currency.name
13
106
            raise osv.except_osv(_('Error'), _('No rate found \n' \
106
            raise osv.except_osv(_('Error'), _('No rate found \n' \
14
107
                    'for the currency: %s \n' \
107
                    'for the currency: %s \n' \
16
108
                    'at the date: %s') % (currency_symbol, date))
108
                    'at the date: %s') % (currency_name, date))
17
109
        return to_currency.rate/from_currency.rate
109
        return to_currency.rate/from_currency.rate
18
110
110
19
111
    def compute(self, cr, uid, from_currency_id, to_currency_id, from_amount, round=True, context=None):
111
    def compute(self, cr, uid, from_currency_id, to_currency_id, from_amount, round=True, context=None):
Status:	Merged
Merged at revision:	3400
Proposed branch:	lp:~unifield-team/unifield-server/UF_938
Merge into:	lp:unifield-server
Diff against target:	19 lines (+3/-3) 1 file modified bin/addons/base/res/res_currency.py (+3/-3)
To merge this branch:	bzr merge lp:~unifield-team/unifield-server/UF_938
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
UniField Dev Team		2012-04-17	Pending
Review via email: mp+102303@code.launchpad.net
1	=== modified file 'bin/addons/base/res/res_currency.py'
2	--- bin/addons/base/res/res_currency.py 2012-03-08 14:26:02 +0000
3	+++ bin/addons/base/res/res_currency.py 2012-04-17 13:59:24 +0000
4	@@ -100,12 +100,12 @@
5	100	if from_currency['rate'] == 0 or to_currency['rate'] == 0:	100	if from_currency['rate'] == 0 or to_currency['rate'] == 0:
6	101	date = context.get('date', time.strftime('%Y-%m-%d'))	101	date = context.get('date', time.strftime('%Y-%m-%d'))
7	102	if from_currency['rate'] == 0:	102	if from_currency['rate'] == 0:
9	103	currency_symbol = from_currency.symbol	103	currency_name = from_currency.name
10	104	else:	104	else:
12	105	currency_symbol = to_currency.symbol	105	currency_name = to_currency.name
13	106	raise osv.except_osv(_('Error'), _('No rate found \n' \	106	raise osv.except_osv(_('Error'), _('No rate found \n' \
14	107	'for the currency: %s \n' \	107	'for the currency: %s \n' \
16	108	'at the date: %s') % (currency_symbol, date))	108	'at the date: %s') % (currency_name, date))
17	109	return to_currency.rate/from_currency.rate	109	return to_currency.rate/from_currency.rate
18	110		110
19	111	def compute(self, cr, uid, from_currency_id, to_currency_id, from_amount, round=True, context=None):	111	def compute(self, cr, uid, from_currency_id, to_currency_id, from_amount, round=True, context=None):