From 50cd1e0de317b2b723879fe0b413fca9f543ee77 Mon Sep 17 00:00:00 2001
From: vra <vra@tinyerp.com>
Date: Thu, 23 Sep 2010 18:08:20 +0530
Subject: [PATCH] [ADD] account,account_voucher: assigned analytic group to
 different related menus and fields.

bzr revid: vra@tinyerp.com-20100923123820-ahg4auj73qodk4wq
---
 addons/account/account_invoice_view.xml      |  4 ++--
 addons/account/account_menuitem.xml          |  8 +++----
 addons/account/account_view.xml              |  4 ++--
 addons/account/security/account_security.xml | 22 +++++++++++++++++---
 addons/account_voucher/voucher_view.xml      |  2 +-
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 53ec4405b9a..e9239ca4f7f 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -62,7 +62,7 @@
                             <field colspan="4" name="name"/>
                             <field colspan="4" name="origin" groups="base.group_extended"/>
                             <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)" groups="base.group_user"/>
-                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="base.group_extended"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                             <newline/>
                             <field name="price_subtotal"/>
                             <field name="company_id" groups="base.group_multi_company" readonly="1"/>
@@ -178,7 +178,7 @@
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
                                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
                                     <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
-                                    <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="base.group_extended"/>
+                                    <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="quantity"/>
                                     <field name="price_unit"/>
                                      <!-- Removed if subtotal is set -->
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 8de42952fb0..ecce5df944f 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -18,11 +18,11 @@
         <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13" groups="base.group_system"/>
-        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="analytic.group_analytic_accounting"/>
-        <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="base.group_extended"/>
+        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration" groups="base.group_system"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration" groups="base.group_system"/>
+        <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting" groups="base.group_extended"/>
-        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30"/>
+        <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="30" groups="base.group_system"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100" groups="base.group_system,group_account_manager"/>
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6d3f63118e1..f1faf7cbbf1 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -528,7 +528,7 @@
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency, {'amount': amount})"/>
                                     <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                 </tree>
                                 <form string="Statement lines">
@@ -537,7 +537,7 @@
                                     <field name="type"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id, type, parent.currency, {'amount': amount})"/>
                                     <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
-                                    <field name="analytic_account_id" groups="base.group_extended" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
+                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                     <field name="ref"/>
                                     <field name="sequence" readonly="0"/>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index adf3571f406..326584d1b6b 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -19,7 +19,7 @@
 
 
     <record id="menu_finance_reporting" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
     </record>
 
     <record id="menu_finance_legal_statement" model="ir.ui.menu">
@@ -35,7 +35,7 @@
     </record>
 
     <record id="menu_finance_charts" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_user'), ref('group_account_manager'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
     </record>
 
     <record id="menu_eaction_account_moves_sale" model="ir.ui.menu">
@@ -87,7 +87,7 @@
     </record>
 
     <record id="final_accounting_reports" model="ir.ui.menu">
-        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system')])]" name="groups_id"/>
+        <field eval="[(6,0,[ref('group_account_manager'),ref('base.group_system'), ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
     </record>
 
     <record id="menu_journals_report" model="ir.ui.menu">
@@ -138,6 +138,22 @@
         <field eval="[(6,0,[ref('group_account_manager')])]" name="groups_id"/>
     </record>
 
+    <record id="menu_finance_generic_reporting" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
+    </record>
+
+    <record id="menu_finance_configuration" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
+    </record>
+
+    <record id="menu_finance_entries" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
+    </record>
+
+    <record id="menu_analytic_accounting" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
+    </record>
+
     <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
         <field ref="model_account_move" name="model_id"/>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 4b09fdc70e9..d007d20acab 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -43,7 +43,7 @@
                                     <field name="name"/>
                                     <field name="amount" sum="Total Amount"/>
                                     <field name="type"/>
-                                    <field name="account_analytic_id" groups="base.group_extended"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
                             <group col="2" colspan="3">