From ba1454149cf50cf07db1c78fe821f28a97e9e928 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 4 Apr 2012 11:08:30 +0200
Subject: [PATCH] [IMP] groups: remove auto-inclusion of admin in groups, and
 make the inclusion explicit in groups

bzr revid: rco@openerp.com-20120404090830-nteimn2kvz8nkk7h
---
 addons/account/security/account_security.xml                 | 5 +++--
 addons/account_payment/security/account_payment_security.xml | 1 +
 addons/analytic/security/analytic_security.xml               | 2 +-
 addons/auction/security/auction_security.xml                 | 1 +
 addons/base_calendar/security/calendar_security.xml          | 1 +
 addons/board/board_data_home.xml                             | 2 +-
 addons/crm/security/crm_security.xml                         | 3 ++-
 addons/document/custom_view.xml                              | 2 ++
 addons/document/security/document_security.xml               | 1 +
 addons/event/security/event_security.xml                     | 5 +----
 addons/hr/security/hr_security.xml                           | 1 +
 addons/idea/security/idea_security.xml                       | 1 +
 addons/knowledge/security/knowledge_security.xml             | 1 +
 addons/l10n_ma/security/compta_security.xml                  | 1 +
 addons/lunch/security/lunch_security.xml                     | 1 +
 addons/marketing/security/marketing_security.xml             | 1 +
 addons/mrp/security/mrp_security.xml                         | 1 +
 addons/point_of_sale/security/point_of_sale_security.xml     | 1 +
 addons/portal/security/portal_security.xml                   | 1 +
 addons/product/security/product_security.xml                 | 2 +-
 addons/project/security/project_security.xml                 | 1 +
 addons/purchase/security/purchase_security.xml               | 1 +
 addons/purchase_requisition/security/purchase_tender.xml     | 1 +
 addons/sale/security/sale_security.xml                       | 2 +-
 addons/share/security/share_security.xml                     | 1 +
 addons/stock/security/stock_security.xml                     | 1 +
 addons/subscription/security/subcription_security.xml        | 1 +
 addons/survey/security/survey_security.xml                   | 2 ++
 addons/wiki/security/wiki_security.xml                       | 1 +
 addons/wiki_sale_faq/wiki_sale_faq_data.xml                  | 2 +-
 30 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index dd83885f468..e1a29a6edfb 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -4,13 +4,14 @@
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Invoicing &amp; Payments</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
-    <record id="group_account_user" model="res.groups" context="{'noadmin':True}">
+    <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
-    <record id="group_account_manager" model="res.groups" context="{'noadmin':True}">
+    <record id="group_account_manager" model="res.groups">
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 4bae0c30ce6..135059c79d5 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -4,6 +4,7 @@
 
     <record id="group_account_payment" model="res.groups">
         <field name="name">Accounting / Payments</field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     <record id="account.group_account_invoice" model="res.groups">
         <field name="implied_ids" eval="[(4, ref('group_account_payment'))]"/>
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 3f8ec1036be..69c1a069502 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -15,7 +15,7 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
     
-    <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
+    <record id="group_analytic_accounting" model="res.groups">
         <field name="name">Analytic Accounting</field>
         <field name="category_id" ref="base.module_category_usability"/>
     </record>
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
index 087151cb6ea..d71254dd3c2 100644
--- a/addons/auction/security/auction_security.xml
+++ b/addons/auction/security/auction_security.xml
@@ -16,6 +16,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="module_category_auction"/>
         <field name="implied_ids" eval="[(4, ref('group_auction_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/base_calendar/security/calendar_security.xml b/addons/base_calendar/security/calendar_security.xml
index dd736e11714..5fe8918e05b 100644
--- a/addons/base_calendar/security/calendar_security.xml
+++ b/addons/base_calendar/security/calendar_security.xml
@@ -3,6 +3,7 @@
    <data noupdate="0">
 	   <record model="res.groups" id="base.group_survey_user">
         	<field name="name">Survey / User</field>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
 	   </record>
    </data>
 </openerp>
diff --git a/addons/board/board_data_home.xml b/addons/board/board_data_home.xml
index 8a0f150d5be..8a75a3ad496 100644
--- a/addons/board/board_data_home.xml
+++ b/addons/board/board_data_home.xml
@@ -61,7 +61,7 @@
     </record>
 
     <!-- set the default homepage of admin -->
-    <record id="base.user_admin" model="res.users">
+    <record id="base.user_root" model="res.users">
         <field name="action_id" ref="board_homepage_action"/>
     </record>
 
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index ed3d86bf9b8..949cd5d4e73 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -17,9 +17,10 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record model="res.users" id="base.user_admin">
+    <record model="res.users" id="base.user_root">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
 
diff --git a/addons/document/custom_view.xml b/addons/document/custom_view.xml
index 894e5bac77f..45c4b337d99 100644
--- a/addons/document/custom_view.xml
+++ b/addons/document/custom_view.xml
@@ -2,9 +2,11 @@
 <data>
     <record model="res.groups" id="group_compta_user">
         <field name="name">grcompta</field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     <record model="res.groups" id="group_compta_admin">
         <field name="name">grcomptaadmin</field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     <menuitem name="Administration" groups="admin,grcomptaadmin" icon="terp-stock" id="menu_admin_compta"/>
 </data>
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 9fba954aa0e..cacde50c36e 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -5,6 +5,7 @@
     <record id="base.group_document_user" model="res.groups">
         <field name="name">User</field>
         <field name="category_id" ref="base.module_category_knowledge_management"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 <!--    <record id="group_document_manager" model="res.groups">-->
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index fb29fffcca9..5055d517bd5 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -17,10 +17,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="module_category_event_management"/>
         <field name="implied_ids" eval="[(4, ref('group_event_user'))]"/>
-    </record>
-
-    <record model="res.users" id="base.user_admin">
-        <field eval="[(4,ref('group_event_manager'))]" name="groups_id"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <!-- Multi - Company Rules -->
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index e8d1edd3712..0f72d37f32f 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -11,6 +11,7 @@
         <field name="name">HR Manager</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     <record id="hr_dept_comp_rule" model="ir.rule">
         <field name="name">Department multi company rule</field>
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 02a3cbdbdd8..b26bd2af0a9 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index 560fdce0506..4871541b4c9 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -5,6 +5,7 @@
     <record id="base.group_document_user" model="res.groups">
         <field name="name">User</field>
         <field name="category_id" ref="base.module_category_knowledge_management"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/l10n_ma/security/compta_security.xml b/addons/l10n_ma/security/compta_security.xml
index bcde4d188b2..8d511ae7154 100644
--- a/addons/l10n_ma/security/compta_security.xml
+++ b/addons/l10n_ma/security/compta_security.xml
@@ -2,6 +2,7 @@
 
     <record id="group_expert_comptable" model="res.groups">
         <field name="name">Finance / Expert Comptable </field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 </data>
 </openerp>
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 7d665c96435..46293a97561 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index d04473da8bf..2afc0ab3a8b 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_marketing"/>
         <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 7042423bc0b..7806de99d4a 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_manufacturing"/>
         <field name="implied_ids" eval="[(4, ref('group_mrp_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record id="group_mrp_routings" model="res.groups">
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 640a33d325b..7f2e91f1b48 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_point_of_sale"/>
         <field name="implied_ids" eval="[(4, ref('group_pos_user')), (4, ref('stock.group_stock_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 4b73db5cdcc..0c0213ec56a 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -17,6 +17,7 @@
             <field name="comment">Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users.</field>
             <field name="category_id" ref="module_category_portal"/>
             <field name="implied_ids" eval="[(4, ref('group_portal_officer'))]"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 23c20f92175..324aecf962e 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -9,7 +9,7 @@
         <field name="domain_force"> ['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
     </record>
 
-    <record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
+    <record id="group_product_variant" model="res.groups">
         <field name="name">Product Variant</field>
         <field name="category_id" ref="base.module_category_usability"/>
     </record>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f1e3a6e9b74..a1ead6aa72c 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -11,6 +11,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_project_management"/>
         <field name="implied_ids" eval="[(4, ref('group_project_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record model="ir.ui.menu" id="menu_definitions">
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 8daad29396d..d3033a37a70 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -11,6 +11,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_purchase_management"/>
         <field name="implied_ids" eval="[(4, ref('group_purchase_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record id="group_analytic_accounting" model="res.groups">
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index 71c54b973e3..12f9a9e56b8 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -17,6 +17,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="module_category_purchase_requisition"/>
         <field name="implied_ids" eval="[(4, ref('group_purchase_requisition_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     
     <record model="ir.rule" id="purchase_requisition_comp_rule">
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 3359786d759..0cb55fb0d30 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -46,7 +46,7 @@
         <field name="implied_ids" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
     </record>
 
-    <record model="res.users" id="base.user_admin">
+    <record model="res.users" id="base.user_root">
         <field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
     </record>
     <record model="ir.ui.menu" id="base.menu_base_partner">
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index 1e92ac44a53..29971077a2c 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -12,6 +12,7 @@
             <field name="comment">
 Members of this groups have access to the sharing wizard, which allows them to invite external users to view or edit some of their documents.</field>
             <field name="category_id" ref="module_category_share"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 6367ed8668f..a9653ffa81e 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_warehouse_management"/>
         <field name="implied_ids" eval="[(4, ref('group_stock_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
     <record id="group_production_lot" model="res.groups">
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index 7d665c96435..46293a97561 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -10,6 +10,7 @@
         <field name="name">Manager</field>
         <field name="category_id" ref="base.module_category_tools"/>
         <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
 </data>
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index c44a35e3ee9..3b0cf5844ce 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -9,9 +9,11 @@
             <field name="name">Manager</field>
             <field name="category_id" ref="base.module_category_tools"/>
             <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
         <record model="res.groups" id="base.group_survey_user">
             <field name="name">Survey / User</field>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
index 16bd30c151f..ca9d34ae99c 100644
--- a/addons/wiki/security/wiki_security.xml
+++ b/addons/wiki/security/wiki_security.xml
@@ -5,6 +5,7 @@
     <record id="base.group_document_user" model="res.groups">
         <field name="name">User</field>
         <field name="category_id" ref="base.module_category_knowledge_management"/>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
     
 </data>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_data.xml b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
index a349f77404f..d9bd8de43ff 100644
--- a/addons/wiki_sale_faq/wiki_sale_faq_data.xml
+++ b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <record model="document.directory" id="dir_sale">
             <field name="name">Sales Document</field>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="parent_id" ref="document.dir_root"/>
             <field name="ressource_id">0</field>
         </record>