[ADD] Analytic: added Analytic group on analytic account and put that group on menus related to analytic accounting, removed access rules for anaytic accounting

bzr revid: pap@tinyerp.co.in-20100903124403-o1gbrd38nc047vhx

5 files changed, 32 insertions, 11 deletions

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index da1f95de301..cdbafb8fdf3 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -46,6 +46,7 @@ module named account_voucher.
     "depends" : ["product", "analytic", "process","board"],
     'update_xml': [
         'security/account_security.xml',
+        'security/analytic_security.xml',
         'security/ir.model.access.csv',
         'account_menuitem.xml',
         'account_wizard.xml',
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f720e3c72a8..4300a3c8d4e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1642,7 +1642,7 @@
             <field name="res_model">account.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,search</field>
-            <field name="search_id">view_model_search</field>
+            <field name="search_view_id" ref="view_model_search"/>
         </record>
         <menuitem action="action_model_form" id="menu_action_model_form" sequence="5" parent="account.menu_configuration_misc" groups="base.group_extended"/>
 
diff --git a/addons/account/security/analytic_security.xml b/addons/account/security/analytic_security.xml
new file mode 100644
index 00000000000..b2543f5fa05
--- /dev/null
+++ b/addons/account/security/analytic_security.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp><data>
+
+    <record id="menu_action_analytic_account_tree2" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
+    </record>
+
+    <record id="account_analytic_def_account" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
+    </record>
+
+    <record id="next_id_40" model="ir.ui.menu">
+        <field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
+    </record>
+    
+    <record id="menu_action_analytic_entries_report" 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_analytic_journal_entries" model="ir.ui.menu">
+    	<field eval="[(6,0,[ref('analytic.group_analytic_accounting')])]" name="groups_id"/>
+    </record>
+    
+</data></openerp>
\ No newline at end of file
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 8a9ebf573d5..ff521f7cd1b 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -8,12 +8,8 @@
         <field name="domain_force">[('company_id','=',user.company_id.id)]</field>
     </record>
     
-    <record id="group_analytic_user" model="res.groups">
-        <field name="name">Analytic Accounting / User</field>
-    </record>
-
-    <record id="group_analytic_manager" model="res.groups">
-        <field name="name">Analytic Accounting / Manager</field>
+    <record id="group_analytic_accounting" model="res.groups">
+        <field name="name">Analytic Accounting</field>
     </record>
     
 </data></openerp>
diff --git a/addons/analytic/security/ir.model.access.csv b/addons/analytic/security/ir.model.access.csv
index 6c945ca9ea2..0343f29f43a 100644
--- a/addons/analytic/security/ir.model.access.csv
+++ b/addons/analytic/security/ir.model.access.csv
@@ -1,5 +1 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_account_analytic_account_manager","account.analytic.account manager","model_account_analytic_account","analytic.group_analytic_manager",1,1,1,1
-"access_account_analytic_line_manager","account.analytic.line manager","model_account_analytic_line","analytic.group_analytic_manager",1,1,1,1
-"access_account_analytic_account_user","account.analytic.account user","model_account_analytic_account","analytic.group_analytic_user",1,0,0,0
-"access_account_analytic_line_user","account.analytic.line user","model_account_analytic_line","analytic.group_analytic_user",1,0,0,0
\ No newline at end of file