[MERGE] trunk-user-groups-rco: add category_id to groups

bzr revid: rco@openerp.com-20111213141949-ohvn0c9iq6tcl7jj

31 files changed, 122 insertions, 134 deletions

diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index c928ff3c8fe..64498127dc5 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -2,14 +2,17 @@
 <openerp><data>
 
     <record id="group_account_invoice" model="res.groups">
-        <field name="name">Accounting / Invoicing &amp; Payments</field>
+        <field name="name">Invoicing &amp; Payments</field>
+        <field name="category_id" ref="base.module_category_accounting_and_finance"/>
     </record>
     <record id="group_account_user" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Accounting / Accountant</field>
+        <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}">
-        <field name="name">Accounting / Manager</field>
+        <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'))]"/>
     </record>
 
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 165bb92f6b9..3f8ec1036be 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -16,6 +16,7 @@
     </record>
     
     <record id="group_analytic_accounting" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Useability / Analytic Accounting</field>
+        <field name="name">Analytic Accounting</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 </data></openerp>
diff --git a/addons/auction/security/auction_security.xml b/addons/auction/security/auction_security.xml
index 3caf93a2430..087151cb6ea 100644
--- a/addons/auction/security/auction_security.xml
+++ b/addons/auction/security/auction_security.xml
@@ -2,11 +2,19 @@
 <openerp>
 <data noupdate="0">
 
+    <record model="ir.module.category" id="module_category_auction">
+        <field name="name">Auction</field>
+        <field name="parent_id" ref="base.module_category_specific_industry_applications"/>
+        <field name="sequence">26</field>
+    </record>
+
     <record id="group_auction_user" model="res.groups">
-        <field name="name">Auction / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_auction"/>
     </record>
     <record id="group_auction_manager" model="res.groups">
-        <field name="name">Auction / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="module_category_auction"/>
         <field name="implied_ids" eval="[(4, ref('group_auction_user'))]"/>
     </record>
 
diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py
index 0f78103a187..27d06dc4e22 100644
--- a/addons/base_contact/__openerp__.py
+++ b/addons/base_contact/__openerp__.py
@@ -45,7 +45,6 @@ Pay attention that this module converts the existing addresses into "addresses +
     'depends': ['base','process'],
     'init_xml': [],
     'update_xml': [
-        'security/base_contact_security.xml',
         'security/ir.model.access.csv',
         'base_contact_view.xml',
         'base_contact_installer_view.xml',
diff --git a/addons/base_contact/security/base_contact_security.xml b/addons/base_contact/security/base_contact_security.xml
deleted file mode 100644
index 56a995c76a8..00000000000
--- a/addons/base_contact/security/base_contact_security.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    
-</data>
-</openerp>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 3ee9c9e242f..ed3d86bf9b8 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -3,16 +3,19 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User - Own Leads Only</field>
+        <field name="name">User - Own Leads Only</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">Sales / User - All Leads</field>
+        <field name="name">User - All Leads</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
+        <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'))]"/>
     </record>
 
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index bc0281e388c..74f3426fc50 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -3,7 +3,8 @@
 <data noupdate="0">
 
     <record id="base.group_document_user" model="res.groups">
-        <field name="name">Knowledge / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
     </record>
 
 <!--    <record id="group_document_manager" model="res.groups">-->
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 37ad77f310f..599edd02111 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -42,7 +42,6 @@ Note that:
     'depends': ['crm', 'base_contact', 'account', 'marketing', 'mail'],
     'init_xml': [],
     'update_xml': [
-        'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_registration_view.xml',
         'wizard/event_confirm_view.xml',
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
deleted file mode 100644
index c3c70c94d93..00000000000
--- a/addons/event/security/event_security.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-
-    <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">Marketing / User</field>
-    </record>
-
-    <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
-        <field name="implied_ids" eval="[(4, ref('marketing.group_marketing_user'))]"/>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-  </data>
-</openerp>
-
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 8e77830184b..e8d1edd3712 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -3,11 +3,13 @@
     <data noupdate="1">
 
     <record id="base.group_hr_user" model="res.groups">
-        <field name="name">Human Resources / HR Officer</field>
+        <field name="name">HR Officer</field>
+        <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
-        <field name="name">Human Resources / HR Manager</field>
+        <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'))]"/>
     </record>
     <record id="hr_dept_comp_rule" model="ir.rule">
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 344cbc64292..02a3cbdbdd8 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -3,10 +3,12 @@
 <data>
 
     <record model="res.groups" id="base.group_tool_user">
-        <field name="name">Tools / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_tools"/>
     </record>
     <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Tools / Manager</field>
+        <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'))]"/>
     </record>
 
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index b4c7bb99c1b..560fdce0506 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data noupdate="0">
-            <record id="base.group_sale_manager" model="res.groups">
-                <field name="name">Sales / Manager</field>
-            </record>
 
-            <record id="base.group_document_user" model="res.groups">
-                <field name="name">Knowledge / User</field>
-            </record>
+    <record id="base.group_document_user" model="res.groups">
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index e84cdb41c0d..7d665c96435 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record model="res.groups" id="base.group_tool_user">
-        <field name="name">Tools / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_tools"/>
     </record>
     <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Tools / Manager</field>
+        <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'))]"/>
     </record>
 
diff --git a/addons/marketing/security/marketing_security.xml b/addons/marketing/security/marketing_security.xml
index 344e562eb67..d04473da8bf 100644
--- a/addons/marketing/security/marketing_security.xml
+++ b/addons/marketing/security/marketing_security.xml
@@ -2,11 +2,13 @@
 <openerp>
 <data>
     <record id="marketing.group_marketing_user" model="res.groups">
-        <field name="name">Marketing / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_marketing"/>
     </record>
 
     <record id="marketing.group_marketing_manager" model="res.groups">
-        <field name="name">Marketing / Manager</field>
+        <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'))]"/>
     </record>
 
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index fb83f8c4a62..b4b79d6f606 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record id="group_mrp_user" model="res.groups">
-        <field name="name">Manufacturing / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_manufacturing"/>
     </record>
     <record id="group_mrp_manager" model="res.groups">
-        <field name="name">Manufacturing / Manager</field>
+        <field name="name">Manager</field>
+        <field name="category_id" ref="base.module_category_manufacturing"/>
         <field name="implied_ids" eval="[(4, ref('group_mrp_user'))]"/>
     </record>
 
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 09f1e8860fd..640a33d325b 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="1">
 
     <record id="group_pos_user" model="res.groups">
-        <field name="name">Point of Sale / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_point_of_sale"/>
     </record>
     <record id="group_pos_manager" model="res.groups">
-        <field name="name">Point of Sale / Manager</field>
+        <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'))]"/>
     </record>
 
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 4850cb7805b..4b73db5cdcc 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record model="ir.module.category" id="module_category_portal">
+            <field name="name">Portal</field>
+            <field name="parent_id" ref="base.module_category_tools"/>
+            <field name="sequence">25</field>
+        </record>
+
         <record id="group_portal_officer" model="res.groups">
-            <field name="name">Portal / Officer</field>
+            <field name="name">Officer</field>
             <field name="comment">Portal officers can create new portal users with the portal wizard.</field>
+            <field name="category_id" ref="module_category_portal"/>
         </record>
         <record id="group_portal_manager" model="res.groups">
-            <field name="name">Portal / Manager</field>
+            <field name="name">Manager</field>
             <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'))]"/>
         </record>
     </data>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index d9f14a13225..5c993b9cd61 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -3,14 +3,8 @@
 <data noupdate="1">
 
     <record id="group_uos" context="{'noadmin':True}" model="res.groups">
-        <field name="name">Useability / Product UoS View</field>
-    </record>
-
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
+        <field name="name">Product UoS View</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record id="product_comp_rule" model="ir.rule">
@@ -21,7 +15,8 @@
     </record>
 
     <record id="group_product_variant" model="res.groups" context="{'noadmin':True}">
-        <field name="name">Useability / Product Variant</field>
+        <field name="name">Product Variant</field>
+        <field name="category_id" ref="base.module_category_usability"/>
     </record>
 
     <record model="ir.rule" id="product_pricelist_comp_rule">
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 62f74f51d1b..f1e3a6e9b74 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -3,18 +3,16 @@
 <data noupdate="1">
 
     <record id="group_project_user" model="res.groups">
-        <field name="name">Project / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_project_management"/>
     </record>
 
     <record id="group_project_manager" model="res.groups">
-        <field name="name">Project / Manager</field>
+        <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'))]"/>
     </record>
 
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
     <record model="ir.ui.menu" id="menu_definitions">
         <field name="groups_id" eval="[(6,0,[ref('group_project_manager')])]"/>
     </record>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index a67c675b089..4a8ac571703 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="1">
 
     <record id="group_purchase_user" model="res.groups">
-        <field name="name">Purchases / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_purchase_management"/>
     </record>
     <record id="group_purchase_manager" model="res.groups">
-        <field name="name">Purchases / Manager</field>
+        <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'))]"/>
     </record>
 
diff --git a/addons/purchase_requisition/security/purchase_tender.xml b/addons/purchase_requisition/security/purchase_tender.xml
index af8a1330e2d..71c54b973e3 100644
--- a/addons/purchase_requisition/security/purchase_tender.xml
+++ b/addons/purchase_requisition/security/purchase_tender.xml
@@ -2,12 +2,20 @@
 <openerp>
 <data noupdate="1">
 
+    <record model="ir.module.category" id="module_category_purchase_requisition">
+        <field name="name">Purchase Requisition</field>
+        <field name="parent_id" ref="base.module_category_purchase_management"/>
+        <field name="sequence">9</field>
+    </record>
+
     <record id="group_purchase_requisition_user" model="res.groups">
-        <field name="name">Purchase Requisition / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="module_category_purchase_requisition"/>
     </record>
 
     <record id="group_purchase_requisition_manager" model="res.groups">
-        <field name="name">Purchase Requisition / Manager</field>
+        <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'))]"/>
     </record>
     
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index b7a228acf6a..ae8c8bf62e3 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -3,16 +3,19 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User - Own Leads Only</field>
+        <field name="name">User - Own Leads Only</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">Sales / User - All Leads</field>
+        <field name="name">User - All Leads</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
+        <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>
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index 7d4443a3cce..4900834f7b0 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -39,7 +39,6 @@ It adds sales name and sales Reference on production order.
     'depends': ['mrp', 'sale'],
     'init_xml': [],
     'update_xml': [
-        'security/sale_mrp_security.xml',
         'security/ir.model.access.csv',
         'sale_mrp_view.xml',
     ],
diff --git a/addons/sale_mrp/security/sale_mrp_security.xml b/addons/sale_mrp/security/sale_mrp_security.xml
deleted file mode 100644
index c0139329d1e..00000000000
--- a/addons/sale_mrp/security/sale_mrp_security.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-	<record id="base.group_sale_manager" model="res.groups">
-	        <field name="name">Sales / Manager</field>
-	    </record>
-    
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/share/res_users.py b/addons/share/res_users.py
index f7a81a24948..0462f1339d0 100644
--- a/addons/share/res_users.py
+++ b/addons/share/res_users.py
@@ -26,7 +26,13 @@ class res_groups(osv.osv):
     _columns = {
         'share': fields.boolean('Share Group', readonly=True,
                     help="Group created to set access rights for sharing data with some users.")
-     }
+    }
+
+    def __init__(self, pool, cr):
+        super(res_groups, self).__init__(pool, cr)
+        # add domain in get_groups_by_application()
+        self.groups_by_application_domain.append(('share', '=', False))
+
 res_groups()
 
 class res_users(osv.osv):
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index b03a090c809..3b74fbb4dbc 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -21,18 +21,6 @@
             <field name="name">Users</field>
             <field name="context">{'search_default_no_share': 1}</field>
         </record>
-        <record id="view_users_form_share" model="ir.ui.view">
-            <field name="name">res.users.form</field>
-            <field name="model">res.users</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page//field[@name='groups_id']" position="attributes">
-                    <attribute name="context">{'search_default_no_share':1}</attribute>
-                </xpath>
-            </field>
-        </record>
-
 
         <record model="ir.ui.view" id="res_groups_search_sharing">
             <field name="name">res.groups.search.share</field>
diff --git a/addons/share/security/share_security.xml b/addons/share/security/share_security.xml
index a5405dbcb48..1e92ac44a53 100644
--- a/addons/share/security/share_security.xml
+++ b/addons/share/security/share_security.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record model="ir.module.category" id="module_category_share">
+            <field name="name">Sharing</field>
+            <field name="parent_id" ref="base.module_category_tools"/>
+            <field name="sequence">26</field>
+        </record>
+
         <record id="group_share_user" model="res.groups">
-            <field name="name">Sharing / User</field>
+            <field name="name">User</field>
             <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"/>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 389d62e8ce0..f83a5d362ab 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record id="group_stock_user" model="res.groups">
-        <field name="name">Warehouse / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_warehouse_management"/>
     </record>
     <record id="group_stock_manager" model="res.groups">
-        <field name="name">Warehouse / Manager</field>
+        <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'))]"/>
     </record>
 
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
index e84cdb41c0d..7d665c96435 100644
--- a/addons/subscription/security/subcription_security.xml
+++ b/addons/subscription/security/subcription_security.xml
@@ -3,10 +3,12 @@
 <data noupdate="0">
 
     <record model="res.groups" id="base.group_tool_user">
-        <field name="name">Tools / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_tools"/>
     </record>
     <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Tools / Manager</field>
+        <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'))]"/>
     </record>
 
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 7b6c43ed2bc..c44a35e3ee9 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -2,10 +2,12 @@
 <openerp>
     <data noupdate="0">
         <record model="res.groups" id="base.group_tool_user">
-            <field name="name">Tools / User</field>
+            <field name="name">User</field>
+            <field name="category_id" ref="base.module_category_tools"/>
         </record>
         <record model="res.groups" id="base.group_tool_manager">
-            <field name="name">Tools / Manager</field>
+            <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'))]"/>
         </record>
         <record model="res.groups" id="base.group_survey_user">
diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
index 98a8c03c177..16bd30c151f 100644
--- a/addons/wiki/security/wiki_security.xml
+++ b/addons/wiki/security/wiki_security.xml
@@ -2,14 +2,9 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
     <record id="base.group_document_user" model="res.groups">
-        <field name="name">Knowledge / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
     </record>
     
 </data>