diff --git a/addons/account/project/project_security.xml b/addons/account/project/project_security.xml
index 60ec2ffb93c..187ace90ca0 100644
--- a/addons/account/project/project_security.xml
+++ b/addons/account/project/project_security.xml
@@ -4,28 +4,38 @@
 <!--
  Objects Groups
 -->
-    <record model="ir.model" id="model_account_analytic_account">
+    <record model="ir.model" id="account.model_account_analytic_account">
         <field name="type">addons</field>
     </record>
-    
-    <record model="ir.model" id="model_account_analytic_budget_post">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="model_account_analytic_budget_post_dotation">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="model_account_analytic_journal">
+
+    <record model="ir.model" id="account.model_account_analytic_journal">
         <field name="type">addons</field>
     </record>
 
+    <!--<record model="ir.model" id="account.model_account_analytic_budget_post">-->
+    <!--    <field name="type">addons</field>-->
+    <!--</record>-->
+    <!---->
+    <!--<record model="ir.model" id="account.model_account_analytic_budget_post_dotation">-->
+    <!--    <field name="type">addons</field>-->
+    <!--</record>-->
+
 <!--
  Access
 -->
+    <record model="ir.model.access" id="access_account_analytic_account_account.group_account_user">
+        <field name="name">account_analytic_account account.group_account_user</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_analytic_account"/>
+        <field name="group_id" ref="account.group_account_user"/>
+        <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_analytic_account_base.group_employee">
         <field name="name">account_analytic_account base.group_employee</field>
-        <field name="model_id" model="ir.model" ref="model_account_analytic_account"/>
+        <field name="model_id" model="ir.model" ref="account.model_account_analytic_account"/>
         <field name="group_id" ref="base.group_employee"/>
         <field name="perm_read" eval="1"/>
         <field name="perm_write" eval="0"/>
@@ -33,29 +43,9 @@
         <field name="perm_unlink" eval="0"/>
     </record>
 
-    <record model="ir.model.access" id="access_account_analytic_account_account.group_account_user">
-        <field name="name">account_analytic_account account.group_account_user</field>
-        <field name="model_id" model="ir.model" ref="model_account_analytic_account"/>
-        <field name="group_id" ref="account.group_account_user"/>
-        <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_analytic_journal_account.group_account_user">
-        <field name="name">account_analytic_journal account.group_account_user</field>
-        <field name="model_id" model="ir.model" ref="model_account_analytic_journal"/>
-        <field name="group_id" ref="account.group_account_user"/>
-        <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_analytic_journal_base.group_employee">
         <field name="name">account_analytic_journal base.group_employee</field>
-        <field name="model_id" model="ir.model" ref="model_account_analytic_journal"/>
+        <field name="model_id" model="ir.model" ref="account.model_account_analytic_journal"/>
         <field name="group_id" ref="base.group_employee"/>
         <field name="perm_read" eval="1"/>
         <field name="perm_write" eval="0"/>
@@ -63,6 +53,35 @@
         <field name="perm_unlink" eval="0"/>
     </record>
 
+    <record model="ir.model.access" id="access_account_analytic_journal_account.group_account_user">
+        <field name="name">account_analytic_journal account.group_account_user</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_analytic_journal"/>
+        <field name="group_id" ref="account.group_account_user"/>
+        <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_budget_post_account.group_account_manager">-->
+    <!--    <field name="name">account_budget_post account.group_account_manager</field>-->
+    <!--    <field name="model_id" model="ir.model" ref="account.model_account_budget_post"/>-->
+    <!--    <field name="group_id" ref="account.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_account_budget_post_dotation_account.group_account_manager">-->
+    <!--    <field name="name">account_budget_post_dotation account.group_account_manager</field>-->
+    <!--    <field name="model_id" model="ir.model" ref="account.model_account_budget_post_dotation"/>-->
+    <!--    <field name="group_id" ref="account.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>-->
 
 </data>
 </terp>
\ No newline at end of file
diff --git a/addons/product/product_security.xml b/addons/product/product_security.xml
index caa51bf3219..12a2e8fbc7e 100644
--- a/addons/product/product_security.xml
+++ b/addons/product/product_security.xml
@@ -1,10 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
 <data noupdate="1">
-    
+<!--
+ Groups
+-->
     <record id="group_product_manager" model="res.groups">
         <field name="name">Product Manager</field>
     </record>
-    
+
+<!--
+ Objects Groups
+-->
+    <record model="ir.model.access" id="access_product_pricelist_base.group_employee">
+        <field name="name">product_pricelist base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_product_pricelist"/>
+        <field name="group_id" ref="base.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_product_pricelist_group_product_manager">
+        <field name="name">product_pricelist group_product_manager</field>
+        <field name="model_id" model="ir.model" ref="model_product_pricelist"/>
+        <field name="group_id" ref="group_product_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_product_pricelist_item_base.group_employee">
+        <field name="name">product_pricelist_item base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_product_pricelist_item"/>
+        <field name="group_id" ref="base.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_product_pricelist_item_group_product_manager">
+        <field name="name">product_pricelist_item group_product_manager</field>
+        <field name="model_id" model="ir.model" ref="model_product_pricelist_item"/>
+        <field name="group_id" ref="group_product_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_product_pricelist_version_group_product_manager">
+        <field name="name">product_pricelist_version group_product_manager</field>
+        <field name="model_id" model="ir.model" ref="model_product_pricelist_version"/>
+        <field name="group_id" ref="group_product_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_product_pricelist_version_base.group_employee">
+        <field name="name">product_pricelist_version base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_product_pricelist_version"/>
+        <field name="group_id" ref="base.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_product_product_base.group_employee">
+        <field name="name">product_product base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_product_product"/>
+        <field name="group_id" ref="base.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_product_product_group_product_manager">
+        <field name="name">product_product group_product_manager</field>
+        <field name="model_id" model="ir.model" ref="model_product_product"/>
+        <field name="group_id" ref="group_product_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_product_template_base.group_employee">
+        <field name="name">product_template base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_product_template"/>
+        <field name="group_id" ref="base.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_product_template_group_product_manager">
+        <field name="name">product_template group_product_manager</field>
+        <field name="model_id" model="ir.model" ref="model_product_template"/>
+        <field name="group_id" ref="group_product_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>
\ No newline at end of file
diff --git a/addons/project/project_security.xml b/addons/project/project_security.xml
index ca8f496c27c..003b475da03 100644
--- a/addons/project/project_security.xml
+++ b/addons/project/project_security.xml
@@ -1,94 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
-    <data noupdate="1">
-        
-        <record id="group_project_manager" model="res.groups">
-            <field name="name">Project Manager</field>
-        </record>
-        
-        <record id="group_project_member" model="res.groups">
-            <field name="name">Project Member</field>
-        </record>
-        
-        <!-- Project security -->
-        <record id="access_project" model="ir.model.access">
-            <field name="name">Project</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'project.project')]"/>
-            <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_project_manager" model="ir.model.access">
-            <field name="name">Project</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'project.project')]"/>
-            <field name="group_id" ref="group_project_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <!-- Project Task security -->
-        <record id="access_project_task" model="ir.model.access">
-            <field name="name">Project Task</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task')]"/>
-            <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_project_task_manager" model="ir.model.access">
-            <field name="name">Project Task</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task')]"/>
-            <field name="group_id" ref="group_project_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>
-        
-        <record id="access_project_task_member" model="ir.model.access">
-            <field name="name">Project Task</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task')]"/>
-            <field name="group_id" ref="group_project_member"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="False" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <!-- Project Work security -->
-        <record id="access_project_task_work" model="ir.model.access">
-            <field name="name">Project Task Work</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task.work')]"/>
-            <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_project_task_work_manager" model="ir.model.access">
-            <field name="name">Project Task Work</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task.work')]"/>
-            <field name="group_id" ref="group_project_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>
-        
-        <record id="access_project_task_work_member" model="ir.model.access">
-            <field name="name">Project Task Work</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'project.task.work')]"/>
-            <field name="group_id" ref="group_project_member"/>
-            <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">
+<!--
+ Users Groups
+-->
+    <record id="group_project_manager" model="res.groups">
+        <field name="name">Project Manager</field>
+    </record>
+
+<!--
+ Objects Groups
+-->
+    <record model="ir.model" id="model_project_project">
+        <field name="type">addons</field>
+    </record>
+    
+    <record model="ir.model" id="model_project_task">
+        <field name="type">addons</field>
+    </record>
+    
+    <record model="ir.model" id="model_project_task_work">
+        <field name="type">addons</field>
+    </record>
+
+<!--
+ Access
+-->
+    <record model="ir.model.access" id="access_project_project_base.group_employee">
+        <field name="name">project_project base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_project_project"/>
+        <field name="group_id" ref="base.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_project_project_group_project_manager">
+        <field name="name">project_project group_project_manager</field>
+        <field name="model_id" model="ir.model" ref="model_project_project"/>
+        <field name="group_id" ref="group_project_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_project_task_base.group_employee">
+        <field name="name">project_task base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_project_task"/>
+        <field name="group_id" ref="base.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_project_task_group_project_manager">
+        <field name="name">project_task group_project_manager</field>
+        <field name="model_id" model="ir.model" ref="model_project_task"/>
+        <field name="group_id" ref="group_project_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_project_task_account.group_project_member">
+        <field name="name">project_task account.group_project_member</field>
+        <field name="model_id" model="ir.model" ref="model_project_task"/>
+        <field name="group_id" ref="account.group_project_member"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="1"/>
+        <field name="perm_create" eval="0"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+
+    <record model="ir.model.access" id="access_project_task_work_base.group_employee">
+        <field name="name">project_task_work base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_project_task_work"/>
+        <field name="group_id" ref="base.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_project_task_work_group_project_manager">
+        <field name="name">project_task_work group_project_manager</field>
+        <field name="model_id" model="ir.model" ref="model_project_task_work"/>
+        <field name="group_id" ref="group_project_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_project_task_work_account.group_project_member">
+        <field name="name">project_task_work account.group_project_member</field>
+        <field name="model_id" model="ir.model" ref="model_project_task_work"/>
+        <field name="group_id" ref="account.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="1"/>
+    </record>
+
+</data>
 </terp>
\ No newline at end of file