summaryrefslogtreecommitdiff
path: root/odoo/addons/base/data
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-09-10 17:06:18 +0200
committerChristophe Simonis <chs@odoo.com>2018-09-10 17:06:18 +0200
commit86ff929ad6718d2bfb691dd272aa3f353406ff4f (patch)
treea62b50cc471452ff2dc3c034a38d6cade79c03ed /odoo/addons/base/data
parent4ad896bd3d6bbc851a59adead1a653abc31fc882 (diff)
parent1199451606cab7342e34fc9c41a2085b8beb1243 (diff)
[MERGE] forward port branch saas-11.4 up to 1199451606c
Diffstat (limited to 'odoo/addons/base/data')
-rw-r--r--odoo/addons/base/data/ir_module_category_data.xml32
-rw-r--r--odoo/addons/base/data/res_users_demo.xml3
2 files changed, 32 insertions, 3 deletions
diff --git a/odoo/addons/base/data/ir_module_category_data.xml b/odoo/addons/base/data/ir_module_category_data.xml
index 7d8b3803208..3346121dbbc 100644
--- a/odoo/addons/base/data/ir_module_category_data.xml
+++ b/odoo/addons/base/data/ir_module_category_data.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
+ <record model="ir.module.category" id="module_category_hidden">
+ <field name="name">Technical Settings</field>
+ <field name="sequence">0</field>
+ <field name="visible" eval="0" />
+ </record>
+
<record model="ir.module.category" id="module_category_localization">
<field name="name">Localization</field>
<field name="visible" eval="0" />
@@ -185,6 +191,16 @@
<field name="sequence">100</field>
</record>
+ <record model="ir.module.category" id="module_category_usability">
+ <field name="name">Extra Rights</field>
+ <field name="sequence">101</field>
+ </record>
+
+ <record model="ir.module.category" id="module_category_extra">
+ <field name="name">Other Extra Rights</field>
+ <field name="sequence">102</field>
+ </record>
+
<!-- add applications to base groups -->
<record model="res.groups" id="group_erp_manager">
<field name="category_id" ref="module_category_administration"/>
@@ -197,6 +213,18 @@
<field name="category_id" ref="module_category_user_type"/>
</record>
+ <record model="res.groups" id="group_multi_company">
+ <field name="category_id" ref="module_category_usability"/>
+ </record>
+
+ <record model="res.groups" id="group_multi_currency">
+ <field name="category_id" ref="module_category_usability"/>
+ </record>
+
+ <record model="res.groups" id="group_no_one">
+ <field name="category_id" ref="module_category_usability"/>
+ </record>
+
<record id="group_portal" model="res.groups">
<field name="category_id" ref="module_category_user_type"/>
</record>
@@ -205,5 +233,9 @@
<field name="category_id" ref="module_category_user_type"/>
</record>
+ <record id="group_partner_manager" model="res.groups">
+ <field name="category_id" ref="module_category_usability"/>
+ </record>
+
</data>
</odoo>
diff --git a/odoo/addons/base/data/res_users_demo.xml b/odoo/addons/base/data/res_users_demo.xml
index 38d6323ee28..7e0bfa7dfec 100644
--- a/odoo/addons/base/data/res_users_demo.xml
+++ b/odoo/addons/base/data/res_users_demo.xml
@@ -82,9 +82,6 @@
<field name="groups_id" eval="[(5,)]"/><!-- Avoid auto-including this user in any default group -->
</record>
- <record id="base.group_user" model="res.groups"><!-- Remove the demo user for the internal_user group -->
- <field name="users" eval="[(3,ref('demo_user0'))]"/>
- </record>
<record id="base.group_portal" model="res.groups"><!-- Add the demo user to the portal (and therefore to the portal member group) -->
<field name="users" eval="[(4,ref('demo_user0'))]"/>
</record>