diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 3bc6e4d6322..287329b8129 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1021,6 +1021,7 @@
         <record id="EUR" model="res.currency">
             <field name="name">EUR</field>
             <field name="code">EUR</field>
+            <field name="symbol">€</field>
             <field name="rounding">0.01</field>
             <field name="accuracy">4</field>
             <!-- Company ID will be set later -->
@@ -1031,7 +1032,7 @@
             <field name="currency_id" ref="EUR"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <!-- Basic Company  -->
         <record id="main_company" model="res.company">
             <field name="name">OpenERP S.A.</field>
@@ -1041,7 +1042,7 @@
             <field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: CPHBBE75 - VAT: BE0477.472.701</field>
             <field name="currency_id" ref="base.EUR"/>
         </record>
-        
+
         <assert id="main_company" model="res.company">
             <test expr="currency_id.code == 'eur'.upper()"/>
             <test expr="name">OpenERP S.A.</test>
@@ -1082,7 +1083,7 @@
             <field name="currency_id" ref="USD"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="VEB" model="res.currency">
             <field name="name">Bs</field>
             <field name="code">VEB</field>
@@ -1095,7 +1096,7 @@
             <field name="currency_id" ref="VEB"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="CAD" model="res.currency">
             <field name="name">CAD</field>
             <field name="code">CAD</field>
@@ -1108,8 +1109,8 @@
             <field name="currency_id" ref="CAD"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="CHF" model="res.currency">
             <field name="name">CHF</field>
             <field name="code">CHF</field>
@@ -1122,7 +1123,7 @@
             <field name="currency_id" ref="CHF"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="BRL" model="res.currency">
             <field name="name">BRL</field>
             <field name="code">BRL</field>
@@ -1135,7 +1136,7 @@
             <field name="currency_id" ref="BRL"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="CNY" model="res.currency">
             <field name="name">CNY</field>
             <field name="code">CNY</field>
@@ -1148,8 +1149,8 @@
             <field name="currency_id" ref="CNY"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="COP" model="res.currency">
             <field name="name">COP</field>
             <field name="code">COP</field>
@@ -1157,7 +1158,7 @@
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        
+
         <record id="CZK" model="res.currency">
             <field name="name">Kč</field>
             <field name="code">CZK</field>
@@ -1165,7 +1166,7 @@
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        
+
         <record id="DKK" model="res.currency">
             <field name="name">kr</field>
             <field name="code">DKK</field>
@@ -1178,8 +1179,8 @@
             <field name="currency_id" ref="DKK"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="HUF" model="res.currency">
             <field name="name">Ft</field>
             <field name="code">HUF</field>
@@ -1187,7 +1188,7 @@
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        
+
         <record id="IDR" model="res.currency">
             <field name="name">Rs</field>
             <field name="code">IDR</field>
@@ -1195,7 +1196,7 @@
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        
+
         <record id="LVL" model="res.currency">
             <field name="name">Ls</field>
             <field name="code">LVL</field>
@@ -1208,8 +1209,8 @@
             <field name="currency_id" ref="LVL"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="NOK" model="res.currency">
             <field name="name">kr</field>
             <field name="code">NOK</field>
@@ -1222,8 +1223,8 @@
             <field name="currency_id" ref="NOK"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="PAB" model="res.currency">
             <field name="name">PAB</field>
             <field name="code">PAB</field>
@@ -1236,8 +1237,8 @@
             <field name="currency_id" ref="PAB"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
-        
+
+
         <record id="PLN" model="res.currency">
             <field name="name">zł</field>
             <field name="code">PLN</field>
@@ -1245,7 +1246,7 @@
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        
+
         <record id="SEK" model="res.currency">
             <field name="name">kr</field>
             <field name="code">SEK</field>
@@ -1253,7 +1254,7 @@
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        
+
         <record id="GBP" model="res.currency">
             <field name="name">GBP</field>
             <field name="code">GBP</field>
@@ -1266,7 +1267,7 @@
             <field name="currency_id" ref="GBP"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="ARS" model="res.currency">
             <field name="name">ARS</field>
             <field name="code">ARS</field>
@@ -1274,13 +1275,13 @@
             <field name="accuracy">4</field>
             <field name="company_id" ref="main_company"/>
         </record>
-        
+
 		<record id="rateARS" model="res.currency.rate">
 			<field name="rate">5.6</field>
 			<field name="currency_id" ref="ARS"/>
 			<field eval="time.strftime('%Y-01-01')" name="name"/>
-		</record>        
- 
+		</record>
+
         <record id="INR" model="res.currency">
             <field name="name">INR</field>
             <field name="code">Rs</field>
@@ -1317,7 +1318,7 @@
             <field name="currency_id" ref="AUD"/>
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
-        
+
         <record id="UAH" model="res.currency">
             <field name="name">UAH</field>
             <field name="code">UAH</field>
diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index 0d03c067223..2cd7682be5b 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -47,6 +47,7 @@ class res_currency(osv.osv):
     _columns = {
         'name': fields.char('Currency', size=32, required=True),
         'code': fields.char('Code', size=3),
+        'symbol': fields.char('Symbol', size=3),
         'rate': fields.function(_current_rate, method=True, string='Current Rate', digits=(12,6),
             help='The rate of the currency to the currency of rate 1'),
         'rate_ids': fields.one2many('res.currency.rate', 'currency_id', 'Rates'),
diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index a26d22346ce..10b804a1be0 100644
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -31,8 +31,9 @@
                         <field name="code" select="1"/>
                         <field name="company_id" select="2" />
                         <field name="rate"/>
+                        <field name="symbol"/>
                     </group>
-                    
+
                     <group col="2" colspan="2">
                         <separator string="Price Accuracy" colspan="2"/>
                         <field name="rounding"/>
@@ -44,7 +45,7 @@
                         <field name="base"/>
                         <field name="active" select="1"/>
                     </group>
-                    
+
                     <field colspan="4" mode="tree,form" name="rate_ids" nolabel="1" attrs="{'readonly':[('base','=',True)]}">
                         <form string="Rates">
                             <field name="name"/>