Improved Security

bzr revid: fp@tinyerp.com-20080903180400-df7l6wxg1zpirmmi

138 files changed, 362 insertions, 343 deletions

diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index 51175f1268b..1c9d7254f33 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -41,7 +41,6 @@
     "website" : "http://tinyerp.com/module_account.html",
     "category" : "Generic Modules/Accounting",
     "init_xml" : [
-        
     ],
     "demo_xml" : [
         "account_demo.xml",
@@ -50,6 +49,8 @@
         "account_unit_test.xml",
     ],
     "update_xml" : [
+        "security/account_security.xml",
+        "security/ir.model.access.csv",
         "account_wizard.xml",
         "account_view.xml",
         "account_end_fy.xml",
@@ -65,7 +66,6 @@
         "project/project_report.xml",
         "product_data.xml",
         "product_view.xml",
-        "account_security.xml",
         "account_assert_test.xml",
     ],
     "translations" : {
diff --git a/addons/account/account_security.xml b/addons/account/security/account_security.xml
index 5fc01afd83d..626f9529845 100644
--- a/addons/account/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -22,4 +22,4 @@
     <record id="group_account_payment" model="res.groups">
         <field name="name">Account Payment</field>
     </record>
-</data></terp>
\ No newline at end of file
+</data></terp>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
new file mode 100644
index 00000000000..ee748b1ec8a
--- /dev/null
+++ b/addons/account/security/ir.model.access.csv
@@ -0,0 +1,46 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_account_payment_term,account.payment.term,model_account_payment_term,base.group_user,1,0,0,0

+access_account_payment_term_line,account.payment.term.line,model_account_payment_term_line,base.group_user,1,0,0,0

+access_account_account_type,account.account.type,model_account_account_type,base.group_user,1,0,0,0

+access_account_tax,account.tax,model_account_tax,base.group_user,1,0,0,0

+access_account_account,account.account,model_account_account,base.group_user,1,0,0,0

+access_account_journal_view,account.journal.view,model_account_journal_view,base.group_user,1,0,0,0

+access_account_journal_column,account.journal.column,model_account_journal_column,base.group_user,1,0,0,0

+access_account_journal,account.journal,model_account_journal,base.group_user,1,0,0,0

+access_account_period,account.period,model_account_period,base.group_user,1,0,0,0

+access_account_journal_period,account.journal.period,model_account_journal_period,base.group_user,1,0,0,0

+access_account_move,account.move,model_account_move,base.group_user,1,0,0,0

+access_account_move_reconcile,account.move.reconcile,model_account_move_reconcile,base.group_user,1,0,0,0

+access_account_tax_code,account.tax.code,model_account_tax_code,base.group_user,1,0,0,0

+access_account_tax,account.tax,model_account_tax,base.group_user,1,0,0,0

+access_account_budget_post,account.budget.post,model_account_budget_post,base.group_user,1,0,0,0

+access_account_budget_post_dotation,account.budget.post.dotation,model_account_budget_post_dotation,base.group_user,1,0,0,0

+access_account_model,account.model,model_account_model,base.group_user,1,0,0,0

+access_account_model_line,account.model.line,model_account_model_line,base.group_user,1,0,0,0

+access_account_subscription,account.subscription,model_account_subscription,base.group_user,1,0,0,0

+access_account_subscription_line,account.subscription.line,model_account_subscription_line,base.group_user,1,0,0,0

+access_account_config_fiscalyear,account.config.fiscalyear,model_account_config_fiscalyear,base.group_user,1,0,0,0

+access_account_config_journal_bank_account,account.config.journal.bank.account,model_account_config_journal_bank_account,base.group_user,1,0,0,0

+access_account_config_journal_bank_account_line,account.config.journal.bank.account.line,model_account_config_journal_bank_account_line,base.group_user,1,0,0,0

+access_account_tax_template,account.tax.template,model_account_tax_template,base.group_user,1,0,0,0

+access_account_account_template,account.account.template,model_account_account_template,base.group_user,1,0,0,0

+access_account_tax_code_template,account.tax.code.template,model_account_tax_code_template,base.group_user,1,0,0,0

+access_account_chart_template,account.chart.template,model_account_chart_template,base.group_user,1,0,0,0

+access_account_tax_template,account.tax.template,model_account_tax_template,base.group_user,1,0,0,0

+access_wizard_multi_charts_accounts,wizard.multi.charts.accounts,model_wizard_multi_charts_accounts,base.group_user,1,0,0,0

+access_account_bank_accounts_wizard,account.bank.accounts.wizard,model_account_bank_accounts_wizard,base.group_user,1,0,0,0

+access_wizard_account_chart_duplicate,wizard.account.chart.duplicate,model_wizard_account_chart_duplicate,base.group_user,1,0,0,0

+access_account_move_line,account.move.line,model_account_move_line,base.group_user,1,0,0,0

+access_account_bank_statement,account.bank.statement,model_account_bank_statement,base.group_user,1,0,0,0

+access_account_bank_statement_reconcile,account.bank.statement.reconcile,model_account_bank_statement_reconcile,base.group_user,1,0,0,0

+access_account_bank_statement_reconcile_line,account.bank.statement.reconcile.line,model_account_bank_statement_reconcile_line,base.group_user,1,0,0,0

+access_account_bank_statement_line,account.bank.statement.line,model_account_bank_statement_line,base.group_user,1,0,0,0

+access_account_analytic_line,account.analytic.line,model_account_analytic_line,base.group_user,1,0,0,0

+access_report_hr_timesheet_invoice_journal,report.hr.timesheet.invoice.journal,model_report_hr_timesheet_invoice_journal,base.group_user,1,0,0,0

+access_account_invoice,account.invoice,model_account_invoice,base.group_user,1,0,0,0

+access_account_invoice_line,account.invoice.line,model_account_invoice_line,base.group_user,1,0,0,0

+access_account_invoice_tax,account.invoice.tax,model_account_invoice_tax,base.group_user,1,0,0,0

+access_account_analytic_account,account.analytic.account,model_account_analytic_account,base.group_user,1,0,0,0

+access_account_analytic_journal,account.analytic.journal,model_account_analytic_journal,base.group_user,1,0,0,0

+access_account_analytic_budget_post,account.analytic.budget.post,model_account_analytic_budget_post,base.group_user,1,0,0,0

+access_account_analytic_budget_post_dotation,account.analytic.budget.post.dotation,model_account_analytic_budget_post_dotation,base.group_user,1,0,0,0

diff --git a/addons/account_analytic_analysis/__terp__.py b/addons/account_analytic_analysis/__terp__.py
index 6e876cac931..f5f86907e38 100644
--- a/addons/account_analytic_analysis/__terp__.py
+++ b/addons/account_analytic_analysis/__terp__.py
@@ -39,9 +39,9 @@ Add menu to show relevant information for each manager.""",
     "depends" : ["account","hr_timesheet","hr_timesheet_invoice"],
     "init_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "account_analytic_analysis_view.xml",
         "account_analytic_analysis_menu.xml",
-        "ir.model.access.csv",
     ],
     "demo_xml" : [],
     "active": False,
diff --git a/addons/account_analytic_analysis/ir.model.access.csv b/addons/account_analytic_analysis/ir.model.access.csv
deleted file mode 100644
index 4a08a4aa60d..00000000000
--- a/addons/account_analytic_analysis/ir.model.access.csv
+++ /dev/null
@@ -1 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv
new file mode 100644
index 00000000000..4607e579b0a
--- /dev/null
+++ b/addons/account_analytic_analysis/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,base.group_user,1,0,0,0

+access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,base.group_user,1,0,0,0

diff --git a/addons/account_analytic_default/__terp__.py b/addons/account_analytic_default/__terp__.py
index 3327219ba38..80b0003bd9d 100644
--- a/addons/account_analytic_default/__terp__.py
+++ b/addons/account_analytic_default/__terp__.py
@@ -16,7 +16,9 @@ Allows to automatically select analytic accounts based on criterions:
     "depends" : ['account'],
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : ["account_analytic_default_view.xml"],
+    "update_xml" : [
+        "security/ir.model.access.csv",
+        "account_analytic_default_view.xml"],
     "active": False,
     "installable": True
 }
diff --git a/addons/account_analytic_default/security/ir.model.access.csv b/addons/account_analytic_default/security/ir.model.access.csv
new file mode 100644
index 00000000000..6e4593271f7
--- /dev/null
+++ b/addons/account_analytic_default/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_account_analytic_default,account.analytic.default,model_account_analytic_default,base.group_user,1,0,0,0

diff --git a/addons/account_analytic_plans/__terp__.py b/addons/account_analytic_plans/__terp__.py
index 389835a27e6..a24cd611a01 100644
--- a/addons/account_analytic_plans/__terp__.py
+++ b/addons/account_analytic_plans/__terp__.py
@@ -39,7 +39,7 @@ for one account entry.
     "demo_xml" : [
     ],
     "update_xml" : [
-        "ir.model.access.csv",
+        "security/ir.model.access.csv",
     "model_wizard.xml","account_analytic_plans_view.xml",
     "account_analytic_plans_report.xml"],
 
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index cc568c70a2a..bef4809668d 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -89,7 +89,7 @@ account_analytic_plan_line()
 
 class account_analytic_plan_instance(osv.osv):
     _name='account.analytic.plan.instance'
-    _description = 'Object for create analytic entries from invoice lines'
+    _description = 'Analytic Plan Instance'
     _columns={
         'name':fields.char('Analytic Distribution',size=64),
         'code':fields.char('Distribution Code',size=16),
@@ -217,7 +217,7 @@ account_analytic_plan_instance()
 
 class account_analytic_plan_instance_line(osv.osv):
     _name='account.analytic.plan.instance.line'
-    _description = 'Object for create analytic entries from invoice lines'
+    _description = 'Analytic Instance Line'
     _columns={
         'plan_id':fields.many2one('account.analytic.plan.instance','Plan Id'),
         'analytic_account_id':fields.many2one('account.analytic.account','Analytic Account', required=True),
diff --git a/addons/account_analytic_plans/ir.model.access.csv b/addons/account_analytic_plans/security/ir.model.access.csv
index 73e19bb3d93..73e19bb3d93 100644
--- a/addons/account_analytic_plans/ir.model.access.csv
+++ b/addons/account_analytic_plans/security/ir.model.access.csv
diff --git a/addons/account_budget_crossover/__terp__.py b/addons/account_budget_crossover/__terp__.py
index f21b27bf0a1..94139ce16c5 100644
--- a/addons/account_budget_crossover/__terp__.py
+++ b/addons/account_budget_crossover/__terp__.py
@@ -23,8 +23,9 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
-        "ir.model.access.csv",
-"crossovered_budget_view.xml","crossovered_budget_report.xml","crossovered_budget_workflow.xml"],
+        "security/ir.model.access.csv",
+        "crossovered_budget_view.xml","crossovered_budget_report.xml","crossovered_budget_workflow.xml"
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/account_budget_crossover/ir.model.access.csv b/addons/account_budget_crossover/security/ir.model.access.csv
index d8be1f31b2e..d8be1f31b2e 100644
--- a/addons/account_budget_crossover/ir.model.access.csv
+++ b/addons/account_budget_crossover/security/ir.model.access.csv
diff --git a/addons/account_followup/__terp__.py b/addons/account_followup/__terp__.py
index 32509316eae..a1b6713ca83 100644
--- a/addons/account_followup/__terp__.py
+++ b/addons/account_followup/__terp__.py
@@ -49,6 +49,7 @@
     "init_xml" : [],
     "demo_xml" : ["followup_demo.xml"],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "followup_view.xml",
         "followup_report_view.xml"
     ],
diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv
new file mode 100644
index 00000000000..7071bf724ee
--- /dev/null
+++ b/addons/account_followup/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_account_followup_stat,account_followup.stat,model_account_followup_stat,base.group_user,1,0,0,0

+access_account_followup_followup,account_followup.followup,model_account_followup_followup,base.group_user,1,0,0,0

+access_account_followup_followup_line,account_followup.followup.line,model_account_followup_followup_line,base.group_user,1,0,0,0

diff --git a/addons/account_invoice_layout/__terp__.py b/addons/account_invoice_layout/__terp__.py
index 865f9df4a17..201cb3caf19 100644
--- a/addons/account_invoice_layout/__terp__.py
+++ b/addons/account_invoice_layout/__terp__.py
@@ -20,11 +20,10 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
-        "ir.model.access.csv",
-
-                    "account_invoice_layout_view.xml",
-                    "account_invoice_layout_report.xml",
-                    ],
+        "security/ir.model.access.csv",
+        "account_invoice_layout_view.xml",
+        "account_invoice_layout_report.xml",
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/account_invoice_layout/ir.model.access.csv b/addons/account_invoice_layout/security/ir.model.access.csv
index 0b84973b841..0b84973b841 100644
--- a/addons/account_invoice_layout/ir.model.access.csv
+++ b/addons/account_invoice_layout/security/ir.model.access.csv
diff --git a/addons/account_payment/__terp__.py b/addons/account_payment/__terp__.py
index 45196108416..625ab9048c5 100644
--- a/addons/account_payment/__terp__.py
+++ b/addons/account_payment/__terp__.py
@@ -40,13 +40,13 @@
     """,
     "demo_xml": [],
     "update_xml": [
+        "security/ir.model.access.csv",
         "payment_wizard.xml",
         "payment_view.xml",
         "payment_workflow.xml",
         "payment_sequence.xml",
         "account_invoice_view.xml",
         "payment_report.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/account_payment/ir.model.access.csv b/addons/account_payment/security/ir.model.access.csv
index 4b578e2d33f..4b578e2d33f 100644
--- a/addons/account_payment/ir.model.access.csv
+++ b/addons/account_payment/security/ir.model.access.csv
diff --git a/addons/account_report/__terp__.py b/addons/account_report/__terp__.py
index 1018b57ae6b..852bc422fef 100644
--- a/addons/account_report/__terp__.py
+++ b/addons/account_report/__terp__.py
@@ -37,9 +37,9 @@
     "init_xml" : [ ],
     "demo_xml" : [ ],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "account_view.xml",
         "account_report.xml",
-        "ir.model.access.csv",
     ],
 #   "translations" : {
 #       "fr": "i18n/french_fr.csv"
diff --git a/addons/account_report/ir.model.access.csv b/addons/account_report/security/ir.model.access.csv
index aeb498cde5a..aeb498cde5a 100644
--- a/addons/account_report/ir.model.access.csv
+++ b/addons/account_report/security/ir.model.access.csv
diff --git a/addons/account_reporting/__terp__.py b/addons/account_reporting/__terp__.py
index 8192cb331dd..8106ea1daaf 100644
--- a/addons/account_reporting/__terp__.py
+++ b/addons/account_reporting/__terp__.py
@@ -9,12 +9,11 @@
     "init_xml" : [ ],
     "demo_xml" : [ ],
     "update_xml" : [
-        "ir.model.access.csv",
-
-                    "account_view.xml",
-                    "account_report.xml",
-                    "account_data.xml",
-                    ],
+        "security/ir.model.access.csv",
+        "account_view.xml",
+        "account_report.xml",
+        "account_data.xml",
+    ],
 #   "translations" : {
 #       "fr": "i18n/french_fr.csv"
 #   },
diff --git a/addons/account_reporting/ir.model.access.csv b/addons/account_reporting/security/ir.model.access.csv
index ef9f29f8bef..ef9f29f8bef 100644
--- a/addons/account_reporting/ir.model.access.csv
+++ b/addons/account_reporting/security/ir.model.access.csv
diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py
index a8ee09a4a46..fd2d7295c87 100644
--- a/addons/auction/__terp__.py
+++ b/addons/auction/__terp__.py
@@ -4,8 +4,9 @@
     "version" : "1.0",
     "depends" : ["base","account","l10n_be","hr"],
     "update_xml" : [
-        "ir.model.access.csv",
-"auction_view.xml", "auction_report.xml", "auction_wizard.xml"],
+        "security/ir.model.access.csv"
+        "auction_view.xml", "auction_report.xml", "auction_wizard.xml"
+    ],
     "demo_xml" : [
         "auction_demo.xml"
     ],
diff --git a/addons/auction/ir.model.access.csv b/addons/auction/security/ir.model.access.csv
index 87826f27557..87826f27557 100644
--- a/addons/auction/ir.model.access.csv
+++ b/addons/auction/security/ir.model.access.csv
diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py
index 9a680206a30..3b1e3af9e69 100644
--- a/addons/base_contact/__terp__.py
+++ b/addons/base_contact/__terp__.py
@@ -23,8 +23,9 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
-        "ir.model.access.csv",
-'base_contact_view.xml'],
+        "security/ir.model.access.csv",
+        'base_contact_view.xml'
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/base_contact/ir.model.access.csv b/addons/base_contact/security/ir.model.access.csv
index 1f1de402570..1f1de402570 100644
--- a/addons/base_contact/ir.model.access.csv
+++ b/addons/base_contact/security/ir.model.access.csv
diff --git a/addons/base_module_record/__terp__.py b/addons/base_module_record/__terp__.py
index 625e0bdd8e8..1e45964707b 100644
--- a/addons/base_module_record/__terp__.py
+++ b/addons/base_module_record/__terp__.py
@@ -28,8 +28,9 @@ How to use it:
     "init_xml" : [ ],
     "demo_xml" : [ ],
     "update_xml" : [
-        "ir.model.access.csv",
- "base_module_record_wizard.xml" ],
+        "security/ir.model.access.csv",
+         "base_module_record_wizard.xml"
+    ],
     "installable": True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_record/ir.model.access.csv b/addons/base_module_record/security/ir.model.access.csv
index 29dfb1835ca..29dfb1835ca 100644
--- a/addons/base_module_record/ir.model.access.csv
+++ b/addons/base_module_record/security/ir.model.access.csv
diff --git a/addons/base_report_creator/__terp__.py b/addons/base_report_creator/__terp__.py
index d2194245de1..ba202f0a679 100644
--- a/addons/base_report_creator/__terp__.py
+++ b/addons/base_report_creator/__terp__.py
@@ -15,7 +15,11 @@ the "Dashboard" menu.
     "depends" : ["base","board"],
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : ["base_report_creator_wizard.xml","base_report_creator_view.xml"],
+    "update_xml" : [
+        "security/ir.model.access.csv",
+        "base_report_creator_wizard.xml",
+        "base_report_creator_view.xml"
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/base_report_creator/security/ir.model.access.csv b/addons/base_report_creator/security/ir.model.access.csv
new file mode 100644
index 00000000000..0d85b179b11
--- /dev/null
+++ b/addons/base_report_creator/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_base_report_creator_report,base_report_creator.report,model_base_report_creator_report,base.group_user,1,0,0,0

+access_base_report_creator_report_fields,base_report_creator.report.fields,model_base_report_creator_report_fields,base.group_user,1,0,0,0

+access_base_report_creator_report_filter,base_report_creator.report.filter,model_base_report_creator_report_filter,base.group_user,1,0,0,0

diff --git a/addons/base_setup/__terp__.py b/addons/base_setup/__terp__.py
index 614241dc4cc..d85fe582726 100644
--- a/addons/base_setup/__terp__.py
+++ b/addons/base_setup/__terp__.py
@@ -53,6 +53,7 @@
         "base_setup_demo.xml",
     ],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "base_setup_wizard.xml",
     ],
     "active": True,
diff --git a/addons/base_setup/security/ir.model.access.csv b/addons/base_setup/security/ir.model.access.csv
new file mode 100644
index 00000000000..fd7a609b49a
--- /dev/null
+++ b/addons/base_setup/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_base_setup_base_setup,base_setup.base_setup,model_base_setup_base_setup,base.group_user,1,0,0,0

diff --git a/addons/board/__terp__.py b/addons/board/__terp__.py
index fe5af4c38fb..e2264429639 100644
--- a/addons/board/__terp__.py
+++ b/addons/board/__terp__.py
@@ -33,7 +33,9 @@
     "category":"Board/Base",
     "depends":["base"],
     "demo_xml":[],
-    "update_xml":["board_view.xml"],
+    "update_xml":[
+        "security/ir.model.access.csv",
+        "board_view.xml"],
     "description": "Base module for all dashboards.",
     "active":False,
     "installable":True,
diff --git a/addons/board/board_security.xml b/addons/board/board_security.xml
deleted file mode 100644
index e7af75ff548..00000000000
--- a/addons/board/board_security.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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>
-
-    <record model="res.groups" id="group_board_manager">
-        <field name="name">Board Manager</field>
-    </record>
-
-<!--
- Object Access
--->
-    <record model="ir.model.access" id="access_board_board_group_board">
-        <field name="name">board_board group_board</field>
-        <field name="model_id" model="ir.model" ref="model_board_board"/>
-        <field name="group_id" ref="group_board"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-    <record model="ir.model.access" id="access_board_board_group_board_manager">
-        <field name="name">board_board group_board_manager</field>
-        <field name="model_id" model="ir.model" ref="model_board_board"/>
-        <field name="group_id" ref="group_board_manager"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="1"/>
-        <field name="perm_create" eval="1"/>
-        <field name="perm_unlink" eval="1"/>
-    </record>
-    <record model="ir.model.access" id="access_board_note_group_board">
-        <field name="name">board_note group_board</field>
-        <field name="model_id" model="ir.model" ref="model_board_note"/>
-        <field name="group_id" ref="group_board"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-    <record model="ir.model.access" id="access_board_note_group_board_manager">
-        <field name="name">board_note group_board_manager</field>
-        <field name="model_id" model="ir.model" ref="model_board_note"/>
-        <field name="group_id" ref="group_board_manager"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="1"/>
-        <field name="perm_create" eval="1"/>
-        <field name="perm_unlink" eval="1"/>
-    </record>
-    <record model="ir.model.access" id="access_board_note_type_group_board">
-        <field name="name">board_note_type group_board</field>
-        <field name="model_id" model="ir.model" ref="model_board_note_type"/>
-        <field name="group_id" ref="group_board"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="0"/>
-        <field name="perm_create" eval="0"/>
-        <field name="perm_unlink" eval="0"/>
-    </record>
-    <record model="ir.model.access" id="access_board_note_type_group_board_manager">
-        <field name="name">board_note_type group_board_manager</field>
-        <field name="model_id" model="ir.model" ref="model_board_note_type"/>
-        <field name="group_id" ref="group_board_manager"/>
-        <field name="perm_read" eval="1"/>
-        <field name="perm_write" eval="1"/>
-        <field name="perm_create" eval="1"/>
-        <field name="perm_unlink" eval="1"/>
-    </record>
-</data></terp>
\ No newline at end of file
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
new file mode 100644
index 00000000000..44762892edf
--- /dev/null
+++ b/addons/board/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_board_board,board.board,model_board_board,base.group_user,1,0,0,0

+access_board_board_line,board.board.line,model_board_board_line,base.group_user,1,0,0,0

+access_board_note_type,board.note.type,model_board_note_type,base.group_user,1,0,0,0

+access_board_note,board.note,model_board_note,base.group_user,1,0,0,0

diff --git a/addons/crm/__terp__.py b/addons/crm/__terp__.py
index 399e6c4d01b..8932a7c2131 100644
--- a/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@ -52,7 +52,13 @@ between mails and Tiny ERP.""",
     "depends" : ["base"],
     "init_xml" : ["crm_data.xml"],
     "demo_xml" : ["crm_demo.xml"],
-    "update_xml" : ["crm_view.xml", "crm_report.xml", "crm_wizard.xml", "crm_security.xml"],
+    "update_xml" : [
+        "security/crm_security.xml",
+        "security/ir.model.access.csv",
+        "crm_view.xml",
+        "crm_report.xml",
+        "crm_wizard.xml",
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/crm/crm_security.xml b/addons/crm/security/crm_security.xml
index 75364d35e53..75364d35e53 100644
--- a/addons/crm/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
new file mode 100644
index 00000000000..3bb6fb0fb77
--- /dev/null
+++ b/addons/crm/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_crm_segmentation,crm.segmentation,model_crm_segmentation,base.group_user,1,0,0,0

+access_crm_segmentation_line,crm.segmentation.line,model_crm_segmentation_line,base.group_user,1,0,0,0

+access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0

+access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0

+access_crm_case_rule,crm.case.rule,model_crm_case_rule,base.group_user,1,0,0,0

+access_crm_case,crm.case,model_crm_case,base.group_user,1,0,0,0

+access_crm_case_log,crm.case.log,model_crm_case_log,base.group_user,1,0,0,0

+access_crm_case_history,crm.case.history,model_crm_case_history,base.group_user,1,0,0,0

diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py
index 7a188bb731e..f37463a9ac7 100644
--- a/addons/crm_configuration/__terp__.py
+++ b/addons/crm_configuration/__terp__.py
@@ -11,30 +11,29 @@
                    identification, prioritization, assignment, resolution and notification.""",
     "depends" : ["crm","report_crm"],
     "init_xml" : [
-                    "crm_bugs_view.xml",
-                    "crm_jobs_view.xml",
-                    "crm_lead_view.xml",
-                    "crm_meeting_view.xml",
-                    "crm_opportunity_view.xml",
-                    "crm_fund_view.xml"
-                 ],
+        "crm_bugs_view.xml",
+        "crm_jobs_view.xml",
+        "crm_lead_view.xml",
+        "crm_meeting_view.xml",
+        "crm_opportunity_view.xml",
+        "crm_fund_view.xml"
+    ],
     "demo_xml" : [
-                    "crm_bugs_data.xml",
-                    "crm_jobs_data.xml",
-                    "crm_meeting_data.xml",
-                    "crm_lead_data.xml",
-                    "crm_opportunity_data.xml"
-                  ],
+        "crm_bugs_data.xml",
+        "crm_jobs_data.xml",
+        "crm_meeting_data.xml",
+        "crm_lead_data.xml",
+        "crm_opportunity_data.xml"
+    ],
     "update_xml" : [
-        "ir.model.access.csv",
-
-                    "crm_bugs_demo.xml",
-                    "crm_jobs_demo.xml",
-                    "crm_lead_demo.xml",
-                    "crm_meeting_demo.xml",
-                    "crm_opportunity_demo.xml",
-                    "crm_report_view.xml"
-                    ],
+        "security/ir.model.access.csv",
+        "crm_bugs_demo.xml",
+        "crm_jobs_demo.xml",
+        "crm_lead_demo.xml",
+        "crm_meeting_demo.xml",
+        "crm_opportunity_demo.xml",
+        "crm_report_view.xml"
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/crm_configuration/ir.model.access.csv b/addons/crm_configuration/security/ir.model.access.csv
index 21a8937f9c1..21a8937f9c1 100644
--- a/addons/crm_configuration/ir.model.access.csv
+++ b/addons/crm_configuration/security/ir.model.access.csv
diff --git a/addons/crm_profiling/__terp__.py b/addons/crm_profiling/__terp__.py
index c46623864d2..4eab34b9d0e 100644
--- a/addons/crm_profiling/__terp__.py
+++ b/addons/crm_profiling/__terp__.py
@@ -21,8 +21,9 @@
     "init_xml" : [],
     "demo_xml" : ["crm_profiling_demo.xml"],
     "update_xml" : [
-                    "crm_profiling_view.xml",
-                    ],
+        "security/ir.model.access.csv",
+        "crm_profiling_view.xml",
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv
new file mode 100644
index 00000000000..912780b2c65
--- /dev/null
+++ b/addons/crm_profiling/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_crm_profiling_question,crm_profiling.question,model_crm_profiling_question,base.group_user,1,0,0,0

+access_crm_profiling_questionnaire,crm_profiling.questionnaire,model_crm_profiling_questionnaire,base.group_user,1,0,0,0

+access_crm_profiling_answer,crm_profiling.answer,model_crm_profiling_answer,base.group_user,1,0,0,0

diff --git a/addons/custom/custom_view.xml b/addons/custom/custom_view.xml
index 8a08256ce74..0931ca23fb7 100644
--- a/addons/custom/custom_view.xml
+++ b/addons/custom/custom_view.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <terp>
     <data>
-        <record id="group_compta_user" model="res.groups">
-            <field name="name">grcompta</field>
-        </record>
-        <record id="group_compta_admin" model="res.groups">
-            <field name="name">grcomptaadmin</field>
-        </record>
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/delivery/__terp__.py b/addons/delivery/__terp__.py
index 7923b840292..d5b5ee5a390 100644
--- a/addons/delivery/__terp__.py
+++ b/addons/delivery/__terp__.py
@@ -36,10 +36,10 @@
     "init_xml" : ["delivery_data.xml"],
     "demo_xml" : ["delivery_demo.xml"],
     "update_xml" : [
+        "security/ir.model.access.csv"
         "delivery_view.xml",
         "delivery_wizard.xml",
         "partner_view.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True,
diff --git a/addons/delivery/ir.model.access.csv b/addons/delivery/security/ir.model.access.csv
index 6333814759c..6333814759c 100644
--- a/addons/delivery/ir.model.access.csv
+++ b/addons/delivery/security/ir.model.access.csv
diff --git a/addons/event/__terp__.py b/addons/event/__terp__.py
index 102b973b572..2a175085a08 100644
--- a/addons/event/__terp__.py
+++ b/addons/event/__terp__.py
@@ -24,8 +24,7 @@
     "demo_xml" : ["event_demo.xml"],
     "init_xml" : ["event_data.xml"],
     "update_xml" : [
-        "ir.model.access.csv",
-
+        "security/ir.model.access.csv"
         "event_wizard.xml","event_view.xml","event_sequence.xml"
     ],
     "active" : False,
diff --git a/addons/event/ir.model.access.csv b/addons/event/security/ir.model.access.csv
index 32994e277b8..32994e277b8 100644
--- a/addons/event/ir.model.access.csv
+++ b/addons/event/security/ir.model.access.csv
diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py
index bbabcddb466..cb8f183f672 100644
--- a/addons/hr/__terp__.py
+++ b/addons/hr/__terp__.py
@@ -47,6 +47,8 @@
         "hr_department_demo.xml",
     ],
     "update_xml" : [
+        "security/ir.model.access.csv",
+        "security/hr_security.xml",
         "hr_view.xml", 
         "hr_report.xml", 
         "hr_wizard.xml",
diff --git a/addons/hr/hr_security.xml b/addons/hr/security/hr_security.xml
index 4ec02e7aa55..4ec02e7aa55 100644
--- a/addons/hr/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
new file mode 100644
index 00000000000..7e29f18ecc9
--- /dev/null
+++ b/addons/hr/security/ir.model.access.csv
@@ -0,0 +1,8 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_hr_timesheet_group,hr.timesheet.group,model_hr_timesheet_group,base.group_user,1,0,0,0

+access_hr_employee_category,hr.employee.category,model_hr_employee_category,base.group_user,1,0,0,0

+access_hr_employee,hr.employee,model_hr_employee,base.group_user,1,0,0,0

+access_hr_timesheet,hr.timesheet,model_hr_timesheet,base.group_user,1,0,0,0

+access_hr_action_reason,hr.action.reason,model_hr_action_reason,base.group_user,1,0,0,0

+access_hr_attendance,hr.attendance,model_hr_attendance,base.group_user,1,0,0,0

+access_hr_department,hr.department,model_hr_department,base.group_user,1,0,0,0

diff --git a/addons/hr_contract/__terp__.py b/addons/hr_contract/__terp__.py
index 9087c2252b3..c07e6c55a5a 100644
--- a/addons/hr_contract/__terp__.py
+++ b/addons/hr_contract/__terp__.py
@@ -45,9 +45,9 @@
     "init_xml" : ["hr_contract_data.xml", ],
     "demo_xml" : [],
     "update_xml" : [
+        "security/hr_contract_security.xml",
+        "security/ir.model.access.csv",
         "hr_contract_view.xml",
-        "hr_contract_security.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/hr_contract/ir.model.access.csv b/addons/hr_contract/ir.model.access.csv
deleted file mode 100644
index 40130e98b21..00000000000
--- a/addons/hr_contract/ir.model.access.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_hr_contract_base.group_user,hr_contract base.group_user,model_hr_contract,base.group_user,1,0,0,0

-access_hr_contract_group_hr_manager,hr_contract group_hr_manager,model_hr_contract,group_hr_manager,1,1,1,1

-access_hr_contract_wage_type_group_hr_manager,hr_contract_wage_type group_hr_manager,model_hr_contract_wage_type,group_hr_manager,1,1,1,1

-access_hr_contract_wage_type_base.group_user,hr_contract_wage_type base.group_user,model_hr_contract_wage_type,base.group_user,1,0,0,0

-access_hr_contract_wage_type_period_group_hr_manager,hr_contract_wage_type_period group_hr_manager,model_hr_contract_wage_type_period,group_hr_manager,1,1,1,1

-access_hr_contract_wage_type_period_base.group_user,hr_contract_wage_type_period base.group_user,model_hr_contract_wage_type_period,base.group_user,1,0,0,0

-access_hr_employee_marital_status_group_hr_manager,hr_employee_marital_status group_hr_manager,model_hr_employee_marital_status,group_hr_manager,1,1,1,1

-access_hr_employee_marital_status_base.group_user,hr_employee_marital_status base.group_user,model_hr_employee_marital_status,base.group_user,1,0,0,0

diff --git a/addons/hr_contract/hr_contract_security.xml b/addons/hr_contract/security/hr_contract_security.xml
index a25f8f23a95..a25f8f23a95 100644
--- a/addons/hr_contract/hr_contract_security.xml
+++ b/addons/hr_contract/security/hr_contract_security.xml
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
new file mode 100644
index 00000000000..9be580675ad
--- /dev/null
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_hr_employee_marital_status,hr.employee.marital.status,model_hr_employee_marital_status,base.group_user,1,0,0,0

+access_hr_contract_wage_type_period,hr.contract.wage.type.period,model_hr_contract_wage_type_period,base.group_user,1,0,0,0

+access_hr_contract_wage_type,hr.contract.wage.type,model_hr_contract_wage_type,base.group_user,1,0,0,0

+access_hr_contract,hr.contract,model_hr_contract,base.group_user,1,0,0,0

diff --git a/addons/hr_expense/__terp__.py b/addons/hr_expense/__terp__.py
index 5c021248736..d9949372e72 100644
--- a/addons/hr_expense/__terp__.py
+++ b/addons/hr_expense/__terp__.py
@@ -50,11 +50,11 @@
     "init_xml" : [],
     "demo_xml" : ["hr_expense_demo.xml", "hr.expense.expense.csv"],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "hr_expense_sequence.xml",
         "hr_expense_workflow.xml",
         "hr_expense_view.xml",
         "hr_expense_report.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/hr_expense/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 6539e7ac526..6539e7ac526 100644
--- a/addons/hr_expense/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index f4308488513..dd4d6d796a5 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -27,7 +27,7 @@
     "depends" : ["hr","crm_configuration"],
     "init_xml" : [],
     "update_xml" : [
-        "ir.model.access.csv",
+        "security/ir.model.access.csv",
         "hr_workflow.xml",
         "hr_view.xml",
         "hr_holidays_report.xml",
diff --git a/addons/hr_holidays/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 718669d5a69..718669d5a69 100644
--- a/addons/hr_holidays/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
diff --git a/addons/hr_timesheet/__terp__.py b/addons/hr_timesheet/__terp__.py
index 88ba0f4e983..0812a3578a9 100644
--- a/addons/hr_timesheet/__terp__.py
+++ b/addons/hr_timesheet/__terp__.py
@@ -47,10 +47,10 @@ to set up a management by affair.
     "init_xml" : ["hr_timesheet_data.xml"],
     "demo_xml" : ["hr_timesheet_demo.xml",],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "hr_timesheet_view.xml",
         "hr_timesheet_report.xml",
         "hr_timesheet_wizard.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/hr_timesheet/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index e3e5456432e..e3e5456432e 100644
--- a/addons/hr_timesheet/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
diff --git a/addons/hr_timesheet_invoice/__terp__.py b/addons/hr_timesheet_invoice/__terp__.py
index 81960c1b8bb..24649766504 100644
--- a/addons/hr_timesheet_invoice/__terp__.py
+++ b/addons/hr_timesheet_invoice/__terp__.py
@@ -42,6 +42,7 @@ reports, eso.""",
         'hr_timesheet_invoice_demo.xml'
     ],
     "update_xml" : [
+        "security/ir.model.access.csv",
         'hr_timesheet_invoice_view.xml',
         'hr_timesheet_invoice_wizard.xml',
         'hr_timesheet_invoice_report.xml'
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
new file mode 100644
index 00000000000..b04bcfb28b9
--- /dev/null
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_hr_timesheet_invoice_factor,hr_timesheet_invoice.factor,model_hr_timesheet_invoice_factor,base.group_user,1,0,0,0

diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py
index e9bd9dfac94..4c307a5af33 100644
--- a/addons/hr_timesheet_sheet/__terp__.py
+++ b/addons/hr_timesheet_sheet/__terp__.py
@@ -54,7 +54,11 @@ The validation can be configured in te company:
     "depends" : ["hr_timesheet", "hr_timesheet_invoice"],
     "init_xml" : [],
     "demo_xml" : ["hr_timesheet_sheet_demo.xml",],
-    "update_xml" : ["hr_timesheet_sheet_view.xml", "hr_timesheet_workflow.xml"],
+    "update_xml" : [
+        "security/ir.model.access.csv",
+        "hr_timesheet_sheet_view.xml",
+        "hr_timesheet_workflow.xml"
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
new file mode 100644
index 00000000000..d2c756587d1
--- /dev/null
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_hr_timesheet_sheet_sheet,hr_timesheet_sheet.sheet,model_hr_timesheet_sheet_sheet,base.group_user,1,0,0,0

+access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_user,1,0,0,0

+access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_user,1,0,0,0

diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py
index d24abe82159..be8b9d8b776 100644
--- a/addons/idea/__terp__.py
+++ b/addons/idea/__terp__.py
@@ -10,8 +10,10 @@
         "init_xml" : [ ],
         "demo_xml" : [ ],
         "update_xml" : [
-        "ir.model.access.csv",
-'idea_view.xml', 'idea_workflow.xml'],
+            "security/ir.model.access.csv",
+            'idea_view.xml',
+            'idea_workflow.xml'
+        ],
         "installable": True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 4b23bfa0540..4b23bfa0540 100644
--- a/addons/idea/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
diff --git a/addons/membership/__terp__.py b/addons/membership/__terp__.py
index 5b65f1d9bb3..16d2f30e61c 100644
--- a/addons/membership/__terp__.py
+++ b/addons/membership/__terp__.py
@@ -15,8 +15,8 @@
         "membership_data.xml",
         ],
     "update_xml" : [
-        "ir.model.access.csv",
-
+        "security/ir.model.access.csv"
+        "security/ir.model.access.csv",
         "membership_view.xml","membership_wizard.xml"
         ],
     "active" : False,
diff --git a/addons/membership/ir.model.access.csv b/addons/membership/ir.model.access.csv
deleted file mode 100644
index 4a08a4aa60d..00000000000
--- a/addons/membership/ir.model.access.csv
+++ /dev/null
@@ -1 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv
new file mode 100644
index 00000000000..b61ff63940f
--- /dev/null
+++ b/addons/membership/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_membership_membership_line,membership.membership_line,model_membership_membership_line,base.group_user,1,0,0,0

+access_report_partner_member_year,report.partner_member.year,model_report_partner_member_year,base.group_user,1,0,0,0

+access_report_partner_member_year_new,report.partner_member.year_new,model_report_partner_member_year_new,base.group_user,1,0,0,0

+access_report_partner_member_year_new,report.partner_member.year_new,model_report_partner_member_year_new,base.group_user,1,0,0,0

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 05b861a6373..f3fe4989e05 100644
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -62,12 +62,13 @@
     "init_xml" : [],
     "demo_xml" : ["mrp_demo.xml","mrp_order_point.xml"],
     "update_xml" : [
+        "security/mrp_security.xml",
+        "security/ir.model.access.csv",
         "mrp_workflow.xml", 
         "mrp_data.xml",
         "mrp_view.xml", 
         "mrp_wizard.xml", 
         "mrp_report.xml",
-        "mrp_security.xml",
     ],
     "active": False,
     "installable": True
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
new file mode 100644
index 00000000000..511f0ca8a1f
--- /dev/null
+++ b/addons/mrp/security/ir.model.access.csv
@@ -0,0 +1,13 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,base.group_user,1,0,0,0

+access_mrp_property_group,mrp.property.group,model_mrp_property_group,base.group_user,1,0,0,0

+access_mrp_property,mrp.property,model_mrp_property,base.group_user,1,0,0,0

+access_mrp_routing,mrp.routing,model_mrp_routing,base.group_user,1,0,0,0

+access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,base.group_user,1,0,0,0

+access_mrp_bom,mrp.bom,model_mrp_bom,base.group_user,1,0,0,0

+access_mrp_bom_revision,mrp.bom.revision,model_mrp_bom_revision,base.group_user,1,0,0,0

+access_mrp_production,mrp.production,model_mrp_production,base.group_user,1,0,0,0

+access_mrp_production_workcenter_line,mrp.production.workcenter.line,model_mrp_production_workcenter_line,base.group_user,1,0,0,0

+access_mrp_production_product_line,mrp.production.product.line,model_mrp_production_product_line,base.group_user,1,0,0,0

+access_mrp_procurement,mrp.procurement,model_mrp_procurement,base.group_user,1,0,0,0

+access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,model_stock_warehouse_orderpoint,base.group_user,1,0,0,0

diff --git a/addons/mrp/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 050fb1bc5f7..050fb1bc5f7 100644
--- a/addons/mrp/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__terp__.py
index e19e676452f..3434f17601d 100644
--- a/addons/mrp_operations/__terp__.py
+++ b/addons/mrp_operations/__terp__.py
@@ -33,7 +33,10 @@
     """,
     "init_xml" : [],
     "demo_xml" : ["mrp_operation_data.xml"],
-    "update_xml" : ["mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml"],
+    "update_xml" : [
+        "security/ir.model.access.csv",
+        "mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml"
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/mrp_operations/security/ir.model.access.csv b/addons/mrp_operations/security/ir.model.access.csv
new file mode 100644
index 00000000000..a0d701047f7
--- /dev/null
+++ b/addons/mrp_operations/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_mrp_operations_operation_code,mrp_operations.operation.code,model_mrp_operations_operation_code,base.group_user,1,0,0,0

+access_mrp_operations_operation,mrp_operations.operation,model_mrp_operations_operation,base.group_user,1,0,0,0

diff --git a/addons/point_of_sale/__terp__.py b/addons/point_of_sale/__terp__.py
index 2b0def1b195..6f088e8b4a8 100644
--- a/addons/point_of_sale/__terp__.py
+++ b/addons/point_of_sale/__terp__.py
@@ -19,8 +19,9 @@ Main features :
     "init_xml": [],
     "demo_xml": [],
     "update_xml": [
-        "ir.model.access.csv",
-"pos_report.xml", "pos_wizard.xml", "pos_view.xml", "pos_sequence.xml", "pos_data.xml", "pos_workflow.xml"],
+        "security/ir.model.access.csv",
+        "pos_report.xml", "pos_wizard.xml", "pos_view.xml", "pos_sequence.xml", "pos_data.xml", "pos_workflow.xml"
+    ],
     "installable": True,
 }
 
diff --git a/addons/point_of_sale/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 4bbbc21714d..4bbbc21714d 100644
--- a/addons/point_of_sale/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
diff --git a/addons/processus/__terp__.py b/addons/processus/__terp__.py
index 508a8dea3bc..86918db7d16 100644
--- a/addons/processus/__terp__.py
+++ b/addons/processus/__terp__.py
@@ -12,6 +12,7 @@ This module allows you to manage your processus for the end-users.
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
         'processus_view.xml',
         "processus_report.xml"],
     "active": False,
diff --git a/addons/processus/ir.model.access.csv b/addons/processus/security/ir.model.access.csv
index e092c3e2f65..eb99bc6fa7e 100644
--- a/addons/processus/ir.model.access.csv
+++ b/addons/processus/security/ir.model.access.csv
@@ -1,5 +1,5 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_processus_processus,processus.processus,model_processus_processus,base.group_user,1,0,0,0
-access_processus_node,processus.node,model_processus_node,base.group_user,1,0,0,0
-access_processus_transition,processus.transition,model_processus_transition,base.group_user,1,0,0,0
-access_processus_transition_action,processus.transition.action,model_processus_transition_action,base.group_user,1,0,0,0
\ No newline at end of file
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_processus_processus,processus.processus,model_processus_processus,base.group_user,1,0,0,0

+access_processus_node,processus.node,model_processus_node,base.group_user,1,0,0,0

+access_processus_transition,processus.transition,model_processus_transition,base.group_user,1,0,0,0

+access_processus_transition_action,processus.transition.action,model_processus_transition_action,base.group_user,1,0,0,0

diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py
index 83273f65a6c..7f19e6bf961 100644
--- a/addons/product/__terp__.py
+++ b/addons/product/__terp__.py
@@ -52,8 +52,11 @@
 
     Print product labels with barcodes.
     """,
-    "update_xml" : ["product_data.xml","product_report.xml",
-        "product_view.xml", "pricelist_view.xml","product_security.xml",
+    "update_xml" : [
+        "security/product_security.xml",
+        "security/ir.model.access.csv",
+        "product_data.xml","product_report.xml",
+        "product_view.xml", "pricelist_view.xml",
         "partner_view.xml"],
     "active": False,
     "installable": True
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index b5b8eadb6b1..6ed181e05e1 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -2,9 +2,6 @@
 <terp>
     <data noupdate="1">
         
-        <record id="group_uos" model="res.groups">
-            <field name="name">Product UOS View</field>
-        </record>
         
         <!--
 	Resource: product.uom.categ
@@ -94,4 +91,4 @@ parameter) will see those record just disappear.
         
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/product/product_security.xml b/addons/product/product_security.xml
deleted file mode 100644
index cffce5169fd..00000000000
--- a/addons/product/product_security.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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>
-</data></terp>
\ No newline at end of file
diff --git a/addons/product/security/ir.model.access.csv b/addons/product/security/ir.model.access.csv
new file mode 100644
index 00000000000..1a716b11e72
--- /dev/null
+++ b/addons/product/security/ir.model.access.csv
@@ -0,0 +1,15 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_product_uom_categ,product.uom.categ,model_product_uom_categ,base.group_user,1,0,0,0

+access_product_uom,product.uom,model_product_uom,base.group_user,1,0,0,0

+access_product_ul,product.ul,model_product_ul,base.group_user,1,0,0,0

+access_product_category,product.category,model_product_category,base.group_user,1,0,0,0

+access_product_template,product.template,model_product_template,base.group_user,1,0,0,0

+access_product_product,product.product,model_product_product,base.group_user,1,0,0,0

+access_product_packaging,product.packaging,model_product_packaging,base.group_user,1,0,0,0

+access_product_supplierinfo,product.supplierinfo,model_product_supplierinfo,base.group_user,1,0,0,0

+access_pricelist_partnerinfo,pricelist.partnerinfo,model_pricelist_partnerinfo,base.group_user,1,0,0,0

+access_product_price_type,product.price.type,model_product_price_type,base.group_user,1,0,0,0

+access_product_pricelist_type,product.pricelist.type,model_product_pricelist_type,base.group_user,1,0,0,0

+access_product_pricelist,product.pricelist,model_product_pricelist,base.group_user,1,0,0,0

+access_product_pricelist_version,product.pricelist.version,model_product_pricelist_version,base.group_user,1,0,0,0

+access_product_pricelist_item,product.pricelist.item,model_product_pricelist_item,base.group_user,1,0,0,0

diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
new file mode 100644
index 00000000000..ebb84ce07d3
--- /dev/null
+++ b/addons/product/security/product_security.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<terp>
+<data noupdate="1">
+    <record id="group_uos" model="res.groups">
+        <field name="name">Useability / Product UOS View</field>
+    </record>
+    <record id="group_product_manager" model="res.groups">
+        <field name="name">Product Manager</field>
+    </record>
+</data>
+</terp>
diff --git a/addons/profile_accounting/__terp__.py b/addons/profile_accounting/__terp__.py
index 01ccadd87ae..2df93df3432 100644
--- a/addons/profile_accounting/__terp__.py
+++ b/addons/profile_accounting/__terp__.py
@@ -33,7 +33,10 @@
     "category":"Profile",
     "depends":["account","report_analytic","board_account","account_followup",'invoice_payment_tab'],
     "demo_xml":[],
-    "update_xml":["profile_accounting.xml"],
+    "update_xml":[
+        "security/ir.model.access.csv",
+        "profile_accounting.xml"
+    ],
     "active":False,
     "installable":True,
 }
diff --git a/addons/profile_accounting/security/ir.model.access.csv b/addons/profile_accounting/security/ir.model.access.csv
new file mode 100644
index 00000000000..9da1db86488
--- /dev/null
+++ b/addons/profile_accounting/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_config_install_extra_modules,config.install_extra_modules,model_config_install_extra_modules,base.group_user,1,0,0,0

diff --git a/addons/profile_association/__terp__.py b/addons/profile_association/__terp__.py
index db1bfc86d97..b4a2410b9ff 100644
--- a/addons/profile_association/__terp__.py
+++ b/addons/profile_association/__terp__.py
@@ -6,7 +6,10 @@
     "category":"Profile",
     "depends":["membership", "event", "association_vertical", "board_association"],
     "demo_xml":[],
-    "update_xml":["profile_association.xml"],
+    "update_xml":[
+        "security/ir.model.access.csv",
+        "profile_association.xml"
+    ],
     "active":False,
     "installable":True,
     }
diff --git a/addons/profile_association/security/ir.model.access.csv b/addons/profile_association/security/ir.model.access.csv
new file mode 100644
index 00000000000..9da1db86488
--- /dev/null
+++ b/addons/profile_association/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_config_install_extra_modules,config.install_extra_modules,model_config_install_extra_modules,base.group_user,1,0,0,0

diff --git a/addons/profile_manufacturing/__terp__.py b/addons/profile_manufacturing/__terp__.py
index 4cc913ecb9d..40479ffc38f 100644
--- a/addons/profile_manufacturing/__terp__.py
+++ b/addons/profile_manufacturing/__terp__.py
@@ -33,7 +33,10 @@
     "category":"Profile",
     "depends":["mrp", "crm", "sale", "delivery","board_manufacturing"],
     "demo_xml":[],
-    "update_xml":["profile_manufacturing.xml"],
+    "update_xml":[
+        "security/ir.model.access.csv",
+        "profile_manufacturing.xml"
+    ],
     "active":False,
     "installable":True,
 }
diff --git a/addons/profile_manufacturing/security/ir.model.access.csv b/addons/profile_manufacturing/security/ir.model.access.csv
new file mode 100644
index 00000000000..9da1db86488
--- /dev/null
+++ b/addons/profile_manufacturing/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_config_install_extra_modules,config.install_extra_modules,model_config_install_extra_modules,base.group_user,1,0,0,0

diff --git a/addons/profile_service/__terp__.py b/addons/profile_service/__terp__.py
index aec85564c1a..2353e2e6731 100644
--- a/addons/profile_service/__terp__.py
+++ b/addons/profile_service/__terp__.py
@@ -43,7 +43,10 @@
     #"board_project",
     #"board_account"],
     "demo_xml":[],
-    "update_xml":["profile_service.xml"],
+    "update_xml":[
+        "security/ir.model.access.csv",
+        "profile_service.xml"
+    ],
     "active":False,
     "installable":True,
 }
diff --git a/addons/profile_service/security/ir.model.access.csv b/addons/profile_service/security/ir.model.access.csv
new file mode 100644
index 00000000000..9da1db86488
--- /dev/null
+++ b/addons/profile_service/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_config_install_extra_modules,config.install_extra_modules,model_config_install_extra_modules,base.group_user,1,0,0,0

diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py
index 66f2302eeb5..cbef75ca0e3 100644
--- a/addons/project/__terp__.py
+++ b/addons/project/__terp__.py
@@ -37,11 +37,12 @@
     "init_xml" : [],
     "demo_xml" : ["project_demo.xml"],
     "update_xml": [
+        "security/project_security.xml",
+        "security/ir.model.access.csv",
         "project_data.xml", 
         "project_wizard.xml", 
         "project_view.xml", 
         "project_report.xml", 
-        "project_security.xml"
     ],
     "active": False,
     "installable": True
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
new file mode 100644
index 00000000000..4497512e22c
--- /dev/null
+++ b/addons/project/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_project_project,project.project,model_project_project,base.group_user,1,0,0,0

+access_project_task_type,project.task.type,model_project_task_type,base.group_user,1,0,0,0

+access_project_task,project.task,model_project_task,base.group_user,1,0,0,0

+access_project_task_work,project.task.work,model_project_task_work,base.group_user,1,0,0,0

diff --git a/addons/project/project_security.xml b/addons/project/security/project_security.xml
index 44f5c17ea09..44f5c17ea09 100644
--- a/addons/project/project_security.xml
+++ b/addons/project/security/project_security.xml
diff --git a/addons/project_gtd/__terp__.py b/addons/project_gtd/__terp__.py
index 914ceb9c269..1ece222dc5a 100644
--- a/addons/project_gtd/__terp__.py
+++ b/addons/project_gtd/__terp__.py
@@ -9,8 +9,9 @@
     "init_xml" : [],
     "demo_xml" : ["project_gtd_demo.xml"],
     "update_xml": [
-        "ir.model.access.csv",
-"project_gtd_view.xml","project_gtd_wizard.xml"],
+        "security/ir.model.access.csv",
+        "project_gtd_view.xml","project_gtd_wizard.xml"
+    ],
     "active": False,
     "installable": True
 }
diff --git a/addons/project_gtd/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 3a15c2a42e1..3a15c2a42e1 100644
--- a/addons/project_gtd/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py
index 53fb104445e..d5d50f6d5f8 100644
--- a/addons/purchase/__terp__.py
+++ b/addons/purchase/__terp__.py
@@ -38,6 +38,8 @@
                   #"purchase_unit_test.xml"
                   ],
     "update_xml" : [
+        "security/purchase_security.xml",
+        "security/ir.model.access.csv",
         "purchase_workflow.xml", 
         "purchase_sequence.xml", 
         "purchase_data.xml", 
@@ -45,7 +47,6 @@
         "purchase_report.xml", 
         "purchase_wizard.xml",
         "stock_view.xml",
-        "purchase_security.xml",
         "partner_view.xml"
     ],
     "active": False,
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
new file mode 100644
index 00000000000..cf184802a3a
--- /dev/null
+++ b/addons/purchase/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_purchase_order,purchase.order,model_purchase_order,base.group_user,1,0,0,0

+access_purchase_order_line,purchase.order.line,model_purchase_order_line,base.group_user,1,0,0,0

diff --git a/addons/purchase/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index f036fc4a837..f036fc4a837 100644
--- a/addons/purchase/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
diff --git a/addons/report_account/__terp__.py b/addons/report_account/__terp__.py
index 7b9c20baf54..900a926442c 100644
--- a/addons/report_account/__terp__.py
+++ b/addons/report_account/__terp__.py
@@ -37,8 +37,8 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "report_receivable_view.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/report_account/ir.model.access.csv b/addons/report_account/security/ir.model.access.csv
index 162e26600ff..162e26600ff 100644
--- a/addons/report_account/ir.model.access.csv
+++ b/addons/report_account/security/ir.model.access.csv
diff --git a/addons/report_analytic/__terp__.py b/addons/report_analytic/__terp__.py
index c5928486e18..7d219c528b7 100644
--- a/addons/report_analytic/__terp__.py
+++ b/addons/report_analytic/__terp__.py
@@ -37,8 +37,8 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "report_analytic_view.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/report_analytic/ir.model.access.csv b/addons/report_analytic/security/ir.model.access.csv
index 5f9181889cb..5f9181889cb 100644
--- a/addons/report_analytic/ir.model.access.csv
+++ b/addons/report_analytic/security/ir.model.access.csv
diff --git a/addons/report_analytic_line/__terp__.py b/addons/report_analytic_line/__terp__.py
index bb2b0f8ec42..aea4db7b3ac 100644
--- a/addons/report_analytic_line/__terp__.py
+++ b/addons/report_analytic_line/__terp__.py
@@ -38,8 +38,8 @@
     "demo_xml" : [
     ],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "report_analytic_line_view.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/report_analytic_line/ir.model.access.csv b/addons/report_analytic_line/security/ir.model.access.csv
index cc9b921b502..cc9b921b502 100644
--- a/addons/report_analytic_line/ir.model.access.csv
+++ b/addons/report_analytic_line/security/ir.model.access.csv
diff --git a/addons/report_analytic_planning/__terp__.py b/addons/report_analytic_planning/__terp__.py
index 7a56ec37197..a9256b7aae0 100644
--- a/addons/report_analytic_planning/__terp__.py
+++ b/addons/report_analytic_planning/__terp__.py
@@ -39,6 +39,7 @@
         "report_account_analytic.planning.csv"
     ],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "report_analytic_planning_view.xml",
         "report_analytic_planning_report.xml"
     ],
diff --git a/addons/report_analytic_planning/security/ir.model.access.csv b/addons/report_analytic_planning/security/ir.model.access.csv
new file mode 100644
index 00000000000..606594b81dd
--- /dev/null
+++ b/addons/report_analytic_planning/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_report_account_analytic_planning,report_account_analytic.planning,model_report_account_analytic_planning,base.group_user,1,0,0,0

+access_report_account_analytic_planning_line,report_account_analytic.planning.line,model_report_account_analytic_planning_line,base.group_user,1,0,0,0

+access_report_account_analytic_planning_stat_account,report_account_analytic.planning.stat.account,model_report_account_analytic_planning_stat_account,base.group_user,1,0,0,0

+access_report_account_analytic_planning_stat,report_account_analytic.planning.stat,model_report_account_analytic_planning_stat,base.group_user,1,0,0,0

+access_report_account_analytic_planning_stat_user,report_account_analytic.planning.stat.user,model_report_account_analytic_planning_stat_user,base.group_user,1,0,0,0

diff --git a/addons/report_crm/__terp__.py b/addons/report_crm/__terp__.py
index efec1f3d174..8fbc057632c 100644
--- a/addons/report_crm/__terp__.py
+++ b/addons/report_crm/__terp__.py
@@ -37,8 +37,8 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "report_crm_view.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/report_crm/ir.model.access.csv b/addons/report_crm/security/ir.model.access.csv
index 6324447e3ae..6324447e3ae 100644
--- a/addons/report_crm/ir.model.access.csv
+++ b/addons/report_crm/security/ir.model.access.csv
diff --git a/addons/report_intrastat/__terp__.py b/addons/report_intrastat/__terp__.py
index 0978187d916..76e7a2221c7 100644
--- a/addons/report_intrastat/__terp__.py
+++ b/addons/report_intrastat/__terp__.py
@@ -37,8 +37,8 @@
     "init_xml" : ["report_intrastat_data.xml",],
     "demo_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "report_intrastat_view.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/report_intrastat/ir.model.access.csv b/addons/report_intrastat/security/ir.model.access.csv
index cb354173518..cb354173518 100644
--- a/addons/report_intrastat/ir.model.access.csv
+++ b/addons/report_intrastat/security/ir.model.access.csv
diff --git a/addons/report_mrp/__terp__.py b/addons/report_mrp/__terp__.py
index 593abf2d6ab..87ddca590e4 100644
--- a/addons/report_mrp/__terp__.py
+++ b/addons/report_mrp/__terp__.py
@@ -37,8 +37,8 @@
     "init_xml": [],
     "demo_xml": [],
     "update_xml": [
+        "security/ir.model.access.csv",
         "report_mrp_view.xml",
-        "ir.model.access.csv",
     ],
     "installable": True
 }
diff --git a/addons/report_mrp/ir.model.access.csv b/addons/report_mrp/security/ir.model.access.csv
index aa413e2d248..aa413e2d248 100644
--- a/addons/report_mrp/ir.model.access.csv
+++ b/addons/report_mrp/security/ir.model.access.csv
diff --git a/addons/report_project/__terp__.py b/addons/report_project/__terp__.py
index a90d80bc83b..b69a30b777e 100644
--- a/addons/report_project/__terp__.py
+++ b/addons/report_project/__terp__.py
@@ -37,8 +37,8 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "report_project_view.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/report_project/ir.model.access.csv b/addons/report_project/security/ir.model.access.csv
index 9dbded5a90a..9dbded5a90a 100644
--- a/addons/report_project/ir.model.access.csv
+++ b/addons/report_project/security/ir.model.access.csv
diff --git a/addons/report_purchase/__terp__.py b/addons/report_purchase/__terp__.py
index 953afc4db6e..594497f277c 100644
--- a/addons/report_purchase/__terp__.py
+++ b/addons/report_purchase/__terp__.py
@@ -36,8 +36,8 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "report_purchase_view.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/report_purchase/ir.model.access.csv b/addons/report_purchase/security/ir.model.access.csv
index 0083635432c..0083635432c 100644
--- a/addons/report_purchase/ir.model.access.csv
+++ b/addons/report_purchase/security/ir.model.access.csv
diff --git a/addons/report_sale/__terp__.py b/addons/report_sale/__terp__.py
index a17affd5fb7..8eb360af952 100644
--- a/addons/report_sale/__terp__.py
+++ b/addons/report_sale/__terp__.py
@@ -47,9 +47,9 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "report_sale_view.xml",
         "report_sale_graph.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/report_sale/ir.model.access.csv b/addons/report_sale/security/ir.model.access.csv
index 9bc76aeda2b..9bc76aeda2b 100644
--- a/addons/report_sale/ir.model.access.csv
+++ b/addons/report_sale/security/ir.model.access.csv
diff --git a/addons/report_stock/__terp__.py b/addons/report_stock/__terp__.py
index 35d0899abc9..5e929a4e163 100644
--- a/addons/report_stock/__terp__.py
+++ b/addons/report_stock/__terp__.py
@@ -43,8 +43,8 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "report_stock_view.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/report_stock/ir.model.access.csv b/addons/report_stock/security/ir.model.access.csv
index 1fe712a6a59..1fe712a6a59 100644
--- a/addons/report_stock/ir.model.access.csv
+++ b/addons/report_stock/security/ir.model.access.csv
diff --git a/addons/report_task/__terp__.py b/addons/report_task/__terp__.py
index 737fb67c43c..d927a4ca061 100644
--- a/addons/report_task/__terp__.py
+++ b/addons/report_task/__terp__.py
@@ -35,8 +35,8 @@
     'description': 'Gives statistics on tasks by user on projects to check the pipeline of users.',
     'init_xml' : [],
     'update_xml': [
+        "security/ir.model.access.csv",
         'report_task_view.xml',
-        "ir.model.access.csv",
     ],
     'active': False,
     'installable': True
diff --git a/addons/report_task/ir.model.access.csv b/addons/report_task/security/ir.model.access.csv
index d506ecabe5b..d506ecabe5b 100644
--- a/addons/report_task/ir.model.access.csv
+++ b/addons/report_task/security/ir.model.access.csv
diff --git a/addons/report_timesheet/__terp__.py b/addons/report_timesheet/__terp__.py
index 0780ccaaaf2..5bd992a2c89 100644
--- a/addons/report_timesheet/__terp__.py
+++ b/addons/report_timesheet/__terp__.py
@@ -35,7 +35,9 @@
     "category" : "Generic Modules/Human Ressources",
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : ["report_timesheet_view.xml"],
+    "update_xml" : [
+        "security/ir.model.access.csv",
+        "report_timesheet_view.xml"],
     "active": False,
     "installable": True
 }
diff --git a/addons/report_timesheet/security/ir.model.access.csv b/addons/report_timesheet/security/ir.model.access.csv
new file mode 100644
index 00000000000..b8f74dab36f
--- /dev/null
+++ b/addons/report_timesheet/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_report_timesheet_user,report_timesheet.user,model_report_timesheet_user,base.group_user,1,0,0,0

+access_report_timesheet_account,report_timesheet.account,model_report_timesheet_account,base.group_user,1,0,0,0

+access_report_timesheet_account_date,report_timesheet.account.date,model_report_timesheet_account_date,base.group_user,1,0,0,0

+access_report_timesheet_invoice,report_timesheet.invoice,model_report_timesheet_invoice,base.group_user,1,0,0,0

diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py
index 3f840114d05..e34192ffe44 100644
--- a/addons/sale/__terp__.py
+++ b/addons/sale/__terp__.py
@@ -52,6 +52,8 @@
         - delivery costs
     """,
     "update_xml" : [
+        "security/purchase_security.xml",
+        "security/ir.model.access.csv",
         "sale_workflow.xml",
         "sale_sequence.xml",
         "sale_data.xml",
@@ -60,7 +62,6 @@
         "sale_report.xml",
         "sale_wizard.xml",
         "stock_view.xml",
-        "sale_security.xml"
     ],
     "active": False,
     "installable": True
diff --git a/addons/sale/sale_security.xml b/addons/sale/sale_security.xml
deleted file mode 100644
index f6f1ec601b6..00000000000
--- a/addons/sale/sale_security.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?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 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_user">
-        <field name="name">sale_order base.group_user</field>
-        <field name="model_id" model="ir.model" ref="model_sale_order"/>
-        <field name="group_id" ref="base.group_user"/>
-        <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_user">
-        <field name="name">sale_order_line base.group_user</field>
-        <field name="model_id" model="ir.model" ref="model_sale_order_line"/>
-        <field name="group_id" ref="base.group_user"/>
-        <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>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
new file mode 100644
index 00000000000..426e9bef425
--- /dev/null
+++ b/addons/sale/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_sale_shop,sale.shop,model_sale_shop,base.group_user,1,0,0,0

+access_sale_order,sale.order,model_sale_order,base.group_user,1,0,0,0

+access_sale_order_line,sale.order.line,model_sale_order_line,base.group_user,1,0,0,0

diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
new file mode 100644
index 00000000000..00936d4ffe8
--- /dev/null
+++ b/addons/sale/security/sale_security.xml
@@ -0,0 +1,9 @@
+<?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>
+
+</data>
+</terp>
diff --git a/addons/sale_journal/__terp__.py b/addons/sale_journal/__terp__.py
index e439e1b312a..afb1dc05611 100644
--- a/addons/sale_journal/__terp__.py
+++ b/addons/sale_journal/__terp__.py
@@ -11,7 +11,12 @@
     "depends" : ["stock","sale"],
     "demo_xml" : ['sale_journal_demo.xml'],
     "init_xml" : ['sale_journal_data.xml'],
-    "update_xml" : ["sale_journal_view.xml","picking_journal_view.xml","picking_journal_view_report.xml"],
+    "update_xml" : [
+        "security/ir.model.access.csv",
+        "sale_journal_view.xml",
+        "picking_journal_view.xml",
+        "picking_journal_view_report.xml"
+    ],
     "description" : """
     The sale journal modules allows you to categorize your
     sales and deliveries (packing lists) between different journals.
diff --git a/addons/sale_journal/security/ir.model.access.csv b/addons/sale_journal/security/ir.model.access.csv
new file mode 100644
index 00000000000..5002d3948ee
--- /dev/null
+++ b/addons/sale_journal/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_sale_journal_invoice_type_stats,sale_journal.invoice.type.stats,model_sale_journal_invoice_type_stats,base.group_user,1,0,0,0

+access_sale_journal_picking_stats,sale_journal.picking.stats,model_sale_journal_picking_stats,base.group_user,1,0,0,0

+access_sale_journal_invoice_type,sale_journal.invoice.type,model_sale_journal_invoice_type,base.group_user,1,0,0,0

+access_sale_journal_sale_journal,sale_journal.sale.journal,model_sale_journal_sale_journal,base.group_user,1,0,0,0

+access_sale_journal_picking_journal,sale_journal.picking.journal,model_sale_journal_picking_journal,base.group_user,1,0,0,0

+access_sale_journal_sale_stats,sale_journal.sale.stats,model_sale_journal_sale_stats,base.group_user,1,0,0,0

diff --git a/addons/scrum/__terp__.py b/addons/scrum/__terp__.py
index 10ee69c7e53..7be9cb422be 100644
--- a/addons/scrum/__terp__.py
+++ b/addons/scrum/__terp__.py
@@ -57,10 +57,10 @@
     """,
     "demo_xml" : ["scrum_demo.xml"],
     "update_xml": [
+        "security/ir.model.access.csv",
         "scrum_view.xml",
         "scrum_report.xml",
         "scrum_wizard.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/scrum/ir.model.access.csv b/addons/scrum/security/ir.model.access.csv
index 604df36dce2..1a71dfdb065 100644
--- a/addons/scrum/ir.model.access.csv
+++ b/addons/scrum/security/ir.model.access.csv
@@ -1,5 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

 access_scrum_team,scrum.team,model_scrum_team,base.group_user,1,0,0,0

+access_scrum_project,scrum.project,model_scrum_project,base.group_user,1,0,0,0

 access_scrum_sprint,scrum.sprint,model_scrum_sprint,base.group_user,1,0,0,0

 access_scrum_product_backlog,scrum.product.backlog,model_scrum_product_backlog,base.group_user,1,0,0,0

+access_scrum_task,scrum.task,model_scrum_task,base.group_user,1,0,0,0

 access_scrum_meeting,scrum.meeting,model_scrum_meeting,base.group_user,1,0,0,0

diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 7e41b9f65a5..107f65aa628 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -36,6 +36,7 @@
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
+        "security/ir.model.access.csv",
         "stock_workflow.xml", 
         "stock_data.xml", 
         "stock_incoterms.xml",
@@ -46,7 +47,6 @@
         "product_data.xml",
         "product_view.xml",
         "partner_view.xml",
-        "ir.model.access.csv",
     ],
     "active": False,
     "installable": True
diff --git a/addons/stock/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 94254f9d951..6b8887fca31 100644
--- a/addons/stock/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -1,6 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

 access_stock_incoterms,stock.incoterms,model_stock_incoterms,base.group_user,1,0,0,0

+access_stock_lot,stock.lot,model_stock_lot,base.group_user,1,0,0,0

 access_stock_location,stock.location,model_stock_location,base.group_user,1,0,0,0

+access_stock_move_lot,stock.move.lot,model_stock_move_lot,base.group_user,1,0,0,0

 access_stock_tracking,stock.tracking,model_stock_tracking,base.group_user,1,0,0,0

 access_stock_picking,stock.picking,model_stock_picking,base.group_user,1,0,0,0

 access_stock_production_lot,stock.production.lot,model_stock_production_lot,base.group_user,1,0,0,0

diff --git a/addons/subscription/__terp__.py b/addons/subscription/__terp__.py
index 62da3096f1e..5aa7599c7f4 100644
--- a/addons/subscription/__terp__.py
+++ b/addons/subscription/__terp__.py
@@ -35,7 +35,7 @@
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
-        "ir.model.access.csv",
+        "security/ir.model.access.csv",
         "subscription_view.xml"],
     "active": False,
     "installable": True
diff --git a/addons/subscription/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index c4da7f24187..c4da7f24187 100644
--- a/addons/subscription/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv