From 6f87b8efcd202fb99ed96bb9a97ed4dd4941a1e7 Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 20 Jul 2012 11:36:56 +0530
Subject: [PATCH] [IMP]add field currency_id in res_country

bzr revid: hsa@tinyerp.com-20120720060656-wbdj7fx46oskxbe0
---
 openerp/addons/base/res/res_country.py       | 2 +-
 openerp/addons/base/res/res_country_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index bbd469bd6b7..002a86896eb 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -55,7 +55,7 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
             \n%(state_code)s: the code of the state
             \n%(country_name)s: the name of the country
             \n%(country_code)s: the code of the country"""),
-        'currency':fields.many2one('res.currency','Currency Code'),
+        'currency_id':fields.many2one('res.currency','Currency Code'),
     }
     _sql_constraints = [
         ('name_uniq', 'unique (name)',
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index ca4440a616d..06ebd73637f 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -27,7 +27,7 @@
                     <group>
                         <group>
                             <field name="name"/>
-                            <field name="currency"/>
+                            <field name="currency_id"/>
                             <field name="address_format" groups="base.group_no_one"/>
                         </group>
                         <group>