diff --git a/addons/account/account_security.xml b/addons/account/account_security.xml
index 91ee0858bcd..2ccbdf6352d 100644
--- a/addons/account/account_security.xml
+++ b/addons/account/account_security.xml
@@ -1,9 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-<data noupdate="1">
-<!--
- Groups
--->
+<?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>
@@ -27,9 +22,98 @@
     <record id="group_account_payment" model="res.groups">
         <field name="name">Account Payment</field>
     </record>
-
 <!--
- Access
+ Object Groups
+-->
+    <record model="ir.model" id="model_account_invoice_tax">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_journal_column">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_move">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_bank_statement">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_journal">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_subscription_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_journal_view">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_invoice">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_tax">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_payment_term">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_account_type">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_account">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_move_reconcile">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_journal_period">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_bank_statement_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_payment_term_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_fiscalyear">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_analytic_account">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_model">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_bank_statement_reconcile_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_bank_statement_reconcile">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_analytic_journal">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_move_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_tax_code">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_analytic_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_invoice_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_period">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_model_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_account_subscription">
+        <field name="type">addons</field>
+    </record>
+<!--
+ Object Access
 -->
     <record model="ir.model.access" id="access_account_account_base.group_employee">
         <field name="name">account_account base.group_employee</field>
@@ -40,7 +124,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_account_type_base.group_employee">
         <field name="name">account_account_type base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_account_type"/>
@@ -50,7 +133,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </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"/>
@@ -60,7 +142,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </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"/>
@@ -70,7 +151,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_analytic_line_base.group_employee">
         <field name="name">account_analytic_line base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_analytic_line"/>
@@ -80,7 +160,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </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"/>
@@ -90,7 +169,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </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"/>
@@ -100,7 +178,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </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"/>
@@ -110,7 +187,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </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"/>
@@ -120,7 +196,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_account_fiscalyear_base.group_employee">
         <field name="name">account_fiscalyear base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_fiscalyear"/>
@@ -130,7 +205,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_invoice_group_sale_manager">
         <field name="name">account_invoice group_sale_manager</field>
         <field name="model_id" model="ir.model" ref="model_account_invoice"/>
@@ -140,7 +214,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_account_invoice_line_group_sale_manager">
         <field name="name">account_invoice_line group_sale_manager</field>
         <field name="model_id" model="ir.model" ref="model_account_invoice_line"/>
@@ -150,7 +223,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_account_invoice_tax_group_sale_manager">
         <field name="name">account_invoice_tax group_sale_manager</field>
         <field name="model_id" model="ir.model" ref="model_account_invoice_tax"/>
@@ -160,7 +232,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </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"/>
@@ -170,7 +241,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="0"/>
     </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"/>
@@ -180,7 +250,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <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"/>
@@ -190,7 +259,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_journal_base.group_employee">
         <field name="name">account_journal base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_journal"/>
@@ -200,7 +268,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_journal_column_base.group_employee">
         <field name="name">account_journal_column base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_journal_column"/>
@@ -210,7 +277,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_journal_period_base.group_employee">
         <field name="name">account_journal_period base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_journal_period"/>
@@ -220,7 +286,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_journal_view_base.group_employee">
         <field name="name">account_journal_view base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_journal_view"/>
@@ -230,7 +295,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_model_base.group_erp_manager">
         <field name="name">account_model base.group_erp_manager</field>
         <field name="model_id" model="ir.model" ref="model_account_model"/>
@@ -240,7 +304,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_account_model_line_base.group_erp_manager">
         <field name="name">account_model_line base.group_erp_manager</field>
         <field name="model_id" model="ir.model" ref="model_account_model_line"/>
@@ -250,7 +313,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_account_move_group_sale_manager">
         <field name="name">account_move group_sale_manager</field>
         <field name="model_id" model="ir.model" ref="model_account_move"/>
@@ -260,7 +322,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_account_move_line_group_sale_manager">
         <field name="name">account_move_line group_sale_manager</field>
         <field name="model_id" model="ir.model" ref="model_account_move_line"/>
@@ -270,7 +331,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_account_move_reconcile_group_sale_manager">
         <field name="name">account_move_reconcile group_sale_manager</field>
         <field name="model_id" model="ir.model" ref="model_account_move_reconcile"/>
@@ -280,7 +340,6 @@
         <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"/>
@@ -290,7 +349,6 @@
         <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"/>
@@ -300,7 +358,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_account_payment_term_base.group_employee">
         <field name="name">account_payment_term base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_payment_term"/>
@@ -310,7 +367,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_payment_term_line_base.group_employee">
         <field name="name">account_payment_term_line base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_payment_term_line"/>
@@ -320,7 +376,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_period_base.group_employee">
         <field name="name">account_period base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_period"/>
@@ -330,7 +385,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_subscription_base.group_erp_manager">
         <field name="name">account_subscription base.group_erp_manager</field>
         <field name="model_id" model="ir.model" ref="model_account_subscription"/>
@@ -340,7 +394,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_account_subscription_line_base.group_erp_manager">
         <field name="name">account_subscription_line base.group_erp_manager</field>
         <field name="model_id" model="ir.model" ref="model_account_subscription_line"/>
@@ -350,7 +403,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_account_tax_base.group_employee">
         <field name="name">account_tax base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_tax"/>
@@ -360,7 +412,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_account_tax_code_base.group_employee">
         <field name="name">account_tax_code base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_account_tax_code"/>
@@ -370,6 +421,4 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
-</data>
-</terp>
\ No newline at end of file
+</data></terp>
\ No newline at end of file
diff --git a/addons/account/project/project_security.xml b/addons/account/project/project_security.xml
index 187ace90ca0..c93f865eda6 100644
--- a/addons/account/project/project_security.xml
+++ b/addons/account/project/project_security.xml
@@ -1,27 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-<data noupdate="1">
-<!--
- Objects Groups
--->
-    <record model="ir.model" id="account.model_account_analytic_account">
-        <field name="type">addons</field>
-    </record>
+<?xml version="1.0" encoding="utf-8"?><terp><data noupdate="1">
 
+<!--
+ Object Groups
+-->
     <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>-->
-
+    <record model="ir.model" id="account.model_account_analytic_account">
+        <field name="type">addons</field>
+    </record>
 <!--
- Access
+ Object 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>
@@ -32,7 +21,6 @@
         <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="account.model_account_analytic_account"/>
@@ -42,7 +30,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </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="account.model_account_analytic_journal"/>
@@ -52,7 +39,6 @@
         <field name="perm_create" eval="0"/>
         <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"/>
@@ -62,26 +48,4 @@
         <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
+</data></terp>
\ No newline at end of file
diff --git a/addons/board/board_security.xml b/addons/board/board_security.xml
index 9bd2aeccd4e..b00edc30b22 100644
--- a/addons/board/board_security.xml
+++ b/addons/board/board_security.xml
@@ -1,9 +1,4 @@
-<?xml version='1.0'?>
-<terp>
-<data>
-<!--
- Groups
--->
+<?xml version="1.0" encoding="utf-8"?><terp><data noupdate="1">
     <record model="res.groups" id="group_board">
         <field name="name">Board User</field>
     </record>
@@ -13,7 +8,19 @@
     </record>
 
 <!--
- Access
+ Object Groups
+-->
+    <record model="ir.model" id="model_board_note">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_board_board">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_board_note_type">
+        <field name="type">addons</field>
+    </record>
+<!--
+ Object Access
 -->
     <record model="ir.model.access" id="access_board_board_group_board">
         <field name="name">board_board group_board</field>
@@ -24,7 +31,6 @@
         <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"/>
@@ -34,7 +40,6 @@
         <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"/>
@@ -44,7 +49,6 @@
         <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"/>
@@ -54,7 +58,6 @@
         <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"/>
@@ -64,7 +67,6 @@
         <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"/>
@@ -74,6 +76,4 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
-</data>
-</terp>
+</data></terp>
\ No newline at end of file
diff --git a/addons/crm/crm_security.xml b/addons/crm/crm_security.xml
index 5442d127fca..e1c36326595 100644
--- a/addons/crm/crm_security.xml
+++ b/addons/crm/crm_security.xml
@@ -1,9 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-<data noupdate="1">
-<!--
- User Groups
--->
+<?xml version="1.0" encoding="utf-8"?><terp><data noupdate="1">
     <record id="group_crm_manager" model="res.groups">
         <field name="name">Customer Executive - Manager</field>
     </record>
@@ -15,28 +10,23 @@
 <!--
  Object Groups
 -->
-    <record model="ir.model" id="base.crm_case">
+    <record model="ir.model" id="model_crm_case_rule">
         <field name="type">addons</field>
     </record>
-    
-    <record model="ir.model" id="base.crm_case_log">
+    <record model="ir.model" id="model_crm_case">
         <field name="type">addons</field>
     </record>
-    
-    <record model="ir.model" id="base.crm_case_rule">
+    <record model="ir.model" id="model_crm_case_log">
         <field name="type">addons</field>
     </record>
-    
-    <record model="ir.model" id="base.crm_case_section">
+    <record model="ir.model" id="model_crm_segmentation">
         <field name="type">addons</field>
     </record>
-    
-    <record model="ir.model" id="base.crm_segmentation">
+    <record model="ir.model" id="model_crm_case_section">
         <field name="type">addons</field>
     </record>
-
 <!--
- Access
+ Object Access
 -->
     <record model="ir.model.access" id="access_crm_case_group_crm_user">
         <field name="name">crm_case group_crm_user</field>
@@ -47,27 +37,24 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
-    <record model="ir.model.access" id="access_crm_case_group_employee">
-        <field name="name">crm_case group_employee</field>
+    <record model="ir.model.access" id="access_crm_case_base.group_employee">
+        <field name="name">crm_case base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_crm_case"/>
-        <field name="group_id" ref="group_employee"/>
+        <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_crm_case_log_group_employee">
-        <field name="name">crm_case_log group_employee</field>
+    <record model="ir.model.access" id="access_crm_case_log_base.group_employee">
+        <field name="name">crm_case_log base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_crm_case_log"/>
-        <field name="group_id" ref="group_employee"/>
+        <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_crm_case_log_group_crm_user">
         <field name="name">crm_case_log group_crm_user</field>
         <field name="model_id" model="ir.model" ref="model_crm_case_log"/>
@@ -77,7 +64,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_crm_case_rule_group_crm_manager">
         <field name="name">crm_case_rule group_crm_manager</field>
         <field name="model_id" model="ir.model" ref="model_crm_case_rule"/>
@@ -87,17 +73,15 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
-    <record model="ir.model.access" id="access_crm_case_rule_group_employee">
-        <field name="name">crm_case_rule group_employee</field>
+    <record model="ir.model.access" id="access_crm_case_rule_base.group_employee">
+        <field name="name">crm_case_rule base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_crm_case_rule"/>
-        <field name="group_id" ref="group_employee"/>
+        <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_crm_case_section_group_crm_manager">
         <field name="name">crm_case_section group_crm_manager</field>
         <field name="model_id" model="ir.model" ref="model_crm_case_section"/>
@@ -107,27 +91,24 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
-    <record model="ir.model.access" id="access_crm_case_section_group_employee">
-        <field name="name">crm_case_section group_employee</field>
+    <record model="ir.model.access" id="access_crm_case_section_base.group_employee">
+        <field name="name">crm_case_section base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_crm_case_section"/>
-        <field name="group_id" ref="group_employee"/>
+        <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_crm_segmentation_group_employee">
-        <field name="name">crm_segmentation group_employee</field>
+    <record model="ir.model.access" id="access_crm_segmentation_base.group_employee">
+        <field name="name">crm_segmentation base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_crm_segmentation"/>
-        <field name="group_id" ref="group_employee"/>
+        <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_crm_segmentation_group_crm_manager">
         <field name="name">crm_segmentation group_crm_manager</field>
         <field name="model_id" model="ir.model" ref="model_crm_segmentation"/>
@@ -137,6 +118,4 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
-</data>
-</terp>
\ No newline at end of file
+</data></terp>
\ No newline at end of file
diff --git a/addons/hr/hr_security.xml b/addons/hr/hr_security.xml
index b90f2ef3b43..81809256ff0 100644
--- a/addons/hr/hr_security.xml
+++ b/addons/hr/hr_security.xml
@@ -1,15 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-<data noupdate="1">
-<!--
- Groups
--->
+<?xml version="1.0" encoding="utf-8"?><terp><data noupdate="1">
     <record model="res.groups" id="group_hr_manager">
         <field name="name">HR Manager</field>
     </record>
 
 <!--
- Access
+ Object Groups
+-->
+    <record model="ir.model" id="model_hr_action_reason">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_attendance">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_employee">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_employee_category">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_department">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_timesheet">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_timesheet_group">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_holidays">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_holidays_status">
+        <field name="type">addons</field>
+    </record>
+<!--
+ Object Access
 -->
     <record model="ir.model.access" id="access_hr_action_reason_group_hr_manager">
         <field name="name">hr_action_reason group_hr_manager</field>
@@ -20,7 +45,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_action_reason_base.group_employee">
         <field name="name">hr_action_reason base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_action_reason"/>
@@ -30,7 +54,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_attendance_base.group_employee">
         <field name="name">hr_attendance base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_attendance"/>
@@ -40,7 +63,6 @@
         <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"/>
@@ -50,7 +72,6 @@
         <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"/>
@@ -60,7 +81,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_employee_base.group_employee">
         <field name="name">hr_employee base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_employee"/>
@@ -70,7 +90,6 @@
         <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"/>
@@ -80,7 +99,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_employee_category_base.group_employee">
         <field name="name">hr_employee_category base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_employee_category"/>
@@ -90,7 +108,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_holidays_base.group_employee">
         <field name="name">hr_holidays base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_holidays"/>
@@ -100,7 +117,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </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"/>
@@ -110,7 +126,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_holidays_status_base.group_employee">
         <field name="name">hr_holidays_status base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_holidays_status"/>
@@ -120,7 +135,6 @@
         <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"/>
@@ -130,7 +144,6 @@
         <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"/>
@@ -140,7 +153,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_timesheet_base.group_employee">
         <field name="name">hr_timesheet base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_timesheet"/>
@@ -150,7 +162,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </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"/>
@@ -160,7 +171,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_timesheet_group_base.group_employee">
         <field name="name">hr_timesheet_group base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_timesheet_group"/>
@@ -170,6 +180,4 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
-</data>
-</terp>
\ No newline at end of file
+</data></terp>
\ No newline at end of file
diff --git a/addons/hr_contract/hr_contract_security.xml b/addons/hr_contract/hr_contract_security.xml
index 39d7c5b0534..1a2d1a551bb 100644
--- a/addons/hr_contract/hr_contract_security.xml
+++ b/addons/hr_contract/hr_contract_security.xml
@@ -1,8 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-<data noupdate="1">
+<?xml version="1.0" encoding="utf-8"?><terp><data noupdate="1">
+
 <!--
- Access
+ Object Groups
+-->
+    <record model="ir.model" id="model_hr_contract_wage_type_period">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_timesheet_sheet_sheet">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_expense_expense">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_contract">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_employee_marital_status">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_contract_wage_type">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_hr_timesheet_invoice_factor">
+        <field name="type">addons</field>
+    </record>
+<!--
+ Object Access
 -->
     <record model="ir.model.access" id="access_hr_contract_base.group_employee">
         <field name="name">hr_contract base.group_employee</field>
@@ -13,7 +36,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_contract_group_hr_manager">
         <field name="name">hr_contract group_hr_manager</field>
         <field name="model_id" model="ir.model" ref="model_hr_contract"/>
@@ -23,7 +45,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_contract_wage_type_group_hr_manager">
         <field name="name">hr_contract_wage_type group_hr_manager</field>
         <field name="model_id" model="ir.model" ref="model_hr_contract_wage_type"/>
@@ -33,7 +54,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_contract_wage_type_base.group_employee">
         <field name="name">hr_contract_wage_type base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_contract_wage_type"/>
@@ -43,7 +63,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_contract_wage_type_period_group_hr_manager">
         <field name="name">hr_contract_wage_type_period group_hr_manager</field>
         <field name="model_id" model="ir.model" ref="model_hr_contract_wage_type_period"/>
@@ -53,7 +72,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_contract_wage_type_period_base.group_employee">
         <field name="name">hr_contract_wage_type_period base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_contract_wage_type_period"/>
@@ -63,7 +81,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_employee_marital_status_group_hr_manager">
         <field name="name">hr_employee_marital_status group_hr_manager</field>
         <field name="model_id" model="ir.model" ref="model_hr_employee_marital_status"/>
@@ -73,7 +90,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_employee_marital_status_base.group_employee">
         <field name="name">hr_employee_marital_status base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_employee_marital_status"/>
@@ -83,7 +99,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_expense_expense_base.group_employee">
         <field name="name">hr_expense_expense base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_expense_expense"/>
@@ -93,7 +108,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </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"/>
@@ -103,7 +117,6 @@
         <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_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"/>
@@ -113,7 +126,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_timesheet_invoice_factor_base.group_employee">
         <field name="name">hr_timesheet_invoice_factor base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_timesheet_invoice_factor"/>
@@ -123,7 +135,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_hr_timesheet_sheet_sheet_base.group_employee">
         <field name="name">hr_timesheet_sheet_sheet base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_hr_timesheet_sheet_sheet"/>
@@ -133,7 +144,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="0"/>
     </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"/>
@@ -143,6 +153,4 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
-</data>
-</terp>
\ No newline at end of file
+</data></terp>
\ No newline at end of file
diff --git a/addons/mrp/mrp_security.xml b/addons/mrp/mrp_security.xml
index ce64f427ce3..53de5508114 100644
--- a/addons/mrp/mrp_security.xml
+++ b/addons/mrp/mrp_security.xml
@@ -1,70 +1,52 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-<data>
-<!--
- Groups
--->
+<?xml version="1.0" encoding="utf-8"?><terp><data noupdate="1">
     <record id="group_production_manager" model="res.groups">
         <field name="name">Production Manager</field>
     </record>
 
 <!--
- Objects Groups
+ Object Groups
 -->
-    <record model="ir.model" id="mrp.model_mrp_bom">
+    <record model="ir.model" id="model_stock_warehouse_orderpoint">
         <field name="type">addons</field>
     </record>
-    
-    <record model="ir.model" id="mrp.model_mrp_bom_revision">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="mrp.model_mrp_procurement">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="mrp.model_mrp_production">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="mrp.model_mrp_production_product_line">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="mrp.model_mrp_production_workcenter_line">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="mrp.model_mrp_property">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="mrp.model_mrp_property_group">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="mrp.model_mrp_routing">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="mrp.model_mrp_routing_workcenter">
-        <field name="type">addons</field>
-    </record>
-    
-    <record model="ir.model" id="mrp.model_mrp_workcenter">
-        <field name="type">addons</field>
-    </record>
-    
     <record model="ir.model" id="stock.model_stock_move">
         <field name="type">addons</field>
     </record>
-    
-    <record model="ir.model" id="mrp.model_stock_warehouse_orderpoint">
+    <record model="ir.model" id="model_mrp_production_product_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_mrp_production">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_mrp_procurement">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_mrp_workcenter">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_mrp_production_workcenter_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_mrp_bom">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_mrp_routing_workcenter">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_mrp_routing">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_mrp_bom_revision">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_mrp_property_group">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_mrp_property">
         <field name="type">addons</field>
     </record>
-    
 <!--
- Access
+ Object Access
 -->
     <record model="ir.model.access" id="access_mrp_bom_group_production_manager">
         <field name="name">mrp_bom group_production_manager</field>
@@ -75,7 +57,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_bom_base.group_employee">
         <field name="name">mrp_bom base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_bom"/>
@@ -85,7 +66,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_bom_revision_base.group_employee">
         <field name="name">mrp_bom_revision base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_bom_revision"/>
@@ -95,7 +75,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_bom_revision_group_production_manager">
         <field name="name">mrp_bom_revision group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_mrp_bom_revision"/>
@@ -105,7 +84,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_procurement_base.group_employee">
         <field name="name">mrp_procurement base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_procurement"/>
@@ -115,7 +93,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_procurement_group_production_manager">
         <field name="name">mrp_procurement group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_mrp_procurement"/>
@@ -125,7 +102,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_production_base.group_employee">
         <field name="name">mrp_production base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_production"/>
@@ -135,7 +111,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_production_group_production_manager">
         <field name="name">mrp_production group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_mrp_production"/>
@@ -145,7 +120,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_production_product_line_group_production_manager">
         <field name="name">mrp_production_product_line group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_mrp_production_product_line"/>
@@ -155,7 +129,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_production_product_line_base.group_employee">
         <field name="name">mrp_production_product_line base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_production_product_line"/>
@@ -165,7 +138,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_production_workcenter_line_base.group_employee">
         <field name="name">mrp_production_workcenter_line base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_production_workcenter_line"/>
@@ -175,7 +147,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_production_workcenter_line_group_production_manager">
         <field name="name">mrp_production_workcenter_line group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_mrp_production_workcenter_line"/>
@@ -185,7 +156,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_property_base.group_employee">
         <field name="name">mrp_property base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_property"/>
@@ -195,7 +165,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_property_group_production_manager">
         <field name="name">mrp_property group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_mrp_property"/>
@@ -205,7 +174,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_property_group_base.group_employee">
         <field name="name">mrp_property_group base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_property_group"/>
@@ -215,7 +183,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_property_group_group_production_manager">
         <field name="name">mrp_property_group group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_mrp_property_group"/>
@@ -225,7 +192,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_routing_group_production_manager">
         <field name="name">mrp_routing group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_mrp_routing"/>
@@ -235,7 +201,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_routing_base.group_employee">
         <field name="name">mrp_routing base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_routing"/>
@@ -245,7 +210,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_routing_workcenter_group_production_manager">
         <field name="name">mrp_routing_workcenter group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_mrp_routing_workcenter"/>
@@ -255,7 +219,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_routing_workcenter_base.group_employee">
         <field name="name">mrp_routing_workcenter base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_routing_workcenter"/>
@@ -265,7 +228,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_workcenter_base.group_employee">
         <field name="name">mrp_workcenter base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_mrp_workcenter"/>
@@ -275,7 +237,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_mrp_workcenter_group_production_manager">
         <field name="name">mrp_workcenter group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_mrp_workcenter"/>
@@ -285,7 +246,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_stock_move_group_production_manager">
         <field name="name">stock_move group_production_manager</field>
         <field name="model_id" model="ir.model" ref="stock.model_stock_move"/>
@@ -295,7 +255,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
     <record model="ir.model.access" id="access_stock_move_base.group_employee">
         <field name="name">stock_move base.group_employee</field>
         <field name="model_id" model="ir.model" ref="stock.model_stock_move"/>
@@ -305,7 +264,6 @@
         <field name="perm_create" eval="0"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_stock_warehouse_orderpoint_base.group_employee">
         <field name="name">stock_warehouse_orderpoint base.group_employee</field>
         <field name="model_id" model="ir.model" ref="model_stock_warehouse_orderpoint"/>
@@ -315,7 +273,6 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="0"/>
     </record>
-
     <record model="ir.model.access" id="access_stock_warehouse_orderpoint_group_production_manager">
         <field name="name">stock_warehouse_orderpoint group_production_manager</field>
         <field name="model_id" model="ir.model" ref="model_stock_warehouse_orderpoint"/>
@@ -325,6 +282,4 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
-</data>
-</terp>
\ No newline at end of file
+</data></terp>
\ No newline at end of file
diff --git a/addons/product/product_security.xml b/addons/product/product_security.xml
index 12a2e8fbc7e..81d871d0eb0 100644
--- a/addons/product/product_security.xml
+++ b/addons/product/product_security.xml
@@ -1,15 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-<data noupdate="1">
-<!--
- Groups
--->
+<?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>
 
 <!--
- Objects Groups
+ Object Groups
+-->
+    <record model="ir.model" id="model_product_pricelist_item">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_product_pricelist">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_product_pricelist_version">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_product_product">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_product_template">
+        <field name="type">addons</field>
+    </record>
+<!--
+ Object Access
 -->
     <record model="ir.model.access" id="access_product_pricelist_base.group_employee">
         <field name="name">product_pricelist base.group_employee</field>
@@ -20,7 +33,6 @@
         <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"/>
@@ -30,7 +42,6 @@
         <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"/>
@@ -40,7 +51,6 @@
         <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"/>
@@ -50,7 +60,6 @@
         <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"/>
@@ -60,7 +69,6 @@
         <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"/>
@@ -70,7 +78,6 @@
         <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"/>
@@ -80,7 +87,6 @@
         <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"/>
@@ -90,7 +96,6 @@
         <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"/>
@@ -100,7 +105,6 @@
         <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"/>
@@ -110,6 +114,4 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
-</data>
-</terp>
\ No newline at end of file
+</data></terp>
\ No newline at end of file
diff --git a/addons/project/project_security.xml b/addons/project/project_security.xml
index 003b475da03..39d9a58db55 100644
--- a/addons/project/project_security.xml
+++ b/addons/project/project_security.xml
@@ -1,30 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-<data noupdate="1">
-<!--
- Users Groups
--->
+<?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>
 
+
 <!--
- Objects Groups
+ Object 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
+ Object Access
 -->
     <record model="ir.model.access" id="access_project_project_base.group_employee">
         <field name="name">project_project base.group_employee</field>
@@ -35,7 +28,6 @@
         <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"/>
@@ -45,7 +37,6 @@
         <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"/>
@@ -55,7 +46,6 @@
         <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"/>
@@ -65,7 +55,6 @@
         <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"/>
@@ -75,7 +64,6 @@
         <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"/>
@@ -85,7 +73,6 @@
         <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"/>
@@ -95,7 +82,6 @@
         <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"/>
@@ -105,6 +91,4 @@
         <field name="perm_create" eval="1"/>
         <field name="perm_unlink" eval="1"/>
     </record>
-
-</data>
-</terp>
\ No newline at end of file
+</data></terp>
\ No newline at end of file
diff --git a/addons/purchase/purchase_security.xml b/addons/purchase/purchase_security.xml
index 7dfcaff8e00..2eb8d2efc90 100644
--- a/addons/purchase/purchase_security.xml
+++ b/addons/purchase/purchase_security.xml
@@ -1,89 +1,102 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-    <data noupdate="1">
-        
-        <record id="group_purchase_manager" model="res.groups">
-            <field name="name">Purchase Manager</field>
-        </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"/>
-            <field eval="&quot;Stock Move&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="purchase.group_purchase_manager"/>
-        </record>
-        
-        <record id="ir_model_access_accountinvoice0" model="ir.model.access">
-            <field model="ir.model" name="model_id" search="[('name','=','Invoice')]"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="&quot;Account Invoice&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="purchase.group_purchase_manager"/>
-        </record>
-        
-        <record id="ir_model_access_accountinvoiceline0" model="ir.model.access">
-            <field model="ir.model" name="model_id" search="[('name','=','Invoice line')]"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="&quot;Account Invoice Line&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="0" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="purchase.group_purchase_manager"/>
-        </record>
-        
-        <record id="ir_model_access_accountinvoicetax0" model="ir.model.access">
-            <field model="ir.model" name="model_id" search="[('name','=','Invoice Tax')]"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="&quot;Account Invoice tax&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="0" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="purchase.group_purchase_manager"/>
-        </record>
-        
-        <!-- Purchase order security -->
-        <record id="access_purchase_order" model="ir.model.access">
-            <field name="name">Purchase Order</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'purchase.order')]"/>
-            <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_purchase_order_purchase_manager" model="ir.model.access">
-            <field name="name">Purchase Order</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'purchase.order')]"/>
-            <field name="group_id" ref="group_purchase_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>
-        
-        <!-- Purchase order line security -->
-        <record id="access_purchase_order_line" model="ir.model.access">
-            <field name="name">Purchase Order Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'purchase.order.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_purchase_order_line_purchase_manager" model="ir.model.access">
-            <field name="name">Purchase Order Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'purchase.order.line')]"/>
-            <field name="group_id" ref="group_purchase_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>
-</terp>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?><terp><data noupdate="1">
+    <record id="group_purchase_manager" model="res.groups">
+        <field name="name">Purchase Manager</field>
+    </record>
+
+<!--
+ Object Groups
+-->
+    <record model="ir.model" id="stock.model_stock_move">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_purchase_order_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_purchase_order">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="account.model_account_invoice">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="account.model_account_invoice_tax">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="account.model_account_invoice_line">
+        <field name="type">addons</field>
+    </record>
+<!--
+ Object Access
+-->
+    <record model="ir.model.access" id="access_account_invoice_group_purchase_manager">
+        <field name="name">account_invoice group_purchase_manager</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_invoice"/>
+        <field name="group_id" ref="group_purchase_manager"/>
+        <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_invoice_line_group_purchase_manager">
+        <field name="name">account_invoice_line group_purchase_manager</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_invoice_line"/>
+        <field name="group_id" ref="group_purchase_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+    <record model="ir.model.access" id="access_account_invoice_tax_group_purchase_manager">
+        <field name="name">account_invoice_tax group_purchase_manager</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_invoice_tax"/>
+        <field name="group_id" ref="group_purchase_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+    <record model="ir.model.access" id="access_purchase_order_base.group_employee">
+        <field name="name">purchase_order base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_purchase_order"/>
+        <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_purchase_order_group_purchase_manager">
+        <field name="name">purchase_order group_purchase_manager</field>
+        <field name="model_id" model="ir.model" ref="model_purchase_order"/>
+        <field name="group_id" ref="group_purchase_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_purchase_order_line_group_purchase_manager">
+        <field name="name">purchase_order_line group_purchase_manager</field>
+        <field name="model_id" model="ir.model" ref="model_purchase_order_line"/>
+        <field name="group_id" ref="group_purchase_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_purchase_order_line_base.group_employee">
+        <field name="name">purchase_order_line base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_purchase_order_line"/>
+        <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_stock_move_group_purchase_manager">
+        <field name="name">stock_move group_purchase_manager</field>
+        <field name="model_id" model="ir.model" ref="stock.model_stock_move"/>
+        <field name="group_id" ref="group_purchase_manager"/>
+        <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/sale/sale_security.xml b/addons/sale/sale_security.xml
index fceaae0cf23..3dfb696ac10 100644
--- a/addons/sale/sale_security.xml
+++ b/addons/sale/sale_security.xml
@@ -1,174 +1,168 @@
-<?xml version="1.0" encoding="utf-8"?>
-<terp>
-    <data noupdate="1">
-        
-        <record id="group_sale_manager" model="res.groups">
-            <field name="name">Sale Manager</field>
-        </record>
-        
-        <record id="group_sale_salesman" model="res.groups">
-            <field name="name">Salesman</field>
-        </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"/>
-            <field eval="&quot;Stock Move&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="group_sale_manager"/>
-        </record>
-        
-        <record id="ir_model_access_accountinvoice0" model="ir.model.access">
-            <field model="ir.model" name="model_id" search="[('name','=','Invoice')]"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="&quot;Account Invoice&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="group_sale_manager"/>
-        </record>
-        
-        <record id="ir_model_access_accountinvoiceline0" model="ir.model.access">
-            <field model="ir.model" name="model_id" search="[('name','=','Invoice line')]"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="&quot;Account Invoice Line&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="0" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="group_sale_manager"/>
-        </record>
-        
-        <record id="ir_model_access_accountinvoicetax0" model="ir.model.access">
-            <field model="ir.model" name="model_id" search="[('name','=','Invoice Tax')]"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="&quot;Account Invoice tax&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="0" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="group_sale_manager"/>
-        </record>
-        
-        <record id="access_mrp_procurement" model="ir.model.access">
-            <field name="name">Mrp procurement</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.procurement')]"/>
-            <field name="group_id" ref="group_sale_manager"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </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"/>
-            <field eval="&quot;Stock Move&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="group_sale_salesman"/>
-        </record>
-        
-        <record id="ir_model_access_accountinvoice0" model="ir.model.access">
-            <field model="ir.model" name="model_id" search="[('name','=','Invoice')]"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="&quot;Account Invoice&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="group_sale_salesman"/>
-        </record>
-        
-        <record id="ir_model_access_accountinvoiceline0" model="ir.model.access">
-            <field model="ir.model" name="model_id" search="[('name','=','Invoice line')]"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="&quot;Account Invoice Line&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="0" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="group_sale_salesman"/>
-        </record>
-        
-        <record id="ir_model_access_accountinvoicetax0" model="ir.model.access">
-            <field model="ir.model" name="model_id" search="[('name','=','Invoice Tax')]"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="&quot;Account Invoice tax&quot;" name="name"/>
-            <field eval="0" name="perm_unlink"/>
-            <field eval="0" name="perm_write"/>
-            <field eval="1" name="perm_create"/>
-            <field name="group_id" ref="group_sale_salesman"/>
-        </record>
-        
-        <record id="access_mrp_procurement" model="ir.model.access">
-            <field name="name">Mrp procurement</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'mrp.procurement')]"/>
-            <field name="group_id" ref="group_sale_salesman"/>
-            <field eval="True" name="perm_read"/>
-            <field eval="True" name="perm_write"/>
-            <field eval="True" name="perm_create"/>
-            <field eval="False" name="perm_unlink"/>
-        </record>
-        
-        <!-- Sales order security -->
-        <record id="access_sale_order" model="ir.model.access">
-            <field name="name">Sale Order</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order')]"/>
-            <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_sale_order_sale_manager" model="ir.model.access">
-            <field name="name">Sale Order</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order')]"/>
-            <field name="group_id" ref="group_sale_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_sale_order_salesman" model="ir.model.access">
-            <field name="name">Sale Order</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order')]"/>
-            <field name="group_id" ref="group_sale_salesman"/>
-            <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>
-        
-        <!-- Sales order line security -->
-        <record id="access_sale_order_line" model="ir.model.access">
-            <field name="name">Sale Order Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order.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_sale_order_line_manager" model="ir.model.access">
-            <field name="name">Sale Order Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order.line')]"/>
-            <field name="group_id" ref="group_sale_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_sale_order_line_salesman" model="ir.model.access">
-            <field name="name">Sale Order Line</field>
-            <field model="ir.model" name="model_id" search="[('model', '=', 'sale.order.line')]"/>
-            <field name="group_id" ref="group_sale_salesman"/>
-            <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>
-</terp>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?><terp><data noupdate="1">
+    <record id="group_sale_salesman" model="res.groups">
+        <field name="name">Salesman</field>
+    </record>
+
+<!--
+ Object Groups
+-->
+    <record model="ir.model" id="stock.model_stock_move">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="account.model_account_invoice">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_sale_order">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="account.model_account_invoice_tax">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="model_sale_order_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="account.model_account_invoice_line">
+        <field name="type">addons</field>
+    </record>
+    <record model="ir.model" id="mrp.model_mrp_procurement">
+        <field name="type">addons</field>
+    </record>
+<!--
+ Object Access
+-->
+    <record model="ir.model.access" id="access_account_invoice_group_sale_salesman">
+        <field name="name">account_invoice group_sale_salesman</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_invoice"/>
+        <field name="group_id" ref="group_sale_salesman"/>
+        <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_invoice_account.group_sale_manager">
+        <field name="name">account_invoice account.group_sale_manager</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_invoice"/>
+        <field name="group_id" ref="account.group_sale_manager"/>
+        <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_invoice_line_group_sale_salesman">
+        <field name="name">account_invoice_line group_sale_salesman</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_invoice_line"/>
+        <field name="group_id" ref="group_sale_salesman"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+    <record model="ir.model.access" id="access_account_invoice_line_account.group_sale_manager">
+        <field name="name">account_invoice_line account.group_sale_manager</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_invoice_line"/>
+        <field name="group_id" ref="account.group_sale_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+    <record model="ir.model.access" id="access_account_invoice_tax_account.group_sale_manager">
+        <field name="name">account_invoice_tax account.group_sale_manager</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_invoice_tax"/>
+        <field name="group_id" ref="account.group_sale_manager"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+    <record model="ir.model.access" id="access_account_invoice_tax_group_sale_salesman">
+        <field name="name">account_invoice_tax group_sale_salesman</field>
+        <field name="model_id" model="ir.model" ref="account.model_account_invoice_tax"/>
+        <field name="group_id" ref="group_sale_salesman"/>
+        <field name="perm_read" eval="1"/>
+        <field name="perm_write" eval="0"/>
+        <field name="perm_create" eval="1"/>
+        <field name="perm_unlink" eval="0"/>
+    </record>
+    <record model="ir.model.access" id="access_mrp_procurement_account.group_sale_manager">
+        <field name="name">mrp_procurement account.group_sale_manager</field>
+        <field name="model_id" model="ir.model" ref="mrp.model_mrp_procurement"/>
+        <field name="group_id" ref="account.group_sale_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_mrp_procurement_group_sale_salesman">
+        <field name="name">mrp_procurement group_sale_salesman</field>
+        <field name="model_id" model="ir.model" ref="mrp.model_mrp_procurement"/>
+        <field name="group_id" ref="group_sale_salesman"/>
+        <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_sale_order_account.group_sale_manager">
+        <field name="name">sale_order account.group_sale_manager</field>
+        <field name="model_id" model="ir.model" ref="model_sale_order"/>
+        <field name="group_id" ref="account.group_sale_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_sale_order_base.group_employee">
+        <field name="name">sale_order base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_sale_order"/>
+        <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_sale_order_line_group_sale_salesman">
+        <field name="name">sale_order_line group_sale_salesman</field>
+        <field name="model_id" model="ir.model" ref="model_sale_order_line"/>
+        <field name="group_id" ref="group_sale_salesman"/>
+        <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_sale_order_line_account.group_sale_manager">
+        <field name="name">sale_order_line account.group_sale_manager</field>
+        <field name="model_id" model="ir.model" ref="model_sale_order_line"/>
+        <field name="group_id" ref="account.group_sale_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_sale_order_line_base.group_employee">
+        <field name="name">sale_order_line base.group_employee</field>
+        <field name="model_id" model="ir.model" ref="model_sale_order_line"/>
+        <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_stock_move_account.group_sale_manager">
+        <field name="name">stock_move account.group_sale_manager</field>
+        <field name="model_id" model="ir.model" ref="stock.model_stock_move"/>
+        <field name="group_id" ref="account.group_sale_manager"/>
+        <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_stock_move_group_sale_salesman">
+        <field name="name">stock_move group_sale_salesman</field>
+        <field name="model_id" model="ir.model" ref="stock.model_stock_move"/>
+        <field name="group_id" ref="group_sale_salesman"/>
+        <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