Raphael Collet (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-user-groups-rco into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-user-groups-rco/+merge/85494
Add field category_id into groups (new implementation of access rights on users
form).
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-user-groups-rco/+merge/85494
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-user-groups-rco.
=== modified file 'account/security/account_security.xml'
--- account/security/account_security.xml 2011-12-01 10:33:10 +0000
+++ account/security/account_security.xml 2011-12-13 14:18:27 +0000
@@ -2,14 +2,17 @@
<openerp><data>
<record id="group_account_invoice" model="res.groups">
- <field name="name">Accounting / Invoicing & Payments</field>
+ <field name="name">Invoicing & 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>
=== modified file 'analytic/security/analytic_security.xml'
--- analytic/security/analytic_security.xml 2011-09-17 14:41:13 +0000
+++ analytic/security/analytic_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'auction/security/auction_security.xml'
--- auction/security/auction_security.xml 2011-08-02 13:08:11 +0000
+++ auction/security/auction_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'base_contact/__openerp__.py'
--- base_contact/__openerp__.py 2011-12-12 14:22:44 +0000
+++ base_contact/__openerp__.py 2011-12-13 14:18:27 +0000
@@ -45,7 +45,6 @@
'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',
=== removed file 'base_contact/security/base_contact_security.xml'
--- base_contact/security/base_contact_security.xml 2011-01-14 00:11:01 +0000
+++ base_contact/security/base_contact_security.xml 1970-01-01 00:00:00 +0000
@@ -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>
=== modified file 'crm/security/crm_security.xml'
--- crm/security/crm_security.xml 2011-12-11 20:12:37 +0000
+++ crm/security/crm_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'document/security/document_security.xml'
--- document/security/document_security.xml 2011-07-19 09:22:57 +0000
+++ document/security/document_security.xml 2011-12-13 14:18:27 +0000
@@ -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">-->
=== modified file 'event/__openerp__.py'
--- event/__openerp__.py 2011-12-13 08:45:42 +0000
+++ event/__openerp__.py 2011-12-13 14:18:27 +0000
@@ -42,7 +42,6 @@
'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',
=== removed file 'event/security/event_security.xml'
--- event/security/event_security.xml 2011-08-02 13:08:11 +0000
+++ event/security/event_security.xml 1970-01-01 00:00:00 +0000
@@ -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>
-
=== modified file 'hr/security/hr_security.xml'
--- hr/security/hr_security.xml 2011-09-16 05:41:38 +0000
+++ hr/security/hr_security.xml 2011-12-13 14:18:27 +0000
@@ -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">
=== modified file 'idea/security/idea_security.xml'
--- idea/security/idea_security.xml 2011-08-02 13:08:11 +0000
+++ idea/security/idea_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'knowledge/security/knowledge_security.xml'
--- knowledge/security/knowledge_security.xml 2011-01-14 00:11:01 +0000
+++ knowledge/security/knowledge_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'lunch/security/lunch_security.xml'
--- lunch/security/lunch_security.xml 2011-08-02 13:08:11 +0000
+++ lunch/security/lunch_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'marketing/security/marketing_security.xml'
--- marketing/security/marketing_security.xml 2011-08-02 13:08:11 +0000
+++ marketing/security/marketing_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'mrp/security/mrp_security.xml'
--- mrp/security/mrp_security.xml 2011-09-15 09:12:56 +0000
+++ mrp/security/mrp_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'point_of_sale/security/point_of_sale_security.xml'
--- point_of_sale/security/point_of_sale_security.xml 2011-12-11 09:14:42 +0000
+++ point_of_sale/security/point_of_sale_security.xml 2011-12-13 14:18:27 +0000
@@ -3,11 +3,18 @@
<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">
+<<<<<<< TREE
<field name="name">Point of Sale / Manager</field>
<field name="implied_ids" eval="[(4, ref('group_pos_user')), (4, ref('stock.group_stock_user'))]"/>
+=======
+ <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'))]"/>
+>>>>>>> MERGE-SOURCE
</record>
</data>
=== modified file 'portal/security/portal_security.xml'
--- portal/security/portal_security.xml 2011-08-02 13:08:11 +0000
+++ portal/security/portal_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'product/security/product_security.xml'
--- product/security/product_security.xml 2011-09-15 11:19:06 +0000
+++ product/security/product_security.xml 2011-12-13 14:18:27 +0000
@@ -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">
=== modified file 'project/security/project_security.xml'
--- project/security/project_security.xml 2011-08-02 13:08:11 +0000
+++ project/security/project_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'purchase/security/purchase_security.xml'
--- purchase/security/purchase_security.xml 2011-08-02 13:08:11 +0000
+++ purchase/security/purchase_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'purchase_requisition/security/purchase_tender.xml'
--- purchase_requisition/security/purchase_tender.xml 2011-08-02 13:08:11 +0000
+++ purchase_requisition/security/purchase_tender.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'sale/security/sale_security.xml'
--- sale/security/sale_security.xml 2011-11-14 09:10:59 +0000
+++ sale/security/sale_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'sale_mrp/__openerp__.py'
--- sale_mrp/__openerp__.py 2011-10-11 20:05:49 +0000
+++ sale_mrp/__openerp__.py 2011-12-13 14:18:27 +0000
@@ -39,7 +39,6 @@
'depends': ['mrp', 'sale'],
'init_xml': [],
'update_xml': [
- 'security/sale_mrp_security.xml',
'security/ir.model.access.csv',
'sale_mrp_view.xml',
],
=== removed file 'sale_mrp/security/sale_mrp_security.xml'
--- sale_mrp/security/sale_mrp_security.xml 2011-01-14 00:11:01 +0000
+++ sale_mrp/security/sale_mrp_security.xml 1970-01-01 00:00:00 +0000
@@ -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>
=== modified file 'share/res_users.py'
--- share/res_users.py 2011-11-22 08:51:38 +0000
+++ share/res_users.py 2011-12-13 14:18:27 +0000
@@ -26,7 +26,13 @@
_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):
=== modified file 'share/res_users_view.xml'
--- share/res_users_view.xml 2011-09-01 08:21:47 +0000
+++ share/res_users_view.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'share/security/share_security.xml'
--- share/security/share_security.xml 2011-06-17 09:23:05 +0000
+++ share/security/share_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'stock/security/stock_security.xml'
--- stock/security/stock_security.xml 2011-09-17 14:49:20 +0000
+++ stock/security/stock_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'subscription/security/subcription_security.xml'
--- subscription/security/subcription_security.xml 2011-08-02 13:08:11 +0000
+++ subscription/security/subcription_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
=== modified file 'survey/security/survey_security.xml'
--- survey/security/survey_security.xml 2011-08-02 13:08:11 +0000
+++ survey/security/survey_security.xml 2011-12-13 14:18:27 +0000
@@ -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">
=== modified file 'wiki/security/wiki_security.xml'
--- wiki/security/wiki_security.xml 2011-01-14 00:11:01 +0000
+++ wiki/security/wiki_security.xml 2011-12-13 14:18:27 +0000
@@ -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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
