From 773376f17909c52864c7657ee9aa8caa75929bc4 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 27 Aug 2012 16:56:40 +0530
Subject: [PATCH 01/12] [IMP]Crm :Applying multi currency group to currency
 field

bzr revid: dhr@tinyerp.com-20120827112640-grr1rfsxc3v46c5w
---
 addons/crm/crm_lead_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6a715893a17..4c322f52935 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -324,7 +324,7 @@
                                         <b><field name="name"/></b>
                                         <t t-if="record.planned_revenue.raw_value">
                                             - <b><t t-esc="Math.round(record.planned_revenue.value)"/>
-                                            <field name="company_currency"/></b>
+                                            <field name="company_currency" groups="base.group_multi_currency"/></b>
                                         </t>
                                     </div>
                                     <div>
@@ -435,7 +435,7 @@
                             <label for="planned_revenue" class="oe_edit_only"/>
                             <h2>
                                 <field name="planned_revenue" class="oe_inline"/>
-                                <field name="company_currency" class="oe_inline"/> at
+                                <field name="company_currency" class="oe_inline" groups="base.group_multi_currency"/> at
                                 <field name="probability" class="oe_inline" widget="integer"/>%% success rate
                             </h2>
                         </div>

From 706b816935f829af17be3c2ee21007bdfda2589b Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 27 Aug 2012 17:33:53 +0530
Subject: [PATCH 02/12] [IMP]Stock: applying multi currency group to currency
 fields

bzr revid: dhr@tinyerp.com-20120827120353-3dwutnuj6uan3kls
---
 addons/stock/wizard/stock_partial_move_view.xml    | 4 ++--
 addons/stock/wizard/stock_partial_picking_view.xml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index acfc4b1923c..54f15e99dff 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -44,7 +44,7 @@
                     <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="stock.group_production_lot"/>
                     <field name="update_cost" invisible="1"/>
                     <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
@@ -63,7 +63,7 @@
                         <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
                         <field name="update_cost" invisible="1"/>
                         <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
                     </group>
                  </form>
             </field>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 7de85594a26..b1add22acd1 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -27,7 +27,7 @@
                             <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
                             <field name="update_cost" invisible="1"/>
                             <field name="cost"  invisible="1"/>
-                            <field name="currency"  invisible="1"/>
+                            <field name="currency"  invisible="1" groups="base.group_multi_currency"/>
                         </tree>
                     </field>
                     <footer>
@@ -52,7 +52,7 @@
                     <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
                     <field name="update_cost" invisible="1"/>
                     <field name="cost" invisible="1"/>
-                    <field name="currency" invisible="1"/>
+                    <field name="currency" invisible="1" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
@@ -71,7 +71,7 @@
                         <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}"/>
                         <field name="update_cost" invisible="1"/>
                         <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
                     </group>
                  </form>
             </field>

From 547ac8ac4efd0e2454c1d3010e8d9dffb320920e Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 27 Aug 2012 18:33:40 +0530
Subject: [PATCH 03/12] [IMP]Account:applying multi_currency group to currency
 fields

bzr revid: dhr@tinyerp.com-20120827130340-tw52x8w0v6lyt2d8
---
 addons/account/account_bank_view.xml          |  4 +--
 addons/account/account_invoice_view.xml       | 16 ++++-----
 addons/account/account_view.xml               | 36 +++++++++----------
 addons/account/res_config_view.xml            |  4 +--
 .../wizard/account_change_currency_view.xml   |  2 +-
 .../account_report_central_journal_view.xml   |  2 +-
 .../account_report_general_journal_view.xml   |  2 +-
 .../account_report_general_ledger_view.xml    |  2 +-
 .../account_report_partner_ledger_view.xml    |  2 +-
 .../account_report_print_journal_view.xml     |  2 +-
 10 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index 8ceb8a91885..ef793a1bef5 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -15,7 +15,7 @@
                 <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}">
                     <separator string="Accounting Information" colspan="2"/>
                     <field name="journal_id"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                 </group>
             </group>
         </field>
@@ -28,7 +28,7 @@
         <field name="inherit_id" ref="base.view_partner_bank_tree"/>
         <field name="arch" type="xml">
             <field name="acc_number" position="after">
-                <field name="currency_id"/>
+                <field name="currency_id" groups="base.group_multi_currency"/>
             </field>
         </field>
     </record>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 143c5514141..febc9b6d90d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -127,7 +127,7 @@
                     <field name="user_id"/>
                     <field name="date_due"/>
                     <field name="origin"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="residual" sum="Residual Amount"/>
                     <field name="amount_untaxed" sum="Untaxed Amount"/>
                     <field name="amount_total" sum="Total Amount"/>
@@ -184,7 +184,7 @@
                                 name="account_id" groups="account.group_account_user"/>
                             <field name="journal_id" groups="account.group_account_user"
                                 on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
-                            <field name="currency_id"/>
+                            <field name="currency_id" groups="base.group_multi_currency"/>
                         </group>
                     </group>
                     <notebook>
@@ -264,8 +264,8 @@
                                     <field name="journal_id"/>
                                     <field name="debit"/>
                                     <field name="credit"/>
-                                    <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
                         </page>
@@ -326,9 +326,9 @@
                             <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"
                                 name="account_id" groups="account.group_account_user"/>
 
-                            <label for="currency_id"/>
+                            <label for="currency_id" groups="base.group_multi_currency"/>
                             <div>
-                                <field name="currency_id" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                                 <!-- note fp: I don't think we need this feature ?
                                 <button name="%(action_account_change_currency)d" type="action"
                                   icon="terp-stock_effects-object-colorize"
@@ -418,8 +418,8 @@
                                     <field name="journal_id" groups="base.group_user"/>
                                     <field name="debit"/>
                                     <field name="credit"/>
-                                    <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5bf45aab487..60c80a7ab92 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -197,14 +197,14 @@
                             <field name="credit" attrs="{'readonly':[('type','=','view')]}"/>
                             <field name="balance"/>
                         </group>
-                        <group>
+                        <group groups="base.group_multi_currency">
                             <field name="tax_ids" domain="[('parent_id','=',False)]" widget="many2many_tags"/>
                             <field name="reconcile"/>
                             <field name="child_consol_ids"
                                 attrs="{'invisible':[('type','!=','consolidation')]}"
                                 widget="many2many_tags"/>
                         </group>
-                        <group>
+                        <group groups="base.group_multi_currency">
                             <field name="currency_id"/>
                             <field name="currency_mode" attrs="{'readonly': [('currency_id','=',False)]}"/>
                         </group>
@@ -248,7 +248,7 @@
                     <field name="balance"/>
                     <field name="type"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="company_currency_id"/>
+                    <field name="company_currency_id" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
@@ -296,7 +296,7 @@
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
-                    <field name="company_currency_id"/>
+                    <field name="company_currency_id" groups="base.group_multi_currency"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="type"/>
                     <field name="parent_id" invisible="1"/>
@@ -321,7 +321,7 @@
                     <field name="parent_id" invisible="1"/>
                     <field name="user_type" invisible="1"/>
                     <field name="type" invisible="1"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="exchange_rate"/>
                     <field name="foreign_balance"/>
                     <field name="adjusted_balance"/>
@@ -489,7 +489,7 @@
                         <group>
                             <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="currency"/>
+                            <field name="currency" groups="base.group_multi_currency"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                     </group>
@@ -645,7 +645,7 @@
                             <label for="balance_start"/>
                             <div>
                                 <field name="balance_start" class="oe_inline"/>
-                                <field name="currency" class="oe_inline"/>
+                                <field name="currency" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
                             <field name="balance_end_real"/>
                         </group>
@@ -1066,8 +1066,8 @@
                     <field name="credit" sum="Total credit"/>
                     <field name="account_tax_id"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                    <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}"/>
-                    <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}"/>
+                    <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
+                    <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
                     <field name="reconcile_partial_id"/>
                     <field name="reconcile_id"/>
                     <field name="state"/>
@@ -1118,7 +1118,7 @@
 	                                    <field name="tax_amount"/>
 	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
 	                                </group>
-	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
+	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency" groups="base.group_multi_currency">
 	                                    <field name="currency_id"/>
 	                                    <field name="amount_currency"/>
 	                                </group>
@@ -1166,8 +1166,8 @@
                                 <field name="credit"/>
 
                                 <separator colspan="4" string="Optional Information"/>
-                                <field name="currency_id"/>
-                                <field name="amount_currency"/>
+                                <field name="currency_id" groups="base.group_multi_currency"/>
+                                <field name="amount_currency" groups="base.group_multi_currency"/>
                                 <field name="quantity"/>
                                 <field name="move_id" required="False"/>
                                 <newline/>
@@ -1394,7 +1394,7 @@
                                                     <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                                                 </group>
 
-                                                <group string="Currency">
+                                                <group string="Currency" groups="base.group_multi_currency">
                                                     <field name="currency_id"/>
                                                     <field name="amount_currency"/>
                                                 </group>
@@ -1431,8 +1431,8 @@
                                     <field name="debit" sum="Total Debit"/>
                                     <field name="credit" sum="Total Credit"/>
                                     <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                                    <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                     <field name="tax_code_id"/>
                                     <field name="tax_amount"/>
                                     <field name="state"/>
@@ -2075,7 +2075,7 @@
                                 <field name="type"/>
                                 <field name="user_type"/>
 
-                                <field name="currency_id"/>
+                                <field name="currency_id" groups="base.group_multi_currency"/>
                                 <field name="reconcile"/>
                                 <field name="chart_template_id"/>
                             </group>
@@ -2400,7 +2400,7 @@
                             <tree editable="bottom">
                                 <field name="acc_name"/>
                                 <field name="account_type"/>
-                                <field name="currency_id" widget="selection"/>
+                                <field name="currency_id" widget="selection" groups="base.group_multi_currency"/>
                             </tree>
                         </field>
                     </div>
@@ -2565,7 +2565,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                             <field name="date" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date, company_id)"/>
                             <field name="closing_date" readonly="1"/>
                             <field name="period_id" class="oe_inline"/>
-                            <field name="currency" invisible="1"/>
+                            <field name="currency" invisible="1" groups="base.group_multi_currency"/>
                         </group>
                     </group>
                     <notebook>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 79a65f70414..9398d04b3cc 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -107,8 +107,8 @@
                         <label for="id" string="Options"/>
                         <div name="account_config">
                             <div>
-                                <label for="currency_id"/>
-                                <field name="currency_id" class="oe_inline"/>
+                                <label for="currency_id" groups="base.group_multi_currency"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
                             <div>
                                 <label for="decimal_precision"/>
diff --git a/addons/account/wizard/account_change_currency_view.xml b/addons/account/wizard/account_change_currency_view.xml
index 1da342b4236..2f166f056c9 100644
--- a/addons/account/wizard/account_change_currency_view.xml
+++ b/addons/account/wizard/account_change_currency_view.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Invoice Currency" version="7.0">
                     <group string="This wizard will change the currency of the invoice">
-                        <field name="currency_id"/>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
                     </group>
                     <footer>
                         <button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index 2819d93471d..27b611f5838 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
                 <field name="target_move" position="after">
-                    <field name="amount_currency"/>
+                    <field name="amount_currency" groups="base.group_multi_currency"/>
                     <newline/>
                 </field>
             </field>
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index fc57789d0b7..d68860a8e33 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
-               <field name="amount_currency"/>
+               <field name="amount_currency" groups="base.group_multi_currency"/>
                <newline/>
             </xpath>
             </data>
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index b636101ee79..e5da60e26b4 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -12,7 +12,7 @@
                 <field name="display_account"/>
                 <field name="sortby"/>
                 <field name="landscape"/>
-                <field name="amount_currency"/>
+                <field name="amount_currency" groups="base.group_multi_currency"/>
                 <newline/>
             </xpath>
             <xpath expr="//field[@name='filter']" position="after">
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index f3dd9a80f09..461765164ea 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -10,7 +10,7 @@
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="result_selection"/>
-                <field name="amount_currency"/>
+                <field name="amount_currency" groups="base.group_multi_currency"/>
                 <field name="page_split"/>
                 <newline/>
             </xpath>
diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml
index ae8049d579e..227d2b35706 100644
--- a/addons/account/wizard/account_report_print_journal_view.xml
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@ -10,7 +10,7 @@
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="sort_selection"/>
-                <field name="amount_currency"/>
+                <field name="amount_currency" groups="base.group_multi_currency"/>
                 <newline/>
                 <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4" invisible="1"/>
                 <separator string="Periods"  colspan="4"/>

From 8fd057ee7b407bcf3634f5612b40cf3c55898eb5 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Mon, 27 Aug 2012 18:54:00 +0530
Subject: [PATCH 04/12] [IMP]account_asset,account_coda and account_payment
 :Applying multi currency group to currency field

bzr revid: dhr@tinyerp.com-20120827132400-jar8us97nmhlpj8e
---
 addons/account_asset/account_asset_view.xml   |  6 ++---
 addons/account_coda/account_coda_view.xml     |  8 +++----
 .../account_payment/account_payment_view.xml  | 24 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index c230f63e204..bb0222d5e4f 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -100,7 +100,7 @@
                         </group>
                         <group>
                             <field name="purchase_date"/>
-                            <field name="currency_id"/>
+                            <field name="currency_id" groups="base.group_multi_currency"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
                         </group>
                     </group>
@@ -192,7 +192,7 @@
                 <field name="partner_id"/>
                 <field name="purchase_value"/>
                 <field name="value_residual"/>
-                <field name="currency_id"/>
+                <field name="currency_id" groups="base.group_multi_currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state"/>
             </tree>
@@ -211,7 +211,7 @@
                 <field name="purchase_date"/>
                 <field name="purchase_value"/>
                 <field name="value_residual"/>
-                <field name="currency_id"/>
+                <field name="currency_id" groups="base.group_multi_currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state"/>
             </tree>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 0b42ad6352f..3762669e5a3 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -16,7 +16,7 @@
                 <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
                 <field name="bank_id"/>
                 <field name="journal"/>
-                <field name="currency"/>
+                <field name="currency" groups="base.group_multi_currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Group By...">
                     <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
@@ -32,7 +32,7 @@
         <tree string="CODA Bank Account Configuration">
           <field name="name"/>
           <field name="bank_id"/>
-          <field name="currency"/>
+          <field name="currency" groups="base.group_multi_currency"/>
           <field name="description1"/>
           <field name="journal"/>
           <field name="state"/>
@@ -48,7 +48,7 @@
                 <field name="name" colspan="4"/>
                 <field name="bank_id" domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
                 <field name="description1"/>
-                <field name="currency"/>
+                <field name="currency" groups="base.group_multi_currency"/>
                 <field name="description2"/>
                 <field name="coda_st_naming"/>
                 <field name="state" on_change="onchange_state(state)"/>
@@ -305,7 +305,7 @@
                       <field name="name"/>
                       <field name="date"/>
                       <field name="coda_bank_account_id"/>
-                      <field name="currency"/>
+                      <field name="currency" groups="base.group_multi_currency"/>
                       <field name="period_id"/>
                       <field name="type"/>
                       <newline/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index e3e9b2ae558..3ad94c1bdbd 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -30,8 +30,8 @@
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
                     <field name="amount_to_pay"/>
-                    <field name="amount_currency"/>
-                    <field name="currency_id"/>
+                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="period_id" invisible="1"/>
                 </tree>
             </field>
@@ -131,8 +131,8 @@
                                         <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
                                         <separator colspan="4" string="Transaction Information"/>
                                         <field name="date"/>
-                                        <label for="amount_currency"/>
-                                        <div>
+                                        <label for="amount_currency" groups="base.group_multi_currency"/>
+                                        <div groups="base.group_multi_currency">
                                             <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
                                             <field name="currency" nolabel="1" class="oe_inline"/>
                                         </div>
@@ -154,7 +154,7 @@
                                         <label for="amount"/>
                                         <div>
                                             <field name="amount" class="oe_inline"/>
-                                            <field name="company_currency" class="oe_inline"/>
+                                            <field name="company_currency" class="oe_inline" groups="base.group_multi_currency"/>
                                         </div>
                                         <separator colspan="4" string="Entry Information"/>
                                         <field name="create_date" readonly="1"/>
@@ -171,8 +171,8 @@
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
                             <field name="date"/>
-                            <field name="amount_currency" string="Amount"/>
-                            <field name="currency"/>
+                            <field name="amount_currency" string="Amount" groups="base.group_multi_currency"/>
+                            <field name="currency" groups="base.group_multi_currency"/>
                             <field name="name"/>
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>
                         </tree>
@@ -257,8 +257,8 @@
                                 <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)]"/>
                                 <separator colspan="4" string="Transaction Information"/>
                                 <field name="date"/>
-                                <label for="amount_currency"/>
-                                <div>
+                                <label for="amount_currency" groups="base.group_multi_currency"/>
+                                <div groups="base.group_multi_currency">
                                     <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
                                     <field name="currency" class="oe_inline"/>
                                 </div>
@@ -278,7 +278,7 @@
                         <page string="Information">
                             <group col="4" string="General Information">
                                 <field name="amount"/>
-                                <field name="company_currency" nolabel="1"/>
+                                <field name="company_currency" nolabel="1" groups="base.group_multi_currency"/>
                             </group>
                             <group col="4" string="Entry Information">
                                 <field name="create_date"/>
@@ -302,8 +302,8 @@
                     <field name="partner_id"/>
                     <field name="communication"/>
                     <field name="amount" sum="Amount Total"/>
-                    <field name="amount_currency" sum="Currency Amount Total"/>
-                    <field name="currency"/>
+                    <field name="amount_currency" sum="Currency Amount Total" groups="base.group_multi_currency"/>
+                    <field name="currency" groups="base.group_multi_currency"/>
                     <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                     <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>
                     <field name="create_date"/>

From b59ae47bb876a83733dec14866bd2cef5996ae2b Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 11:55:39 +0530
Subject: [PATCH 05/12] [IMP]Account_voucher : Applying group multi currency to
 currency field

bzr revid: dhr@tinyerp.com-20120828062539-37dzdvbidj23xx7t
---
 addons/account_voucher/account_voucher_view.xml      |  4 ++--
 .../report/account_voucher_sales_receipt_view.xml    |  2 +-
 .../account_voucher/voucher_payment_receipt_view.xml | 12 ++++++------
 .../account_voucher/voucher_sales_purchase_view.xml  |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 64e1cf22156..c27c54c0ca2 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -49,7 +49,7 @@
                   <sheet string="Accounting Voucher">
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                        <field name="payment_rate_currency_id" invisible="1"/>
+                        <field name="payment_rate_currency_id" invisible="1" groups="base.group_multi_currency"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
                         <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>
@@ -75,7 +75,7 @@
                                 </group>
                                 <group string="Other Information">
                                     <field name="number"/>
-                                    <field name="currency_id"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </group>
                                 <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
                                     <separator string="Total" colspan="4"/>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 15b2433ec25..97aadb67cfd 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -16,7 +16,7 @@
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="state" invisible="1"/>
-                <field name="currency_id" invisible="1"/>
+                <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                 <field name="journal_id" invisible="1"/>
                 <field name="date_due" invisible="1"/>
                 <field name="account_id" invisible="1"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 503c3aeaa5e..0f484a5c781 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -102,7 +102,7 @@
                                     <field name="narration" nolabel="1" colspan="2"/>
                                 </group>
                                 <group string="Other Information" col="4">
-                                    <field name="currency_id" colspan="4"/>
+                                    <field name="currency_id" colspan="4" groups="base.group_multi_currency"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
@@ -137,7 +137,7 @@
                             <label for="amount" string="Amount"/>
                             <div>
                                 <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
                             <field name="journal_id"
                                 domain="[('type','in',['bank', 'cash'])]"
@@ -194,7 +194,7 @@
                                         <separator string="Currency Options" colspan="4"/>
                                         <field name="is_multi_currency" invisible="1"/>
                                         <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" />
                                         <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                     </group>
                                     <group col="2">
@@ -232,7 +232,7 @@
                                    <field name="state"/>
                                    <field name="reconcile_id"/>
                                    <field name="amount_currency"/>
-                                   <field name="currency_id"/>
+                                   <field name="currency_id" groups="base.group_multi_currency"/>
                                </tree>
                             </field>
                         </page>
@@ -302,7 +302,7 @@
                                 <field name="amount" class="oe_inline"
                                     invisible="context.get('line_type', False)"
                                     on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
-                                <field name="currency_id" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
 
                             <field name="journal_id"
@@ -401,7 +401,7 @@
                                     <field name="state"/>
                                     <field name="reconcile_id"/>
                                     <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5bcecfa268e..7984b42a149 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -80,7 +80,7 @@
                             <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="name"/>
                             <field name="paid" invisible="1"/>
-                            <field name="currency_id" invisible="1"/>
+                            <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                         </group>
                         <field name="type" invisible="True"/>
                     </group>
@@ -229,7 +229,7 @@
                             <field name="date" string="Bill Date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="date_due"/>
                             <field name="paid" invisible="1"/>
-                            <field name="currency_id" invisible="1"/>
+                            <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                             <field name="journal_id"
                                 domain="[('type','in',['purchase','purchase_refund'])]"
                                 widget="selection"

From c2a8adb97613f6756267021b412d0a2e53f94638 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 12:38:41 +0530
Subject: [PATCH 06/12] [IMP]pos,product(pricelist) and hr_expense_report :
 applying multi_currency group to currency field

bzr revid: dhr@tinyerp.com-20120828070841-l318wc2b4jkm99dz
---
 addons/hr_expense/report/hr_expense_report_view.xml | 2 +-
 addons/point_of_sale/point_of_sale_view.xml         | 2 +-
 addons/product/pricelist_view.xml                   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1cd1e10c5ed..d984669bb08 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -16,7 +16,7 @@
                 <field name="analytic_account" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="department_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
-                <field name="currency_id" invisible="1"/>
+                <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                 <field name="product_id" invisible="1"/>
                 <field name="product_qty" invisible="1"/>
                 <field name="state" invisible="1"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index dce19ab77b6..0b29ace35ea 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -963,7 +963,7 @@
                                 <field name="total_entry_encoding" />
                                 <field name="balance_end_real" />
                                 <field name="difference" />
-                                <field name="currency" />
+                                <field name="currency" groups="base.group_multi_currency" />
                                 <field name="state" />
                             </tree>
                         </field>
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index adefd9e5d3c..dc120660c43 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -119,7 +119,7 @@
                     <field name="name" string="Products Price"/>
                     <field name="type"/>
                     <field name="active" />
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                 </search>
             </field>
         </record>
@@ -132,7 +132,7 @@
                 <tree string="Products Price List">
                     <field name="name"/>
                     <field name="type"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="active" />
                 </tree>
             </field>
@@ -149,7 +149,7 @@
                     <group col="4">
                         <field name="active"/>
                         <field name="type"/>
-                        <field name="currency_id"/>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <field name="version_id">
@@ -230,7 +230,7 @@
                         <field name="name"/>
                         <field name="active"/>
                         <field name="field"/>
-                        <field name="currency_id"/>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
                     </group>
                 </form>
             </field>

From d5a3b33663f2ef4d8f163945c43969dba4826d8e Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 12:48:59 +0530
Subject: [PATCH 07/12] [IMP]Project timesheet and report intrasat : applying
 group multi currency to currency field

bzr revid: dhr@tinyerp.com-20120828071859-c3hrto4m1x3aiyvq
---
 addons/project_timesheet/project_timesheet_view.xml | 2 +-
 addons/report_intrastat/report_intrastat_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index c47c411f6c9..9d60e165d1e 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -10,7 +10,7 @@
                 <field name="use_tasks" position="after">
                     <field name="use_timesheets"/>
                     <field name="timesheet_count"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="partner_id"/>
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 4f02c8f8c75..8d8da4a078f 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -84,7 +84,7 @@
                     <field name="weight"/>
                     <field name="value"/>
                     <field name="supply_units"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="type"/>
                 </tree>
             </field>

From 8ff4fbdc60dcf2a16e78119615cb1f1bd95d66c7 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 14:19:45 +0530
Subject: [PATCH 08/12] [IMP]account_analytic_analysis: applying group multi
 currency to currency field

bzr revid: dhr@tinyerp.com-20120828084945-06v2328h6zqkqgp3
---
 addons/account/account_invoice_view.xml                     | 2 +-
 addons/account/project/project_view.xml                     | 6 +++---
 .../account/report/account_analytic_entries_report_view.xml | 2 +-
 addons/account/report/account_entries_report_view.xml       | 2 +-
 addons/account/report/account_invoice_report_view.xml       | 2 +-
 addons/account/report/account_report_view.xml               | 6 +++---
 .../account/wizard/account_report_central_journal_view.xml  | 2 +-
 .../account/wizard/account_report_general_journal_view.xml  | 2 +-
 .../account/wizard/account_report_general_ledger_view.xml   | 2 +-
 .../account/wizard/account_report_partner_ledger_view.xml   | 2 +-
 addons/account/wizard/account_report_print_journal_view.xml | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index febc9b6d90d..46807297307 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -264,7 +264,7 @@
                                     <field name="journal_id"/>
                                     <field name="debit"/>
                                     <field name="credit"/>
-                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="amount_currency"/>
                                     <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e3b902a000f..cb99cf7aca8 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -56,7 +56,7 @@
                     <field name="credit"/>
                     <field name="balance"/>
                     <field name="state" invisible="1"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
@@ -140,7 +140,7 @@
                             <label for="amount_currency"/>
                             <div>
                                 <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
                         </group>
                         <group string="Product Information">
@@ -250,7 +250,7 @@
                             <label for="amount_currency"/>
                             <div>
                                 <field name="amount_currency" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
+                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
                             </div>
                             <field invisible="1" name="general_account_id"/>
                         </group>
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 8963ba97376..b43005ef179 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -14,7 +14,7 @@
                 <field name="name" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
-                <field name="currency_id" invisible="1"/>
+                <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                 <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                 <field name="general_account_id" invisible="1"/>
                 <field name="journal_id" invisible="1"/>
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 667c61ab78f..69129c8b3ee 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -13,7 +13,7 @@
                 <field name="nbr" sum="# of Entries "/>
                 <field name="quantity" sum="# of Products Qty " invisible="not context.get('quantity_visible', False)"/>
                 <field name="amount_currency" invisible="not context.get('amount_currency_visible', False)"/>
-                <field name="currency_id" invisible="not context.get('currency_id_visible', False)"/>
+                <field name="currency_id" invisible="not context.get('currency_id_visible', False)" groups="base.group_multi_currency"/>
                 <field name="debit"/>
                 <field name="credit"/>
                 <field name="balance"/>
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index c22d5d55f45..f155345faa6 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -19,7 +19,7 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="state" invisible="1"/>
                 <field name="period_id" invisible="1"/>
-                <field name="currency_id" invisible="1"/>
+                <field name="currency_id" invisible="1" groups="base.group_multi_currency"/>
                 <field name="journal_id" invisible="1"/>
                 <field name="partner_bank_id" invisible="1"/>
                 <field name="date_due" invisible="1"/>
diff --git a/addons/account/report/account_report_view.xml b/addons/account/report/account_report_view.xml
index a947cce4f57..b2c2c010b84 100644
--- a/addons/account/report/account_report_view.xml
+++ b/addons/account/report/account_report_view.xml
@@ -92,7 +92,7 @@
                     <field name="partner_id"/>
                     <field name="amount_untaxed" sum="Untaxed Amount"/>
                     <field name="amount_total" sum="Total Amount"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="date_invoice"/>
                     <field name="date_due"/>
                     <field name="residual"/>
@@ -121,7 +121,7 @@
                     <field name="account_id"/>
                     <field name="quantity"/>
                     <field name="amount_total"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
@@ -168,7 +168,7 @@
                     <field name="user_type"/>
                     <field name="quantity"/>
                     <field name="amount_total"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/account/wizard/account_report_central_journal_view.xml b/addons/account/wizard/account_report_central_journal_view.xml
index 27b611f5838..2819d93471d 100644
--- a/addons/account/wizard/account_report_central_journal_view.xml
+++ b/addons/account/wizard/account_report_central_journal_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="account_common_report_view" />
             <field name="arch" type="xml">
                 <field name="target_move" position="after">
-                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                    <field name="amount_currency"/>
                     <newline/>
                 </field>
             </field>
diff --git a/addons/account/wizard/account_report_general_journal_view.xml b/addons/account/wizard/account_report_general_journal_view.xml
index d68860a8e33..fc57789d0b7 100644
--- a/addons/account/wizard/account_report_general_journal_view.xml
+++ b/addons/account/wizard/account_report_general_journal_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
-               <field name="amount_currency" groups="base.group_multi_currency"/>
+               <field name="amount_currency"/>
                <newline/>
             </xpath>
             </data>
diff --git a/addons/account/wizard/account_report_general_ledger_view.xml b/addons/account/wizard/account_report_general_ledger_view.xml
index e5da60e26b4..b636101ee79 100644
--- a/addons/account/wizard/account_report_general_ledger_view.xml
+++ b/addons/account/wizard/account_report_general_ledger_view.xml
@@ -12,7 +12,7 @@
                 <field name="display_account"/>
                 <field name="sortby"/>
                 <field name="landscape"/>
-                <field name="amount_currency" groups="base.group_multi_currency"/>
+                <field name="amount_currency"/>
                 <newline/>
             </xpath>
             <xpath expr="//field[@name='filter']" position="after">
diff --git a/addons/account/wizard/account_report_partner_ledger_view.xml b/addons/account/wizard/account_report_partner_ledger_view.xml
index 461765164ea..f3dd9a80f09 100644
--- a/addons/account/wizard/account_report_partner_ledger_view.xml
+++ b/addons/account/wizard/account_report_partner_ledger_view.xml
@@ -10,7 +10,7 @@
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="result_selection"/>
-                <field name="amount_currency" groups="base.group_multi_currency"/>
+                <field name="amount_currency"/>
                 <field name="page_split"/>
                 <newline/>
             </xpath>
diff --git a/addons/account/wizard/account_report_print_journal_view.xml b/addons/account/wizard/account_report_print_journal_view.xml
index 227d2b35706..ae8049d579e 100644
--- a/addons/account/wizard/account_report_print_journal_view.xml
+++ b/addons/account/wizard/account_report_print_journal_view.xml
@@ -10,7 +10,7 @@
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="sort_selection"/>
-                <field name="amount_currency" groups="base.group_multi_currency"/>
+                <field name="amount_currency"/>
                 <newline/>
                 <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4" invisible="1"/>
                 <separator string="Periods"  colspan="4"/>

From ee3f4bd2a0b53c127b80437c80cfdcc4129d4bb2 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 14:58:50 +0530
Subject: [PATCH 09/12] [IMP]Applying group multi currency to field currency in
 project kanban view

bzr revid: dhr@tinyerp.com-20120828092850-75v55gcscsgxv0ai
---
 addons/project_timesheet/project_timesheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 9d60e165d1e..c8c3aa67178 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -20,7 +20,7 @@
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_deadline')]" position="before">
                     <div class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
                         <div>Amount to invoice</div>
-                        <div><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></div>
+                        <div ><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]" groups="base.group_multi_currency"/></div>
                         <div>Time to Invoice</div>
                         <div><field name="time_to_invoice"/> <field name="company_uom_id"/></div>
                     </div>

From 159209a3a6db5e6d1600da29c616f6781069f2e8 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Tue, 28 Aug 2012 16:00:51 +0530
Subject: [PATCH 10/12] [IMP]Project form:applying group multi currency to
 currency field

bzr revid: dhr@tinyerp.com-20120828103051-fivtgpsgrbl0vmzv
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6dbcaebd045..6dfa95868f4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -136,7 +136,7 @@
                                     <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
                                     <field name="priority"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                    <field name="currency_id" groups="base.group_multi_company" required="1"/>
+                                    <field name="currency_id" groups="base.group_multi_currency" required="1"/>
                                     <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
                                 </group>
                             </group>

From f45b3bf33c74679001089482d6889a37f9c1b6e1 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 29 Aug 2012 11:40:48 +0530
Subject: [PATCH 11/12] [IMP]Account : changes made for amount_currency field
 and related changes applied

bzr revid: dhr@tinyerp.com-20120829061048-rc6x81wewks3x0e2
---
 addons/account/account_menuitem.xml            |  2 +-
 addons/account/account_view.xml                | 14 +++++++-------
 addons/account/res_config_view.xml             |  6 +++---
 addons/account_coda/account_coda_view.xml      |  2 +-
 .../wizard/account_followup_print_view.xml     |  2 +-
 .../account_payment/account_payment_view.xml   | 18 +++++++++---------
 .../voucher_payment_receipt_view.xml           |  6 +++---
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 9ac6f98661c..480d5ec76a6 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -44,7 +44,7 @@
         <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
 
         <menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
-        <menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10"/>
+        <menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10" groups="base.group_multi_currency"/>
         <menuitem
             parent="account.menu_finance_legal_statement"
             id="final_accounting_reports"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 60c80a7ab92..13813baf3fc 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1066,7 +1066,7 @@
                     <field name="credit" sum="Total credit"/>
                     <field name="account_tax_id"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                    <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
+                    <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}"/>
                     <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
                     <field name="reconcile_partial_id"/>
                     <field name="reconcile_id"/>
@@ -1118,8 +1118,8 @@
 	                                    <field name="tax_amount"/>
 	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
 	                                </group>
-	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency" groups="base.group_multi_currency">
-	                                    <field name="currency_id"/>
+	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
+	                                    <field name="currency_id" groups="base.group_multi_currency"/>
 	                                    <field name="amount_currency"/>
 	                                </group>
 	                                <group string="Reconciliation">
@@ -1167,7 +1167,7 @@
 
                                 <separator colspan="4" string="Optional Information"/>
                                 <field name="currency_id" groups="base.group_multi_currency"/>
-                                <field name="amount_currency" groups="base.group_multi_currency"/>
+                                <field name="amount_currency"/>
                                 <field name="quantity"/>
                                 <field name="move_id" required="False"/>
                                 <newline/>
@@ -1394,8 +1394,8 @@
                                                     <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                                                 </group>
 
-                                                <group string="Currency" groups="base.group_multi_currency">
-                                                    <field name="currency_id"/>
+                                                <group string="Currency">
+                                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                                     <field name="amount_currency"/>
                                                 </group>
 
@@ -1431,7 +1431,7 @@
                                     <field name="debit" sum="Total Debit"/>
                                     <field name="credit" sum="Total Credit"/>
                                     <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="amount_currency"/>
                                     <field name="currency_id" groups="base.group_multi_currency"/>
                                     <field name="tax_code_id"/>
                                     <field name="tax_amount"/>
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 9398d04b3cc..7e51cae0418 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -106,9 +106,9 @@
                     <group>
                         <label for="id" string="Options"/>
                         <div name="account_config">
-                            <div>
-                                <label for="currency_id" groups="base.group_multi_currency"/>
-                                <field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
+                            <div groups="base.group_multi_currency">
+                                <label for="currency_id"/>
+                                <field name="currency_id" class="oe_inline"/>
                             </div>
                             <div>
                                 <label for="decimal_precision"/>
diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml
index 3762669e5a3..23e63b2a4a4 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/account_coda/account_coda_view.xml
@@ -20,7 +20,7 @@
                 <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Group By...">
                     <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
-                    <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
+                    <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}" groups="base.group_multi_currency"/>
                 </group>
             </search>
         </field>
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index fe77dbc053e..8850c260708 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -92,7 +92,7 @@
                             <label string="%%(followup_amount)s: Total Amount Due"/>
                             <label string="%%(date)s: Current Date"/>
                             <label string="%%(company_name)s: User's Company name"/>
-                            <label string="%%(company_currency)s: User's Company Currency"/>
+                            <label string="%%(company_currency)s: User's Company Currency" groups="base.group_multi_currency"/>
                             <label string="%%(heading)s: Move line header"/>
                             <label string="%%(line)s: Ledger Posting lines"/>
                         </group>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 3ad94c1bdbd..2ce98b03250 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -30,7 +30,7 @@
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
                     <field name="amount_to_pay"/>
-                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                    <field name="amount_currency"/>
                     <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="period_id" invisible="1"/>
                 </tree>
@@ -131,10 +131,10 @@
                                         <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
                                         <separator colspan="4" string="Transaction Information"/>
                                         <field name="date"/>
-                                        <label for="amount_currency" groups="base.group_multi_currency"/>
-                                        <div groups="base.group_multi_currency">
+                                        <label for="amount_currency"/>
+                                        <div>
                                             <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
-                                            <field name="currency" nolabel="1" class="oe_inline"/>
+                                            <field name="currency" nolabel="1" class="oe_inline" groups="base.group_multi_currency"/>
                                         </div>
                                         <field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
                                         <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@@ -171,7 +171,7 @@
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
                             <field name="date"/>
-                            <field name="amount_currency" string="Amount" groups="base.group_multi_currency"/>
+                            <field name="amount_currency" string="Amount"/>
                             <field name="currency" groups="base.group_multi_currency"/>
                             <field name="name"/>
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>
@@ -257,10 +257,10 @@
                                 <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)]"/>
                                 <separator colspan="4" string="Transaction Information"/>
                                 <field name="date"/>
-                                <label for="amount_currency" groups="base.group_multi_currency"/>
-                                <div groups="base.group_multi_currency">
+                                <label for="amount_currency"/>
+                                <div>
                                     <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
-                                    <field name="currency" class="oe_inline"/>
+                                    <field name="currency" class="oe_inline" groups="base.group_multi_currency"/>
                                 </div>
                                 <field name="partner_id" on_change="onchange_partner(partner_id, False)"/>
                                 <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
@@ -302,7 +302,7 @@
                     <field name="partner_id"/>
                     <field name="communication"/>
                     <field name="amount" sum="Amount Total"/>
-                    <field name="amount_currency" sum="Currency Amount Total" groups="base.group_multi_currency"/>
+                    <field name="amount_currency" sum="Currency Amount Total"/>
                     <field name="currency" groups="base.group_multi_currency"/>
                     <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                     <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 0f484a5c781..9230704397b 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -104,7 +104,7 @@
                                 <group string="Other Information" col="4">
                                     <field name="currency_id" colspan="4" groups="base.group_multi_currency"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                     <field name="number" colspan="4"/>
                                 </group>
@@ -194,7 +194,7 @@
                                         <separator string="Currency Options" colspan="4"/>
                                         <field name="is_multi_currency" invisible="1"/>
                                         <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" />
+                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                         <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                     </group>
                                     <group col="2">
@@ -366,7 +366,7 @@
                                 <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
                                 <group>

From 19cc47791814b847fe3c2490915250d96cf9a7d4 Mon Sep 17 00:00:00 2001
From: "Dharti Ratani (OpenERP)" <dhr@tinyerp.com>
Date: Wed, 29 Aug 2012 15:38:09 +0530
Subject: [PATCH 12/12] [IMP]Removed currency group from amount field

bzr revid: dhr@tinyerp.com-20120829100809-366o73igiko7wq8z
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 46807297307..1f7bb4ad79c 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -418,7 +418,7 @@
                                     <field name="journal_id" groups="base.group_user"/>
                                     <field name="debit"/>
                                     <field name="credit"/>
-                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="amount_currency"/>
                                     <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>