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] [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"/>