diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 294a4b080a1..675e72252bb 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1026,10 +1026,13 @@
 	<record model="res.currency" id="EUR">
 		<field name="name">EUR</field>
 		<field name="code">EUR</field>
-		<field name="rate">1.0</field>
 		<field name="rounding">2</field>
 		<field name="accuracy">4</field>
 	</record>
+	<record model="res.currency.rate" id="rateEUR">
+		<field name="rate">1.0</field>
+		<field name="currency_id" ref="EUR"/>
+	</record>
 
 	<record model="res.company" id="main_company">
 		<field name="name">Tiny sprl</field>
diff --git a/bin/addons/base/base_demo.xml b/bin/addons/base/base_demo.xml
index 361fe5e5718..38ebd2fdb38 100644
--- a/bin/addons/base/base_demo.xml
+++ b/bin/addons/base/base_demo.xml
@@ -13,11 +13,15 @@
 
 	<record model="res.currency" id="USD">
 		<field name="name">USD</field>
-		<field name="rate">0.8400</field>
 		<field name="rounding">2</field>
 		<field name="accuracy">4</field>
 	</record>
 	
+	<record model="res.currency.rate" id="rateUSD">
+		<field name="rate">0.8400</field>
+		<field name="currency_id" ref="USD"/>
+	</record>
+
 
 	<!-- USA States -->
 	<record model="res.country.state" id="us-al">
diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index b193144fafc..a4fc0b07eba 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -34,26 +34,32 @@ import ir
 
 from tools.misc import currency
 
-#from _common import rounding
-
 import mx.DateTime
 from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
 class res_currency(osv.osv):
+	def _current_rate(self, cr, uid, ids, name, arg, context):
+		res={}
+		for id in ids:
+			cr.execute("SELECT currency_id, rate FROM res_currency_rate WHERE currency_id = %d AND name <= '%s' ORDER BY name desc LIMIT 1" % (id, time.strftime('%Y-%m-%d')))
+			if cr.rowcount:
+				id, rate=cr.fetchall()[0]
+				res[id]=rate
+			else:
+				res[id]=0
+		return res
 	_name = "res.currency"
 	_description = "Currency"
 	_columns = {
 		'name': fields.char('Currency', size=32, required=True),
 		'code': fields.char('Code', size=3),
-		'date': fields.date('Last rate update', readonly=True),
-		'rate': fields.float('Relative Change rate',digits=(12,6)),
-		#'digits': fields.integer('Displayed Digits'),
+		'rate': fields.function(_current_rate, method=True, string='Current rate',digits=(12,6)),
+		'rate_ids': fields.one2many('res.currency.rate', 'currency_id', 'Rates'),
 		'accuracy': fields.integer('Computational Accuracy'),
 		'rounding': fields.float('Rounding factor'),
 		'active': fields.boolean('Active'),
 	}
 	_defaults = {
-		'date': lambda *a: time.strftime('%Y-%m-%d'),
 		'active': lambda *a: 1,
 	}
 	_order = "code"
@@ -63,8 +69,23 @@ class res_currency(osv.osv):
 			return from_amount
 		[from_currency]=self.read(cr, uid, [from_currency_id])
 		[to_currency] = self.read(cr, uid, [to_currency_id])
+		if from_currency['rate'] == 0 or to_currency['rate'] == 0:
+			raise osv.except_osv('Error', 'No rate found for the currency')
 		return currency(from_amount * from_currency['rate']/to_currency['rate'], to_currency['accuracy'], to_currency['rounding'])
 					
 			
 res_currency()
 
+class res_currency_rate(osv.osv):
+	_name = "res.currency.rate"
+	_description = "Currency Rate"
+	_columns = {
+		'name': fields.date('Date', required=True, select=True),
+		'rate': fields.float('Rate', digits=(12,6), required=True),
+		'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
+	}
+	_defaults = {
+		'name': lambda *a: time.strftime('%Y-%m-%d'),
+	}
+	_order = "name desc"
+res_currency_rate()
diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index 314ef905670..10ef253d8cd 100644
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -14,7 +14,6 @@
 				<field name="name"/>
 				<field name="code"/>
 				<field name="rate"/>
-				<field name="date"/>
 				<field name="rounding"/>
 				<field name="accuracy"/>
 				<field name="active" />
@@ -29,11 +28,20 @@
 			<form string="Currency">
 				<field name="name" select="1" colspan="3"/>
 				<field name="code" select="1"/>
-				<field name="active"  select="1"/>
 				<field name="rate"/>
-				<field name="date" select="1"/>
 				<field name="rounding"/>
 				<field name="accuracy"/>
+				<field name="active"  select="1"/>
+				<field name="rate_ids" colspan="4" nolabel="1" mode="tree,form">
+					<form string="Rates">
+						<field name="name"/>
+						<field name="rate"/>
+					</form>
+					<tree string="Rates">
+						<field name="name"/>
+						<field name="rate"/>
+					</tree>
+				</field>
 			</form>
 		</field>
 	</record>