diff --git a/addons/account/account_security.xml b/addons/account/account_security.xml
index 33fda7ff04e..168b4bd904e 100644
--- a/addons/account/account_security.xml
+++ b/addons/account/account_security.xml
@@ -1,930 +1,358 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
-    <data noupdate="1">
-        <record id="group_account_invoice" model="res.groups">
-            <field name="name">Financial Invoice</field>
-        </record>
-        
-        <record id="group_account_user" model="res.groups">
-            <field name="name">Financial User</field>
-        </record>
-        
-        <record id="group_account_admin" model="res.groups">
-            <field name="name">Financial Admin</field>
-        </record>
-        
-        <record id="base.user_admin" model="res.users">
-            <field eval="[(4, ref('base.group_admin')), (4, ref('group_account_invoice')), (4, ref('group_account_user')), (4, ref('group_account_admin'))]" name="groups_id"/>
-        </record>
-        
-        <record id="access_payment_term" model="ir.model.access">
-            <field name="name">Payment Term</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.payment.term')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_payment_term_account_admin" model="ir.model.access">
-            <field name="name">Payment Term</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.payment.term')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--		<record model="ir.model.access" id="access_payment_term_admin">
-			<field name="name">Payment Term</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.payment.term')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_payment_term_line" model="ir.model.access">
-            <field name="name">Payment Term Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.payment.term.line')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_payment_term_line_account_admin" model="ir.model.access">
-            <field name="name">Payment Term Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.payment.term.line')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        <!--
+<data noupdate="1">
+    
+    <record id="group_account_invoice" model="res.groups">
+        <field name="name">Financial Invoice</field>
+    </record>
+    
+    <record id="group_account_user" model="res.groups">
+        <field name="name">Financial User</field>
+    </record>
+    
+    <record id="group_account_admin" model="res.groups">
+        <field name="name">Financial Admin</field>
+    </record>
+    
+    <record model="ir.model.access" id="access_account_account_group_employee">
+        <field name="name">account_account group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_account"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
 
-		<record model="ir.model.access" id="access_payment_term_line_admin">
-			<field name="name">Payment Term Line</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.payment.term.line')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_account_type" model="ir.model.access">
-            <field name="name">Account Type</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.account.type')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_account_type_account_admin" model="ir.model.access">
-            <field name="name">Account Type</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.account.type')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        <!--
+    <record model="ir.model.access" id="access_account_account_type_group_employee">
+        <field name="name">account_account_type group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_account_type"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
 
-		<record model="ir.model.access" id="access_account_type_admin">
-			<field name="name">Account Type</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.account.type')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_account" model="ir.model.access">
-            <field name="name">Account</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.account')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_account_account_admin" model="ir.model.access">
-            <field name="name">Account</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.account')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        <!--
+    <record model="ir.model.access" id="access_account_analytic_account_group_employee">
+        <field name="name">account_analytic_account group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_analytic_account"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
 
-		<record model="ir.model.access" id="access_account_admin">
-			<field name="name">Account</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.account')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_journal_view" model="ir.model.access">
-            <field name="name">Journal View</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.view')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_journal_view_account_admin" model="ir.model.access">
-            <field name="name">Journal View</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.view')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_journal_view_admin">
-			<field name="name">Journal View</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal.view')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_journal_column" model="ir.model.access">
-            <field name="name">Journal Column</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.column')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_journal_column_account_admin" model="ir.model.access">
-            <field name="name">Journal Column</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.column')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_journal_column_admin">
-			<field name="name">Journal Column</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal.column')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_journal" model="ir.model.access">
-            <field name="name">Journal</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_journal_account_admin" model="ir.model.access">
-            <field name="name">Journal</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_journal_admin">
-			<field name="name">Journal</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_fiscalyear" model="ir.model.access">
-            <field name="name">Fiscal Year</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.fiscalyear')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_fiscalyear_account_admin" model="ir.model.access">
-            <field name="name">Fiscal Year</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.fiscalyear')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_fiscalyear_admin">
-			<field name="name">Fiscal Year</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.fiscalyear')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_period" model="ir.model.access">
-            <field name="name">Period</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.period')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_period_account_admin" model="ir.model.access">
-            <field name="name">Period</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.period')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_period_admin">
-			<field name="name">Period</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.period')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_journal_period" model="ir.model.access">
-            <field name="name">Journal Period</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.period')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_journal_period_account_admin" model="ir.model.access">
-            <field name="name">Journal Period</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.journal.period')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_journal_period_admin">
-			<field name="name">Journal Period</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.journal.period')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_move" model="ir.model.access">
-            <field name="name">Entry</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move')]"/>
-            <field eval="False" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_move_account_invoice">
-			<field name="name">Entry</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move')]"/>
-			<field name="group_id" ref="group_account_invoice"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="False"/>
-		</record>-->
-        
-        <record id="access_move_account_user" model="ir.model.access">
-            <field name="name">Entry</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_move_account_admin">
-			<field name="name">Entry</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move')]"/>
-			<field name="group_id" ref="group_account_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_analytic_journal_group_employee">
+        <field name="name">account_analytic_journal group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_analytic_journal"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
 
-		<record model="ir.model.access" id="access_move_admin">
-			<field name="name">Entry</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_move_reconcile" model="ir.model.access">
-            <field name="name">Reconciliation</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move.reconcile')]"/>
-            <field eval="False" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_move_reconcile_account_invoice">
-			<field name="name">Reconciliation</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move.reconcile')]"/>
-			<field name="group_id" ref="group_account_invoice"/>
-			<field name="perm_read" eval="False"/>
-			<field name="perm_write" eval="False"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="False"/>
-		</record>-->
-        
-        <record id="access_move_reconcile_account_user" model="ir.model.access">
-            <field name="name">Reconciliation</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move.reconcile')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_move_reconcile_account_admin">
-			<field name="name">Reconciliation</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move.reconcile')]"/>
-			<field name="group_id" ref="group_account_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_analytic_line_group_employee">
+        <field name="name">account_analytic_line group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_analytic_line"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
 
-		<record model="ir.model.access" id="access_move_reconcile_admin">
-			<field name="name">Reconciliation</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move.reconcile')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_tax_code" model="ir.model.access">
-            <field name="name">Tax Code</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.tax.code')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_tax_code_account_admin" model="ir.model.access">
-            <field name="name">Tax Code</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.tax.code')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_tax_code_admin">
-			<field name="name">Tax Code</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.tax.code')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_tax" model="ir.model.access">
-            <field name="name">Tax</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.tax')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_tax_account_admin" model="ir.model.access">
-            <field name="name">Tax</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.tax')]"/>
-            <field name="group_id" ref="group_account_admin"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_tax_admin">
-			<field name="name">Tax</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.tax')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_budget_post" model="ir.model.access">
-            <field name="name">Budget Item</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.budget.post')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_budget_post_account_user" model="ir.model.access">
-            <field name="name">Budget Item</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.budget.post')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_budget_post_dotation" model="ir.model.access">
-            <field name="name">Budget Item Endowment</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.budget.post.dotation')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_budget_post_dotation_account_user" model="ir.model.access">
-            <field name="name">Budget Item Endowment</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.budget.post.dotation')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_model" model="ir.model.access">
-            <field name="name">Model</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.model')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_model_account_user" model="ir.model.access">
-            <field name="name">Model</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.model')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_model_line" model="ir.model.access">
-            <field name="name">Model Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.model.line')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_model_line_account_user" model="ir.model.access">
-            <field name="name">Model Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.model.line')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_subscription" model="ir.model.access">
-            <field name="name">Subscription</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.subscription')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_subscription_account_user" model="ir.model.access">
-            <field name="name">Subscription</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.subscription')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_subscription_line" model="ir.model.access">
-            <field name="name">Subscription Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.subscription.line')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_subscription_line_account_user" model="ir.model.access">
-            <field name="name">Subscription Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.subscription.line')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_bank_statement" model="ir.model.access">
-            <field name="name">Bank Statement</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement')]"/>
-            <field eval="False" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_bank_statement_account_user" model="ir.model.access">
-            <field name="name">Bank Statement</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_bank_statement_reconcile" model="ir.model.access">
-            <field name="name">Statement Reconcile</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.reconcile')]"/>
-            <field eval="False" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_bank_statement_reconcile_account_user" model="ir.model.access">
-            <field name="name">Statement Reconcile</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.reconcile')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_bank_statement_reconcile_line" model="ir.model.access">
-            <field name="name">Statement Reconcile Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.reconcile.line')]"/>
-            <field eval="False" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_bank_statement_reconcile_line_account_user" model="ir.model.access">
-            <field name="name">Statement Reconcile Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.reconcile.line')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_bank_statement_reconcile_line_account_admin">
-			<field name="name">Statement Reconcile Line</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement.reconcile.line')]"/>
-			<field name="group_id" ref="group_account_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_bank_statement_group_account_manager">
+        <field name="name">account_bank_statement group_account_manager</field>
+        <field name="model_id" model="ir.model" ref="model_account_bank_statement"/>
+        <field name="group_id" ref="group_account_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
 
-		<record model="ir.model.access" id="access_bank_statement_reconcile_line_admin">
-			<field name="name">Statement Reconcile Line</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement.reconcile.line')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_bank_statement_line" model="ir.model.access">
-            <field name="name">Bank Statement Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.line')]"/>
-            <field eval="False" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_bank_statement_line_account_user" model="ir.model.access">
-            <field name="name">Bank Statement Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.bank.statement.line')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_bank_statement_line_account_admin">
-			<field name="name">Bank Statement Line</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement.line')]"/>
-			<field name="group_id" ref="group_account_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_bank_statement_line_group_account_manager">
+        <field name="name">account_bank_statement_line group_account_manager</field>
+        <field name="model_id" model="ir.model" ref="model_account_bank_statement_line"/>
+        <field name="group_id" ref="group_account_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
 
-		<record model="ir.model.access" id="access_bank_statement_line_admin">
-			<field name="name">Bank Statement Line</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.bank.statement.line')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_move_line" model="ir.model.access">
-            <field name="name">Entry Lines</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move.line')]"/>
-            <field eval="False" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_move_line_account_user" model="ir.model.access">
-            <field name="name">Entry Lines</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.move.line')]"/>
-            <field name="group_id" ref="group_account_user"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_move_line_account_admin">
-			<field name="name">Entry Lines</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move.line')]"/>
-			<field name="group_id" ref="group_account_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_bank_statement_reconcile_group_account_manager">
+        <field name="name">account_bank_statement_reconcile group_account_manager</field>
+        <field name="model_id" model="ir.model" ref="model_account_bank_statement_reconcile"/>
+        <field name="group_id" ref="group_account_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
 
-		<record model="ir.model.access" id="access_move_line_account_admin">
-			<field name="name">Entry Lines</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move.line')]"/>
-			<field name="group_id" ref="group_account_invoice"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="False"/>
-		</record>
+    <record model="ir.model.access" id="access_account_bank_statement_reconcile_line_group_account_manager">
+        <field name="name">account_bank_statement_reconcile_line group_account_manager</field>
+        <field name="model_id" model="ir.model" ref="model_account_bank_statement_reconcile_line"/>
+        <field name="group_id" ref="group_account_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
 
-		<record model="ir.model.access" id="access_move_line_admin">
-			<field name="name">Entry Lines</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.move.line')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_invoice" model="ir.model.access">
-            <field name="name">Invoice</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice')]"/>
-            <field eval="False" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_invoice_account_invoice" model="ir.model.access">
-            <field name="name">Invoice</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice')]"/>
-            <field name="group_id" ref="group_account_invoice"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_invoice_account_user">
-			<field name="name">Invoice</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice')]"/>
-			<field name="group_id" ref="group_account_user"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_fiscalyear_group_employee">
+        <field name="name">account_fiscalyear group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_fiscalyear"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
 
-		<record model="ir.model.access" id="access_invoice_account_admin">
-			<field name="name">Invoice</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice')]"/>
-			<field name="group_id" ref="group_account_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_invoice_group_sales">
+        <field name="name">account_invoice group_sales</field>
+        <field name="model_id" model="ir.model" ref="model_account_invoice"/>
+        <field name="group_id" ref="group_sales"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
 
-		<record model="ir.model.access" id="access_invoice_admin">
-			<field name="name">Invoice</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_invoice_line" model="ir.model.access">
-            <field name="name">Invoice Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice.line')]"/>
-            <field eval="False" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_invoice_line_account_invoice" model="ir.model.access">
-            <field name="name">Invoice Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice.line')]"/>
-            <field name="group_id" ref="group_account_invoice"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_invoice_line_account_user">
-			<field name="name">Invoice Line</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice.line')]"/>
-			<field name="group_id" ref="group_account_user"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_invoice_line_group_sales">
+        <field name="name">account_invoice_line group_sales</field>
+        <field name="model_id" model="ir.model" ref="model_account_invoice_line"/>
+        <field name="group_id" ref="group_sales"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
 
-		<record model="ir.model.access" id="access_invoice_line_account_admin">
-			<field name="name">Invoice Line</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice.line')]"/>
-			<field name="group_id" ref="group_account_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_invoice_tax_group_sales">
+        <field name="name">account_invoice_tax group_sales</field>
+        <field name="model_id" model="ir.model" ref="model_account_invoice_tax"/>
+        <field name="group_id" ref="group_sales"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
 
-		<record model="ir.model.access" id="access_invoice_line_admin">
-			<field name="name">Invoice Line</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice.line')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-        <record id="access_invoice_tax" model="ir.model.access">
-            <field name="name">Invoice Tax</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice.tax')]"/>
-            <field eval="False" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_invoice_tax_account_invoice" model="ir.model.access">
-            <field name="name">Invoice Tax</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'account.invoice.tax')]"/>
-            <field name="group_id" ref="group_account_invoice"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!--<record model="ir.model.access" id="access_invoice_tax_account_user">
-			<field name="name">Invoice Tax</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice.tax')]"/>
-			<field name="group_id" ref="group_account_user"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_invoice_group_project_member">
+        <field name="name">account_invoice group_project_member</field>
+        <field name="model_id" model="ir.model" ref="model_account_invoice"/>
+        <field name="group_id" ref="group_project_member"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
 
-		<record model="ir.model.access" id="access_invoice_tax_account_admin">
-			<field name="name">Invoice Tax</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice.tax')]"/>
-			<field name="group_id" ref="group_account_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>
+    <record model="ir.model.access" id="access_account_invoice_line_group_project_member">
+        <field name="name">account_invoice_line group_project_member</field>
+        <field name="model_id" model="ir.model" ref="model_account_invoice_line"/>
+        <field name="group_id" ref="group_project_member"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
 
-		<record model="ir.model.access" id="access_invoice_tax_admin">
-			<field name="name">Invoice Tax</field>
-			<field name="model_id" model="ir.model"
-				search="[('model', '=', 'account.invoice.tax')]"/>
-			<field name="group_id" ref="base.group_admin"/>
-			<field name="perm_read" eval="True"/>
-			<field name="perm_write" eval="True"/>
-			<field name="perm_create" eval="True"/>
-			<field name="perm_unlink" eval="True"/>
-		</record>-->
-        
-    </data>
+    <record model="ir.model.access" id="access_account_invoice_tax_group_project_member">
+        <field name="name">account_invoice_tax group_project_member</field>
+        <field name="model_id" model="ir.model" ref="model_account_invoice_tax"/>
+        <field name="group_id" ref="group_project_member"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_journal_group_employee">
+        <field name="name">account_journal group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_journal"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_journal_column_group_employee">
+        <field name="name">account_journal_column group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_journal_column"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_journal_period_group_employee">
+        <field name="name">account_journal_period group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_journal_period"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_journal_view_group_employee">
+        <field name="name">account_journal_view group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_journal_view"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_model_group_erp_manager">
+        <field name="name">account_model group_erp_manager</field>
+        <field name="model_id" model="ir.model" ref="model_account_model"/>
+        <field name="group_id" ref="group_erp_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_model_line_group_erp_manager">
+        <field name="name">account_model_line group_erp_manager</field>
+        <field name="model_id" model="ir.model" ref="model_account_model_line"/>
+        <field name="group_id" ref="group_erp_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_move_group_sales">
+        <field name="name">account_move group_sales</field>
+        <field name="model_id" model="ir.model" ref="model_account_move"/>
+        <field name="group_id" ref="group_sales"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_move_line_group_sales">
+        <field name="name">account_move_line group_sales</field>
+        <field name="model_id" model="ir.model" ref="model_account_move_line"/>
+        <field name="group_id" ref="group_sales"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_move_reconcile_group_sales">
+        <field name="name">account_move_reconcile group_sales</field>
+        <field name="model_id" model="ir.model" ref="model_account_move_reconcile"/>
+        <field name="group_id" ref="group_sales"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_payment_term_group_account_payment">
+        <field name="name">account_payment_term group_account_payment</field>
+        <field name="model_id" model="ir.model" ref="model_account_payment_term"/>
+        <field name="group_id" ref="group_account_payment"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_payment_term_line_group_account_payment">
+        <field name="name">account_payment_term_line group_account_payment</field>
+        <field name="model_id" model="ir.model" ref="model_account_payment_term_line"/>
+        <field name="group_id" ref="group_account_payment"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_payment_term_group_employee">
+        <field name="name">account_payment_term group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_payment_term"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_payment_term_line_group_employee">
+        <field name="name">account_payment_term_line group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_payment_term_line"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_period_group_employee">
+        <field name="name">account_period group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_period"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_subscription_group_erp_manager">
+        <field name="name">account_subscription group_erp_manager</field>
+        <field name="model_id" model="ir.model" ref="model_account_subscription"/>
+        <field name="group_id" ref="group_erp_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_subscription_line_group_erp_manager">
+        <field name="name">account_subscription_line group_erp_manager</field>
+        <field name="model_id" model="ir.model" ref="model_account_subscription_line"/>
+        <field name="group_id" ref="group_erp_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_tax_group_employee">
+        <field name="name">account_tax group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_tax"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_account_tax_code_group_employee">
+        <field name="name">account_tax_code group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_account_tax_code"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+    
+</data>
 </terp>
\ No newline at end of file
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1b50734c4b6..d1ce5bd3fbb 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -58,9 +58,9 @@
         </record>
         <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration"/><menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
 
-        <!--
-	Period
-	-->
+    <!--
+    Period
+    -->
 
         <record id="view_account_period_form" model="ir.ui.view">
             <field name="name">account.period.form</field>
@@ -101,7 +101,7 @@
         <menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23"/>
 
 
-        <!--
+    <!--
 	Accounts
 	-->
 
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 6c18f8f9b61..9553ff26538 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
         <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="3"/>
-        <menuitem groups="base.group_admin" id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/>
+        <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="1"/>
         <menuitem id="menu_account_end_year_treatments" name="End of Year Treatments" parent="account.menu_finance" sequence="20"/>
         <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="8"/>
         <menuitem id="menu_finance_entries" name="Entries" parent="account.menu_finance" sequence="2"/>
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index 9f51843efd2..0ec0e628018 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -304,7 +304,7 @@
             <field name="sequence_id" ref="sequence_journal"/>
             <field model="account.account" name="default_credit_account_id" search="[('type','=','receivable')]"/>
             <field model="account.account" name="default_debit_account_id" search="[('type','=','receivable')]"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="expenses_journal" model="account.journal">
             <field name="name">Expenses Journal</field>
@@ -314,7 +314,7 @@
             <field name="sequence_id" ref="sequence_journal"/>
             <field model="account.account" name="default_debit_account_id" search="[('type','=','payable')]"/>
             <field model="account.account" name="default_credit_account_id" search="[('type','=','payable')]"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
         </record>
         
         <record id="bank_journal" model="account.journal">
@@ -325,7 +325,7 @@
             <field name="sequence_id" ref="sequence_journal"/>
             <field model="account.account" name="default_debit_account_id" search="[('type','=','cash')]"/>
             <field model="account.account" name="default_credit_account_id" search="[('type','=','cash')]"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
         </record>
         
         <record forcecreate="1" id="stock_journal" model="account.journal">
@@ -334,7 +334,7 @@
             <field name="type">general</field>
             <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_journal"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
         </record>
         
     </data>
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index b8f940f8ad9..02eff787ca9 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -8,12 +8,10 @@
             <field name="wiz_name">base_setup.base_setup</field>
         </record>
         
-        <record id="base.user_admin" model="res.users">
+        <record id="base.user_root" model="res.users">
             <field name="action_id" ref="action_wizard_setup"/>
             <field name="menu_id" ref="action_wizard_setup"/>
         </record>
         
-        
-        
     </data>
 </terp>
\ No newline at end of file
diff --git a/addons/board/board_security.xml b/addons/board/board_security.xml
new file mode 100644
index 00000000000..91c71754caa
--- /dev/null
+++ b/addons/board/board_security.xml
@@ -0,0 +1,79 @@
+<?xml version='1.0'?>
+<terp>
+<data>
+    <!--
+     Groups
+    -->
+    <record model="res.groups" id="group_board">
+        <field name="name">Board User</field>
+    </record>
+    
+    <record model="res.groups" id="group_board_manager">
+        <field name="name">Board Manager</field>
+    </record>
+    
+    <!--
+     Access
+    -->
+    <record model="ir.model.access" id="access_board_board_group_board">
+        <field name="name">board_board group_board</field>
+        <field name="model_id" model="ir.model" ref="model_board_board"/>
+        <field name="group_id" ref="group_board"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_board_board_group_board_manager">
+        <field name="name">board_board group_board_manager</field>
+        <field name="model_id" model="ir.model" ref="model_board_board"/>
+        <field name="group_id" ref="group_board_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_board_note_group_board">
+        <field name="name">board_note group_board</field>
+        <field name="model_id" model="ir.model" ref="model_board_note"/>
+        <field name="group_id" ref="group_board"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_board_note_group_board_manager">
+        <field name="name">board_note group_board_manager</field>
+        <field name="model_id" model="ir.model" ref="model_board_note"/>
+        <field name="group_id" ref="group_board_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_board_note_type_group_board">
+        <field name="name">board_note_type group_board</field>
+        <field name="model_id" model="ir.model" ref="model_board_note_type"/>
+        <field name="group_id" ref="group_board"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_board_note_type_group_board_manager">
+        <field name="name">board_note_type group_board_manager</field>
+        <field name="model_id" model="ir.model" ref="model_board_note_type"/>
+        <field name="group_id" ref="group_board_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+</data>
+</terp>
diff --git a/addons/board_account/board_account_demo.xml b/addons/board_account/board_account_demo.xml
index 7206fefc1d5..931c55f4c12 100644
--- a/addons/board_account/board_account_demo.xml
+++ b/addons/board_account/board_account_demo.xml
@@ -8,7 +8,7 @@
 		-->
         <record id="sc_account_dash" model="ir.ui.view_sc">
             <field name="name">Accounting dashboard</field>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">0</field>
             <field name="res_id" ref="menu_board_account"/>
diff --git a/addons/board_manufacturing/board_manufacturing_demo.xml b/addons/board_manufacturing/board_manufacturing_demo.xml
index f5a026adf1e..20d09124782 100644
--- a/addons/board_manufacturing/board_manufacturing_demo.xml
+++ b/addons/board_manufacturing/board_manufacturing_demo.xml
@@ -3,12 +3,12 @@
     <data noupdate="1">
         <record id="sc_manufacturing_dash" model="ir.ui.view_sc">
             <field name="name">Production dashboard</field>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">4</field>
             <field name="res_id" ref="menu_board_manufacturing"/>
         </record>
-        <record id="base.user_admin" model="res.users">
+        <record id="base.user_root" model="res.users">
             <field name="action_id" ref="open_board_manufacturing"/>
         </record>
         <record id="base.user_demo" model="res.users">
diff --git a/addons/board_project/board_project_demo.xml b/addons/board_project/board_project_demo.xml
index 01268fa329d..3a2ad768105 100644
--- a/addons/board_project/board_project_demo.xml
+++ b/addons/board_project/board_project_demo.xml
@@ -14,13 +14,13 @@
             <field name="sequence">3</field>
             <field name="res_id" ref="menu_board_project"/>
         </record>
-        <record id="base.user_admin" model="res.users">
+        <record id="base.user_root" model="res.users">
             <field name="action_id" ref="open_board_project"/>
         </record>
         
         <record id="note_project" model="board.note">
             <field name="name">Don't forget the new development policies.</field>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="type">Project</field>
         </record>
         
diff --git a/addons/board_sale/board_sale_demo.xml b/addons/board_sale/board_sale_demo.xml
index ad66d9cf758..3499b2fabb8 100644
--- a/addons/board_sale/board_sale_demo.xml
+++ b/addons/board_sale/board_sale_demo.xml
@@ -8,7 +8,7 @@
 		-->
         <record id="sc_sale_dash" model="ir.ui.view_sc">
             <field name="name">Sales dashboard</field>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="resource">ir.ui.menu</field>
             <field name="sequence">1</field>
             <field name="res_id" ref="menu_board_sales_manager"/>
diff --git a/addons/crm/crm_security.xml b/addons/crm/crm_security.xml
index 356e77e8318..a1a3552f1f5 100644
--- a/addons/crm/crm_security.xml
+++ b/addons/crm/crm_security.xml
@@ -10,10 +10,6 @@
             <field name="name">Customer Executive</field>
         </record>
         
-        <record id="base.user_admin" model="res.users">
-            <field eval="[ (4 ,ref('base.group_admin')), (4, ref('group_crm_manager')), (4, ref('group_crm_member')) ]" name="groups_id"/>
-        </record>
-        
         <!-- CRM Case security -->
         <record id="access_crm_case" model="ir.model.access">
             <field name="name">CRM Case</field>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 2704bc71e4e..e355719ef11 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -2,7 +2,7 @@
 <terp>
     <data>
         <menuitem icon="terp-crm" id="menu_crm" name="CRM &amp; SRM"/>
-        <menuitem groups="base.group_admin" id="menu_crm_configuration" name="Configuration" parent="crm.menu_crm"/>
+        <menuitem id="menu_crm_configuration" name="Configuration" parent="crm.menu_crm"/>
         
         <record id="res_partner_events-wopartner-view" model="ir.ui.view">
             <field name="name">res.partner.events.form</field>
@@ -62,7 +62,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
-        <menuitem id="next_id_51" name="Cases" parent="crm.menu_crm_configuration"/><menuitem action="crm_case_section_act" groups="base.group_admin" id="menu_crm_case_section_act" parent="next_id_51"/>
+        <menuitem id="next_id_51" name="Cases" parent="crm.menu_crm_configuration"/><menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="next_id_51"/>
         
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by section</field>
@@ -71,7 +71,7 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="crm_case_section_view_tree"/>
         </record>
-        <menuitem id="next_id_52" name="Cases" parent="crm.menu_crm"/><menuitem action="crm_case_section_act_tree" groups="base.group_admin" id="menu_crm_case_section_act_tree" parent="next_id_52"/>
+        <menuitem id="next_id_52" name="Cases" parent="crm.menu_crm"/><menuitem action="crm_case_section_act_tree" id="menu_crm_case_section_act_tree" parent="next_id_52"/>
         
         <!-- Case Categories -->
         <record id="crm_case_categ-view" model="ir.ui.view">
@@ -105,7 +105,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
         </record>
-        <menuitem action="crm_case_categ-act" groups="base.group_admin" id="menu_crm_case_categ-act" parent="crm.next_id_51"/>
+        <menuitem action="crm_case_categ-act" id="menu_crm_case_categ-act" parent="crm.next_id_51"/>
         
         <!-- Case rules -->
         <record id="crm_case_rule-view" model="ir.ui.view">
@@ -196,7 +196,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_rule_tree-view"/>
         </record>
-        <menuitem action="crm_case_rule-act" groups="base.group_admin" id="menu_crm_case_rule-act" parent="crm.next_id_51"/>
+        <menuitem action="crm_case_rule-act" id="menu_crm_case_rule-act" parent="crm.next_id_51"/>
         
         
         <!-- Cases -->
@@ -435,8 +435,8 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="crm_case_history_tree-view"/>
         </record>
-        <menuitem groups="base.group_admin" id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/>
-        <menuitem action="crm_case_history-act" groups="base.group_admin" id="menu_crm_case_history-act" parent="crm.menu_crm_case_history-act_main"/>
+        <menuitem id="menu_crm_case_history-act_main" name="Cases Histories" parent="crm.next_id_52"/>
+        <menuitem action="crm_case_history-act" id="menu_crm_case_history-act" parent="crm.menu_crm_case_history-act_main"/>
         <record id="crm_case_history_my-act" model="ir.actions.act_window">
             <field name="name">My Histories</field>
             <field name="res_model">crm.case.history</field>
@@ -444,7 +444,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid)]</field>
         </record>
-        <menuitem action="crm_case_history_my-act" groups="base.group_admin" id="menu_crm_case_history_my-act" parent="crm.menu_crm_case_history-act_main"/>
+        <menuitem action="crm_case_history_my-act" id="menu_crm_case_history_my-act" parent="crm.menu_crm_case_history-act_main"/>
         
         <record id="crm_segmentation_line_tree-view" model="ir.ui.view">
             <field name="name">crm.segmentation.line.tree</field>
diff --git a/addons/hr/hr_department_demo.xml b/addons/hr/hr_department_demo.xml
index f4b713b8e82..6e5a38d4a7f 100644
--- a/addons/hr/hr_department_demo.xml
+++ b/addons/hr/hr_department_demo.xml
@@ -5,54 +5,54 @@
         <record id="dep_management" model="hr.department">
             <field name="name">Management</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin"/>
+            <field name="manager_id" ref="base.user_root"/>
         </record>
         <record id="dep_administration" model="hr.department">
             <field name="name">Administration</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin"/>
+            <field name="manager_id" ref="base.user_root"/>
         </record>
         
         <record id="dep_technical" model="hr.department">
             <field name="name">Technical department</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin"/>
+            <field name="manager_id" ref="base.user_root"/>
         </record>
         
         <record id="dep_it" model="hr.department">
             <field name="name">IT</field>
             <field name="parent_id" ref="dep_technical"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin"/>
+            <field name="manager_id" ref="base.user_root"/>
         </record>
         
         <record id="dep_marketing" model="hr.department">
             <field name="name">Marketing</field>
             <field name="parent_id" ref="dep_management"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin"/>
+            <field name="manager_id" ref="base.user_root"/>
         </record>
         
         <record id="dep_sales" model="hr.department">
             <field name="name">Sales</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin"/>
+            <field name="manager_id" ref="base.user_root"/>
             <field name="parent_id" ref="dep_management"/>
         </record>
         
         <record id="dep_sales_europe" model="hr.department">
             <field name="name">Sales Europe</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin"/>
+            <field name="manager_id" ref="base.user_root"/>
             <field name="parent_id" ref="dep_sales"/>
         </record>
         
         <record id="dep_sales_america" model="hr.department">
             <field name="name">Sales America</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="manager_id" ref="base.user_admin"/>
+            <field name="manager_id" ref="base.user_root"/>
             <field name="parent_id" ref="dep_sales"/>
         </record>
         
diff --git a/addons/hr/hr_security.xml b/addons/hr/hr_security.xml
index 3f630c51eca..553d3341f58 100644
--- a/addons/hr/hr_security.xml
+++ b/addons/hr/hr_security.xml
@@ -8,192 +8,229 @@
         </record>
         
         <record id="group_hr_employee" model="res.groups">
-            <field name="name">Employee</field>
+            <field name="name">HR Employee</field>
             <field eval="[(4, ref('hr.menu_open_view_employee_tree')), (4, ref('hr.menu_open_view_employee_list')),(4, ref('hr.menu_open_view_employee_new')), (4, ref('hr.menu_view_employee_category_form'))]" name="menu_access"/>
         </record>
-        
-        <record id="base.user_admin" model="res.users">
-            <field eval="[(4, ref('group_hr_employee')),(4, ref('group_hr_manager'))]" name="groups_id"/>
-        </record>
-        
-        <!-- Department security -->
-        <record id="access_hr_department" model="ir.model.access">
-            <field name="name">HR Department</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.department')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_hr_department_manager" model="ir.model.access">
-            <field name="name">HR Department</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.department')]"/>
-            <field name="group_id" ref="group_hr_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Timesheet Group security -->
-        <record id="access_hr_timesheet" model="ir.model.access">
-            <field name="name">HR Timesheet Group</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.timesheet.group')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_hr_timesheet_manager" model="ir.model.access">
-            <field name="name">HR Timesheet Group</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.timesheet.group')]"/>
-            <field name="group_id" ref="group_hr_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Employee Category security -->
-        <record id="access_hr_employee_category" model="ir.model.access">
-            <field name="name">HR Employee Category</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.employee.category')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_hr_employee_category_manager" model="ir.model.access">
-            <field name="name">HR Employee Category</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.employee.category')]"/>
-            <field name="group_id" ref="group_hr_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Employee security -->
-        <record id="access_hr_employee" model="ir.model.access">
-            <field name="name">HR Employee</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.employee')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_hr_employee_employee" model="ir.model.access">
-            <field name="name">HR Employee</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.employee')]"/>
-            <field name="group_id" ref="group_hr_employee"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Employee security -->
-        <record id="access_hr_timesheet" model="ir.model.access">
-            <field name="name">HR Employee Timesheet</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.timesheet')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_hr_timesheet_employee" model="ir.model.access">
-            <field name="name">HR Employee Timesheet</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.timesheet')]"/>
-            <field name="group_id" ref="group_hr_employee"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Action Reason security -->
-        <record id="access_hr_action_reason" model="ir.model.access">
-            <field name="name">HR Timesheet Action Reason</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.action.reason')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_hr_action_reason_manager" model="ir.model.access">
-            <field name="name">HR Timesheet Action Reason</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.action.reason')]"/>
-            <field name="group_id" ref="group_hr_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Timesheet Attendance security -->
-        <record id="access_hr_attendance" model="ir.model.access">
-            <field name="name">HR Attendance</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.attendance')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_hr_attendance_employee" model="ir.model.access">
-            <field name="name">HR Attendance</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.attendance')]"/>
-            <field name="group_id" ref="group_hr_employee"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Holiday Status security -->
-        <record id="access_hr_holiday_status" model="ir.model.access">
-            <field name="name">HR Holiday Status</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.holidays.status')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_hr_holiday_status_manager" model="ir.model.access">
-            <field name="name">HR Holiday Status</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.holidays.status')]"/>
-            <field name="group_id" ref="group_hr_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Holidays security -->
-        <record id="access_hr_holiday" model="ir.model.access">
-            <field name="name">HR Holidays</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.holidays')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_hr_holiday_employee" model="ir.model.access">
-            <field name="name">HR Holidays</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'hr.holidays')]"/>
-            <field name="group_id" ref="group_hr_employee"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
+
+    <record model="ir.model.access" id="access_hr_action_reason_group_employee">
+        <field name="name">hr_action_reason group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_action_reason"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_action_reason_group_hr_manager">
+        <field name="name">hr_action_reason group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_action_reason"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_attendance_group_employee">
+        <field name="name">hr_attendance group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_attendance"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_department_group_hr_manager">
+        <field name="name">hr_department group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_department"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_employee_group_hr_manager">
+        <field name="name">hr_employee group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_employee"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_employee_group_employee">
+        <field name="name">hr_employee group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_employee"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_employee_category_group_hr_manager">
+        <field name="name">hr_employee_category group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_employee_category"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_employee_category_group_employee">
+        <field name="name">hr_employee_category group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_employee_category"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_expense_expense_group_hr_manager">
+        <field name="name">hr_expense_expense group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_expense_expense"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_expense_expense_group_employee">
+        <field name="name">hr_expense_expense group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_expense_expense"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_holidays_group_hr_manager">
+        <field name="name">hr_holidays group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_holidays"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_holidays_group_employee">
+        <field name="name">hr_holidays group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_holidays"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_holidays_status_group_hr_manager">
+        <field name="name">hr_holidays_status group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_holidays_status"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_holidays_status_group_employee">
+        <field name="name">hr_holidays_status group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_holidays_status"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_timesheet_group_employee">
+        <field name="name">hr_timesheet group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_timesheet"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_timesheet_group_hr_manager">
+        <field name="name">hr_timesheet group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_timesheet"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_timesheet_group_group_employee">
+        <field name="name">hr_timesheet_group group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_timesheet_group"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_timesheet_group_group_hr_manager">
+        <field name="name">hr_timesheet_group group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_timesheet_group"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_timesheet_invoice_factor_group_employee">
+        <field name="name">hr_timesheet_invoice_factor group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_timesheet_invoice_factor"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_timesheet_invoice_factor_group_hr_manager">
+        <field name="name">hr_timesheet_invoice_factor group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_timesheet_invoice_factor"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_timesheet_sheet_sheet_group_hr_manager">
+        <field name="name">hr_timesheet_sheet_sheet group_hr_manager</field>
+        <field name="model_id" model="ir.model" ref="model_hr_timesheet_sheet_sheet"/>
+        <field name="group_id" ref="group_hr_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="1"/>
+    </record>
+
+    <record model="ir.model.access" id="access_hr_timesheet_sheet_sheet_group_employee">
+        <field name="name">hr_timesheet_sheet_sheet group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_hr_timesheet_sheet_sheet"/>
+        <field name="group_id" ref="group_employee"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
     </data>
 </terp>
\ No newline at end of file
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index bb649734bb0..8f3fe74bf46 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -3,7 +3,7 @@
     <data>
         <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
         <menuitem id="menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="40"/>
-        <menuitem groups="base.group_admin" id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root"/>
+        <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root"/>
         
         <!--
 		==========
@@ -67,7 +67,7 @@
             <field name="view_id" ref="view_employee_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="open_view_employee_tree" groups="base.group_admin" id="menu_open_view_employee_tree" parent="hr.menu_hr_root"/>
+        <menuitem action="open_view_employee_tree" id="menu_open_view_employee_tree" parent="hr.menu_hr_root"/>
         
         <record id="view_employee_list" model="ir.ui.view">
             <field name="name">hr.employee.tree</field>
@@ -90,7 +90,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_employee_list"/>
         </record>
-        <menuitem action="open_view_employee_list" groups="base.group_admin" id="menu_open_view_employee_list" parent="hr.menu_open_view_employee_tree"/>
+        <menuitem action="open_view_employee_list" id="menu_open_view_employee_list" parent="hr.menu_open_view_employee_tree"/>
         
         <record id="open_view_employee_new" model="ir.actions.act_window">
             <field name="name">New Employee</field>
@@ -98,7 +98,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        <menuitem action="open_view_employee_new" groups="base.group_admin" id="menu_open_view_employee_new" parent="hr.menu_open_view_employee_tree"/>
+        <menuitem action="open_view_employee_new" id="menu_open_view_employee_new" parent="hr.menu_open_view_employee_tree"/>
         
         
         <!--
@@ -163,7 +163,7 @@
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
         </record>
-        <menuitem action="edit_workgroup" groups="base.group_admin" id="menu_edit_workgroup" parent="hr.menu_hr_configuration"/>
+        <menuitem action="edit_workgroup" id="menu_edit_workgroup" parent="hr.menu_hr_configuration"/>
         
         <record id="view_timesheet_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.tree</field>
@@ -260,7 +260,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="open_view_categ_form" groups="base.group_admin" id="menu_view_employee_category_form" parent="hr.menu_hr_configuration"/>
+        <menuitem action="open_view_categ_form" id="menu_view_employee_category_form" parent="hr.menu_hr_configuration"/>
         
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -269,7 +269,7 @@
             <field name="view_id" ref="view_employee_category_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="open_view_categ_tree" groups="base.group_admin" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
+        <menuitem action="open_view_categ_tree" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
         
         <record id="view_attendance_who" model="ir.ui.view">
             <field name="name">hr.attendance.tree</field>
@@ -292,7 +292,7 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"/>
-        <menuitem action="open_view_attendance" groups="base.group_admin" id="menu_open_view_attendance" parent="hr.menu_hr_attendance"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="hr.menu_hr_attendance"/>
         
         
         <!-- Holidays -->
@@ -345,7 +345,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_holiday"/>
         </record>
-        <menuitem action="open_ask_holidays" groups="base.group_admin" id="menu_open_ask_holidays" parent="hr.menu_hr_attendance"/>
+        <menuitem action="open_ask_holidays" id="menu_open_ask_holidays" parent="hr.menu_hr_attendance"/>
         
         <!-- Some Configuration (holiday type, attendance reasons) -->
         
@@ -377,7 +377,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_holiday_status"/>
         </record>
-        <menuitem action="open_view_holiday_status" groups="base.group_admin" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration"/>
+        <menuitem action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration"/>
         
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -409,7 +409,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
-        <menuitem action="open_view_attendance_reason" groups="base.group_admin" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration"/>
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration"/>
         
     </data>
 </terp>
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index f5f098ceba7..31060ddca4a 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -44,7 +44,7 @@
             <field model="account.analytic.account" name="account_id" search="[('name','=', 'Administratif')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
@@ -56,7 +56,7 @@
             <field model="account.analytic.account" name="account_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
@@ -68,7 +68,7 @@
             <field model="account.analytic.account" name="account_id" search="[('name','=', 'Seagate P2')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
@@ -80,7 +80,7 @@
             <field model="account.analytic.account" name="account_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
@@ -92,7 +92,7 @@
             <field model="account.analytic.account" name="account_id" search="[('name','=', 'Seagate P1')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
@@ -104,7 +104,7 @@
             <field model="account.analytic.account" name="account_id" search="[('name','=', 'Sednacom')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
@@ -116,7 +116,7 @@
             <field name="account_id" ref="base.res_partner_c2c"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
@@ -128,7 +128,7 @@
             <field model="account.analytic.account" name="account_id" search="[('name','=', 'Agrolait')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
@@ -140,7 +140,7 @@
             <field model="account.analytic.account" name="account_id" search="[('name','=', 'Agrolait')]"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
@@ -153,7 +153,7 @@
             <field name="account_id" ref="account.analytic_agrolait"/>
             <field name="product_id" ref="hr_timesheet.product_consultant"/>
             <field name="product_uom_id" ref="hr_timesheet.uom_hour"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="journal_id" ref="analytic_journal"/>
             <field name="general_account_id" ref="account.a_recv"/>
         </record>
diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml
index 3b39fd49b32..f3c197a5ef2 100644
--- a/addons/hr_timesheet/hr_timesheet_wizard.xml
+++ b/addons/hr_timesheet/hr_timesheet_wizard.xml
@@ -2,7 +2,7 @@
 <terp>
     <data>
         <wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
-        <menuitem action="si_so" groups="base.group_admin" id="menu_si_so" parent="hr.menu_hr_attendance" type="wizard"/>
+        <menuitem action="si_so"  id="menu_si_so" parent="hr.menu_hr_attendance" type="wizard"/>
 
     </data>
 </terp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index c9f42691f3c..69dd34fdfb9 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <record id="sheet0" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 0</field>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-01', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_from"/>
             <field eval="time.strftime('%Y-%m-15', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_current"/>
             <field eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_to"/>
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index c315f519a81..8cca7f01d7d 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -34,7 +34,7 @@
         <record forcecreate="True" id="ir_cron_scheduler_action" model="ir.cron">
             <field name="name">Run mrp scheduler</field>
             <field eval="False" name="active"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="interval_number">1</field>
             <field name="interval_type">days</field>
             <field name="numbercall">-1</field>
diff --git a/addons/mrp/mrp_security.xml b/addons/mrp/mrp_security.xml
index 02f2efb8d4e..5c4efabb3df 100644
--- a/addons/mrp/mrp_security.xml
+++ b/addons/mrp/mrp_security.xml
@@ -10,10 +10,6 @@
             <field name="name">Workers</field>
         </record>
         
-        <record id="base.user_admin" model="res.users">
-            <field eval="[(4 ,ref('group_production_manager')) ,(4, ref('group_production_worker'))]" name="groups_id"/>
-        </record>
-        
         <record id="mrp.group_production_manager" model="res.groups">
             <field eval="[(6,0,[ref('mrp.menu_mrp_root'),ref('mrp.menu_mrp_configuration'),ref('mrp.menu_mrp_production_action'),ref('mrp.menu_production_orders_start'),ref('mrp.menu_mrp_production_action3'),ref('mrp.menu_production_orders_waiting4'),ref('mrp.menu_mrp_bom_form_action'),ref('mrp.menu_mrp_routing_action'),ref('mrp.menu_mrp_workcenter_action'),ref('mrp.menu_bom_tree'),ref('mrp.menu_mrp_bom_form_action2'),ref('mrp.menu_mrp_property_group_action'),ref('mrp.menu_mrp_property_action'),ref('mrp.menu_mrp_procurement_action'),ref('mrp.menu_mrp_procurement_action2'),ref('mrp.menu_mrp_procurement_action3'),ref('mrp.menu_mrp_procurement_action11'),ref('mrp.menu_wiz_mrp_proc1'),ref('mrp.menu_mrp_procurement_action')])]" name="menu_access"/>
         </record>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 4af03bca6ca..11634ae480f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -27,7 +27,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem groups="base.group_admin" id="menu_mrp_configuration" name="Configuration" parent="menu_mrp_root"/>
+        <menuitem id="menu_mrp_configuration" name="Configuration" parent="menu_mrp_root"/>
         <menuitem id="menu_mrp_property_group_action_prop" name="Properties" parent="menu_mrp_configuration"/>
         <menuitem action="mrp_property_group_action" id="menu_mrp_property_group_action" parent="menu_mrp_property_group_action_prop"/>
         
diff --git a/addons/processus/ir.model.access.csv b/addons/processus/ir.model.access.csv
index 1819b4e4c67..a7950953c9a 100644
--- a/addons/processus/ir.model.access.csv
+++ b/addons/processus/ir.model.access.csv
@@ -3,7 +3,3 @@ access_processus,processus.processus,model_processus_processus,,1,0,0,0
 access_node,processus.node,model_processus_node,,1,0,0,0
 access_transition,processus.transition,model_processus_transition,,1,0,0,0
 access_action,processus.transition.action,model_processus_transition_action,,1,0,0,0
-access_group_processus,processus.processus,model_processus_processus,base.group_admin,1,1,1,1
-access_group_node,processus.node,model_processus_node,base.group_admin,1,1,1,1
-access_group_transition,processus.transition,model_processus_transition,base.group_admin,1,1,1,1
-access_group_action,processus.transition.action,model_processus_transition_action,base.group_admin,1,1,1,1
diff --git a/addons/product/product_security.xml b/addons/product/product_security.xml
index 9bc6724dd14..caa51bf3219 100644
--- a/addons/product/product_security.xml
+++ b/addons/product/product_security.xml
@@ -1,114 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
-    <data noupdate="1">
-        
-        <record id="group_product_manager" model="res.groups">
-            <field name="name">Product Manager</field>
-        </record>
-        
-        <record id="base.user_admin" model="res.users">
-            <field eval="[ (4, ref('group_product_manager'))]" name="groups_id"/>
-        </record>
-        
-        <!-- Product security -->
-        <record id="access_product" model="ir.model.access">
-            <field name="name">Product</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'product.product')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_product_manager" model="ir.model.access">
-            <field name="name">Product</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'product.product')]"/>
-            <field name="group_id" ref="group_product_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Product Template security -->
-        <record id="access_product_template" model="ir.model.access">
-            <field name="name">Product Template</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'product.template')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_product_template_manager" model="ir.model.access">
-            <field name="name">Product Template</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'product.template')]"/>
-            <field name="group_id" ref="group_product_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Pricelist security -->
-        <record id="access_product_pricelist" model="ir.model.access">
-            <field name="name">Product Pricelist</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_product_pricelist_manager" model="ir.model.access">
-            <field name="name">Product Pricelist</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist')]"/>
-            <field name="group_id" ref="group_product_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Pricelist Version security -->
-        <record id="access_product_pricelist_version" model="ir.model.access">
-            <field name="name">Product Pricelist Version</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist.version')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_product_pricelist_version_manager" model="ir.model.access">
-            <field name="name">Product Pricelist Version</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist.version')]"/>
-            <field name="group_id" ref="group_product_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-        <!-- Pricelist Item security -->
-        <record id="access_product_pricelist_item_version" model="ir.model.access">
-            <field name="name">Product Pricelist Item</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist.item')]"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="False" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <record id="access_product_pricelist_item_manager" model="ir.model.access">
-            <field name="name">Product Pricelist Item</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'product.pricelist.item')]"/>
-            <field name="group_id" ref="group_product_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="True" name="perm_unlink"/>
-        </record>
-        
-    </data>
+<data noupdate="1">
+    
+    <record id="group_product_manager" model="res.groups">
+        <field name="name">Product Manager</field>
+    </record>
+    
+</data>
 </terp>
\ No newline at end of file
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 5b3bdbd279a..0a8b918d0d9 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -3,7 +3,7 @@
     <data>
         
         <menuitem icon="terp-product" id="menu_main_product" name="Products"/>
-        <menuitem groups="base.group_admin" id="menu_config_product" name="Configuration" parent="product.menu_main_product" sequence="1"/>
+        <menuitem id="menu_config_product" name="Configuration" parent="product.menu_main_product" sequence="1"/>
         
         <record id="product_product_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 118b43810b2..3cf4fc6b78b 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -10,7 +10,7 @@
             <field name="planned_hours">584.0</field>
             <field name="warn_manager">1</field>
             <field name="name">Tiny ERP Integration</field>
-            <field name="manager" ref="base.user_admin"/>
+            <field name="manager" ref="base.user_root"/>
         </record>
         <record id="project_project_21" model="project.project">
             <field name="planned_hours">216.0</field>
@@ -19,7 +19,7 @@
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Study + Prototype</field>
             <field model="account.analytic.account" name="category_id" search="[('name','=', 'Seagate P1')]"/>
-            <field name="manager" ref="base.user_admin"/>
+            <field name="manager" ref="base.user_root"/>
         </record>
         <record id="project_project_22" model="project.project">
             <field name="planned_hours">264.0</field>
@@ -27,7 +27,7 @@
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Specific Developements</field>
             <field model="account.analytic.account" name="category_id" search="[('name','=', 'Seagate P1')]"/>
-            <field name="manager" ref="base.user_admin"/>
+            <field name="manager" ref="base.user_root"/>
         </record>
         <record id="project_project_23" model="project.project">
             <field name="planned_hours">104.0</field>
@@ -35,7 +35,7 @@
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Install, data import, configuration</field>
             <field model="account.analytic.account" name="category_id" search="[('name','=', 'Seagate P1')]"/>
-            <field name="manager" ref="base.user_admin"/>
+            <field name="manager" ref="base.user_root"/>
         </record>
         
         <record id="project_task_116" model="project.task">
diff --git a/addons/project/project_security.xml b/addons/project/project_security.xml
index a86527a8809..ca8f496c27c 100644
--- a/addons/project/project_security.xml
+++ b/addons/project/project_security.xml
@@ -10,10 +10,6 @@
             <field name="name">Project Member</field>
         </record>
         
-        <record id="base.user_admin" model="res.users">
-            <field eval="[(4, ref('group_project_manager')), (4, ref('group_project_member'))]" name="groups_id"/>
-        </record>
-        
         <!-- Project security -->
         <record id="access_project" model="ir.model.access">
             <field name="name">Project</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e7ee126ee28..4ebf181b159 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -2,7 +2,7 @@
 <terp>
     <data>
         <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
-        <menuitem groups="base.group_admin" id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="1"/>
+        <menuitem  id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="1"/>
         
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
diff --git a/addons/purchase/purchase_security.xml b/addons/purchase/purchase_security.xml
index 3dd713dd4f7..7dfcaff8e00 100644
--- a/addons/purchase/purchase_security.xml
+++ b/addons/purchase/purchase_security.xml
@@ -6,10 +6,6 @@
             <field name="name">Purchase Manager</field>
         </record>
         
-        <record id="base.user_admin" model="res.users">
-            <field eval="[(4 ,ref('group_purchase_manager'))]" name="groups_id"/>
-        </record>
-        
         <record id="ir_model_access_stockmove0" model="ir.model.access">
             <field model="ir.model" name="model_id" search="[('name','=','Stock Move')]"/>
             <field eval="1" name="perm_read"/>
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index b179e8f1ba0..6eb611aacf3 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -75,7 +75,7 @@
             <test expr="state">confirmed</test>
         </assert>
         
-        <workflow model="purchase.order" ref="test_purchase_1" action="purchase_approve" uid="base.user_admin" />
+        <workflow model="purchase.order" ref="test_purchase_1" action="purchase_approve" uid="base.user_root" />
         
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now in progress">
             <test expr="state">approved</test>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 67584eb2a3b..53796da223f 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -9,7 +9,7 @@
         <record id="order" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field model="res.partner" name="partner_id" search="[]"/>
             <field model="res.partner.address" name="partner_invoice_id" search="[]"/>
             <field model="res.partner.address" name="partner_shipping_id" search="[]"/>
diff --git a/addons/sale/sale_security.xml b/addons/sale/sale_security.xml
index 84a48e4f765..3c75e6b7bb7 100644
--- a/addons/sale/sale_security.xml
+++ b/addons/sale/sale_security.xml
@@ -9,10 +9,6 @@
             <field name="name">Salesman</field>
         </record>
         
-        <record id="base.user_admin" model="res.users">
-            <field eval="[(4, ref('group_sale_manager')),(4, ref('group_sale_salesman'))]" name="groups_id"/>
-        </record>
-        
         <record id="ir_model_access_stockmove0" model="ir.model.access">
             <field model="ir.model" name="model_id" search="[('name','=','Stock Move')]"/>
             <field eval="1" name="perm_read"/>
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index 89b64507f95..2e0e77ec3c8 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -5,7 +5,7 @@
         <record id="test_order_1" model="sale.order">
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field model="res.partner" name="partner_id" search="[]"/>
             <field model="res.partner.address" name="partner_invoice_id" search="[]"/>
             <field model="res.partner.address" name="partner_shipping_id" search="[]"/>
@@ -43,7 +43,7 @@
             <test expr="state">manual</test>
         </assert>
         
-        <workflow action="manual_invoice" model="sale.order" ref="test_order_1" uid="base.user_admin"/>
+        <workflow action="manual_invoice" model="sale.order" ref="test_order_1" uid="base.user_root"/>
         
         <assert id="test_order_1" model="sale.order" string="the sale order is now in progress">
             <test expr="state">progress</test>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0025378df81..cf5b2eeab39 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -41,7 +41,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_shop_tree"/>
         </record>
-        <menuitem groups="base.group_admin" id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/>
+        <menuitem id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/>
         <menuitem action="action_shop_form" id="menu_action_shop_form" parent="sale.menu_shop_configuration"/>
 
         <record id="view_order_tree" model="ir.ui.view">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f1d8550cd1d..fc994c64e4c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -2,7 +2,7 @@
 <terp>
     <data>
         <menuitem icon="terp-stock" id="menu_stock_root" name="Stock Management"/>
-        <menuitem groups="base.group_admin" id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="1"/>
+        <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="1"/>
         
         =============================
         Inventory Line
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index b15d9e2673b..9951eaa8514 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -3,7 +3,7 @@
     <data>
         
         <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>
-        <menuitem id="next_id_45" name="Subscriptions" parent="subscription.menu_tools"/><menuitem groups="base.group_admin" id="menu_subscription_config" name="Configuration" parent="next_id_45"/>
+        <menuitem id="next_id_45" name="Subscriptions" parent="subscription.menu_tools"/><menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>
         <!--
 	=======================================================
 	Subscription Views