diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml
index ac2e904b2e503d456afd3ea9b70d2befbe09fe63..256af22af5e01f32e48a9fa532c9983f404c19c1 100644
--- a/addons/account/views/account_menuitem.xml
+++ b/addons/account/views/account_menuitem.xml
@@ -24,7 +24,7 @@
<menuitem id="account_reports_business_intelligence_menu" name="Business Intelligence" parent="account.menu_finance_reports" sequence="5" groups="group_account_invoice"/>
- <menuitem id="base.menu_action_currency_form" name="Currencies" parent="menu_config_multi_currency" sequence="20" groups="base.group_no_one"/>
+ <menuitem id="menu_action_currency_form" name="Currencies" parent="menu_config_multi_currency" sequence="20" groups="base.group_no_one"/>
<menuitem id="menu_finance_legal_statement" name="PDF Reports" parent="account.menu_finance_reports" groups="group_account_user"/>
diff --git a/addons/association/views/association_views.xml b/addons/association/views/association_views.xml
index 6e875a2144793e6c3109993363d91da49c3d1d83..48210e76e97e83ab57d94aba8a16477cc5935474 100644
--- a/addons/association/views/association_views.xml
+++ b/addons/association/views/association_views.xml
@@ -2,8 +2,8 @@
<odoo>
<!-- Top menu item -->
<menuitem name="Members"
- id="base.menu_association"
+ id="membership.menu_association"
groups="account.group_account_user"
sequence="15"/>
- <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="100"/>
+ <menuitem name="Configuration" id="menu_event_config" parent="membership.menu_association" sequence="100"/>
</odoo>
diff --git a/addons/base_setup/views/res_config_views.xml b/addons/base_setup/views/res_config_views.xml
index 10c55e76b902de8e3fc9af61024b62073dc7134d..80f70b36f5e796d15ea4138d61df0790f4a44b38 100644
--- a/addons/base_setup/views/res_config_views.xml
+++ b/addons/base_setup/views/res_config_views.xml
@@ -163,7 +163,7 @@
</record>
<menuitem
- id="base.menu_config"
+ id="menu_config"
name="General Settings"
parent="base.menu_administration"
sequence="1"
diff --git a/addons/crm/report/crm_activity_report_views.xml b/addons/crm/report/crm_activity_report_views.xml
index 6be30b1d3b27d69ee5c30d6ede6fb7e24c1316b2..085603efb6668aa2e4d212168ffec568dcdc0b44 100644
--- a/addons/crm/report/crm_activity_report_views.xml
+++ b/addons/crm/report/crm_activity_report_views.xml
@@ -61,7 +61,7 @@
id="crm_activity_report_menu"
name="Activities"
groups="sales_team.group_sale_manager"
- parent="base.menu_sale_report"
+ parent="sales_team.menu_sale_report"
action="crm_activity_report_action"
sequence="7"/>
diff --git a/addons/crm/report/crm_opportunity_report_views.xml b/addons/crm/report/crm_opportunity_report_views.xml
index 9e2e40cbde36f8cfeddf6bc090e316c93ecf33c0..27b96538cd57e0f0aa45a43b6a139183da8fac8e 100644
--- a/addons/crm/report/crm_opportunity_report_views.xml
+++ b/addons/crm/report/crm_opportunity_report_views.xml
@@ -164,7 +164,7 @@ mainly used by the sales manager in order to do the periodic review with the
teams of the sales pipeline.</field>
</record>
<menuitem id="crm_opportunity_report_menu" name="Pipeline"
- parent="base.menu_sale_report" action="crm_opportunity_report_action" sequence="5"/>
+ parent="sales_team.menu_sale_report" action="crm_opportunity_report_action" sequence="5"/>
<record id="crm_opportunity_report_action_graph" model="ir.actions.act_window">
<field name="name">Pipeline Analysis</field>
@@ -200,7 +200,7 @@ with the the sales teams.</field>
<menuitem
id="crm_opportunity_report_menu_lead"
name="Leads"
- parent="base.menu_sale_report"
+ parent="sales_team.menu_sale_report"
action="crm_opportunity_report_action_lead"
groups="crm.group_use_lead"
sequence="6"/>
diff --git a/addons/crm/views/calendar_views.xml b/addons/crm/views/calendar_views.xml
index 0186955335ae59918c5b7b7b76bd4d3ef7e3804f..925f0e198ca35bf2800a02969c71a3bee32273b5 100644
--- a/addons/crm/views/calendar_views.xml
+++ b/addons/crm/views/calendar_views.xml
@@ -2,7 +2,7 @@
<odoo>
<menuitem
- id="base.menu_import_crm"
+ id="menu_import_crm"
name="Import & Synchronize"
parent="sales_team.menu_base_partner"/>
diff --git a/addons/crm/views/crm_activity_views.xml b/addons/crm/views/crm_activity_views.xml
index f42580d1ba26d21ff00799b7bbe39d9562de6f6a..0950ccec89086613181020df2a3e2bd5280915a1 100644
--- a/addons/crm/views/crm_activity_views.xml
+++ b/addons/crm/views/crm_activity_views.xml
@@ -63,5 +63,5 @@
id="crm_activity_menu"
name="Activities"
action="crm_activity_action"
- parent="sales_team.menu_crm_config_lead"/>
+ parent="menu_crm_config_lead"/>
</odoo>
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index efbf61de85146ef969425ecc719ce8c738ff07de..6565ec972f5c52e993bcdd5db37acece716bfe14 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -874,7 +874,7 @@
id="menu_crm_lead_categ"
name="Lead Tags"
action="crm_lead_tag_action"
- parent="sales_team.menu_crm_config_lead"
+ parent="menu_crm_config_lead"
sequence="1"
groups="base.group_no_one"/>
@@ -898,7 +898,7 @@
<menuitem
id="menu_crm_lost_reason"
action="crm_lost_reason_action"
- parent="sales_team.menu_crm_config_lead"
+ parent="menu_crm_config_lead"
sequence="6"
groups="base.group_no_one"/>
diff --git a/addons/crm/views/crm_stage_views.xml b/addons/crm/views/crm_stage_views.xml
index c4d9d98c6ce5894b2d32b1b1667e2ef724d44e9d..6f177b8dbdcbbd1c1aef98a4965938cf93fbac17 100644
--- a/addons/crm/views/crm_stage_views.xml
+++ b/addons/crm/views/crm_stage_views.xml
@@ -70,7 +70,7 @@
name="Stages"
sequence="0"
action="crm_stage_action"
- parent="sales_team.menu_crm_config_lead"
+ parent="menu_crm_config_lead"
groups="base.group_no_one"/>
</odoo>
diff --git a/addons/crm/views/crm_views.xml b/addons/crm/views/crm_views.xml
index d8c43da67e84f3fd0665b9d4fa98384c90a8cdca..3bdc8be68953ecb1e5375505a695c7a812e9890c 100644
--- a/addons/crm/views/crm_views.xml
+++ b/addons/crm/views/crm_views.xml
@@ -14,26 +14,19 @@
sequence="6"/>
<menuitem
- id="sales_team.menu_crm_config_lead"
+ id="menu_crm_config_lead"
name="Leads & Opportunities"
parent="sales_team.menu_sale_config"
sequence="5"
groups="sales_team.group_sale_manager"/>
<menuitem
- id="sales_team.menu_crm_config_opportunity"
+ id="menu_crm_config_opportunity"
name="Opportunities"
parent="sales_team.menu_sale_config"
sequence="1"
groups="sales_team.group_sale_manager"/>
- <menuitem
- id="sales_team.menu_sale_config_sales"
- name="Sales"
- parent="sales_team.menu_sale_config"
- sequence="0"
- groups="sales_team.group_sale_manager"/>
-
<!-- Make the xmlid of menus required by the CRM tour available in webclient -->
<record id="sales_team.menu_base_partner" model="ir.ui.menu">
<field name="load_xmlid" eval="True"/>
diff --git a/addons/crm/views/res_config_views.xml b/addons/crm/views/res_config_views.xml
index f4939b4056673c53716c89f2820c5a1b201d868e..c78f5be281b770a3a05bca0e3b3a1bd996776957 100644
--- a/addons/crm/views/res_config_views.xml
+++ b/addons/crm/views/res_config_views.xml
@@ -46,19 +46,4 @@
</field>
</record>
- <menuitem
- id="sales_team.menu_sale_config"
- name="Configuration"
- parent="sales_team.menu_base_partner"
- sequence="100"
- groups="sales_team.group_sale_manager"/>
-
- <menuitem
- id="sales_team.menu_sale_general_settings"
- name="Settings"
- parent="sales_team.menu_sale_config"
- sequence="0"
- action="sales_team.action_sale_config"
- groups="base.group_system"/>
-
</odoo>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index bf90d5031fc829a3658a6bb182826b8884f379e8..a3a9d7cd210ad7eb7f7387cab31376ce85b8e370 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -5,30 +5,30 @@
<field name="comment">the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system.</field>
</record>
- <record id="base.group_hr_user" model="res.groups">
+ <record id="group_hr_user" model="res.groups">
<field name="name">Officer</field>
<field name="category_id" ref="base.module_category_human_resources"/>
<field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
<field name="comment">the user will be able to approve document created by employees.</field>
</record>
- <record id="base.group_hr_manager" model="res.groups">
+ <record id="group_hr_manager" model="res.groups">
<field name="name">Manager</field>
<field name="comment">the user will have an access to the human resources configuration as well as statistic reports.</field>
<field name="category_id" ref="base.module_category_human_resources"/>
- <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
+ <field name="implied_ids" eval="[(4, ref('group_hr_user'))]"/>
<field name="users" eval="[(4, ref('base.user_root'))]"/>
</record>
- <record id="base.group_hr_attendance" model="res.groups">
+ <record id="group_hr_attendance" model="res.groups">
<field name="name">Attendances</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<data noupdate="1">
<record id="base.default_user" model="res.users">
- <field name="groups_id" eval="[(4,ref('base.group_hr_manager'))]"/>
+ <field name="groups_id" eval="[(4,ref('group_hr_manager'))]"/>
</record>
<record id="hr_dept_comp_rule" model="ir.rule">
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 121e0f23f254f4a7c305cf502c8b9224addad304..74e19969a2ac7bbc97cb8a8552b01679d42e9f07 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,10 +1,10 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_employee_category_user,hr.employee.category.user,model_hr_employee_category,base.group_hr_user,1,1,1,1
+access_hr_employee_category_user,hr.employee.category.user,model_hr_employee_category,group_hr_user,1,1,1,1
access_hr_employee_category_emp,hr.employee.category.emp,model_hr_employee_category,base.group_user,1,0,0,0
-access_hr_employee_user,hr.employee user,model_hr_employee,base.group_hr_user,1,1,1,1
+access_hr_employee_user,hr.employee user,model_hr_employee,group_hr_user,1,1,1,1
access_hr_employee_system_user,hr.employee system user,model_hr_employee,base.group_user,1,0,0,0
-access_hr_employee_resource_user,resource.resource.user,resource.model_resource_resource,base.group_hr_user,1,1,1,1
-access_hr_department_user,hr.department.user,model_hr_department,base.group_hr_user,1,1,1,1
+access_hr_employee_resource_user,resource.resource.user,resource.model_resource_resource,group_hr_user,1,1,1,1
+access_hr_department_user,hr.department.user,model_hr_department,group_hr_user,1,1,1,1
access_hr_department_employee,hr.department.employee,model_hr_department,base.group_user,1,0,0,0
-access_hr_job_user,hr.job user,model_hr_job,base.group_hr_user,1,1,1,1
-access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,base.group_hr_user,1,1,1,0
+access_hr_job_user,hr.job user,model_hr_job,group_hr_user,1,1,1,1
+access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,group_hr_user,1,1,1,0
diff --git a/addons/hr/tests/common.py b/addons/hr/tests/common.py
index 4fa877c7d8b81bd1a7675ce8da1ef85e1019208d..d03507597e8e78854fd1a64fb2a47806bffcffde 100644
--- a/addons/hr/tests/common.py
+++ b/addons/hr/tests/common.py
@@ -11,8 +11,8 @@ class TestHrCommon(common.TransactionCase):
self.Users = self.env['res.users']
- self.group_hr_manager_id = self.ref('base.group_hr_manager')
- self.group_hr_user_id = self.ref('base.group_hr_user')
+ self.group_hr_manager_id = self.ref('hr.group_hr_manager')
+ self.group_hr_user_id = self.ref('hr.group_hr_user')
self.group_user_id = self.ref('base.group_user')
# Will be used in various test cases of test_hr_flow
diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml
index 0d74d1e4c815e9e5b1d40b24a3f18329c55a4036..a22368abb43338fc2ec49acb66c7bd2a2d155479 100644
--- a/addons/hr/views/hr_views.xml
+++ b/addons/hr/views/hr_views.xml
@@ -6,7 +6,7 @@
<menuitem
id="menu_hr_root"
name="Employees"
- groups="base.group_hr_manager,base.group_hr_user,base.group_user"
+ groups="group_hr_manager,group_hr_user,base.group_user"
web_icon="hr,static/description/icon.png"
sequence="75"/>
@@ -20,14 +20,14 @@
id="menu_hr_reporting_timesheet"
name="Reports"
parent="menu_hr_root"
- groups="base.group_hr_manager,base.group_hr_user"
+ groups="group_hr_manager,group_hr_user"
sequence="99"/>
<menuitem
id="menu_human_resources_configuration"
name="Configuration"
parent="menu_hr_root"
- groups="base.group_hr_manager"
+ groups="group_hr_manager"
sequence="100"/>
<!-- Employee -->
@@ -37,7 +37,7 @@
<field name="arch" type="xml">
<form string="Employee">
<sheet>
- <div class="oe_button_box" name="button_box" groups="base.group_hr_user">
+ <div class="oe_button_box" name="button_box" groups="hr.group_hr_user">
<button name="toggle_active" type="object"
class="oe_stat_button" icon="fa-archive">
<field name="active" widget="boolean_button"
@@ -51,7 +51,7 @@
<field name="name" placeholder="Employee's Name"/>
</h1>
</div>
- <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" options="{'no_create_edit': True}" groups="base.group_hr_user"/>
+ <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" options="{'no_create_edit': True}" groups="hr.group_hr_user"/>
<notebook>
<page name="public" string="Public Information">
<group>
@@ -74,12 +74,12 @@
</group>
<field name="notes" placeholder="Other Information ..." colspan="4"/>
</page>
- <page string="Personal Information" groups="base.group_hr_user">
+ <page string="Personal Information" groups="hr.group_hr_user">
<group>
<group string="Citizenship & Other Information">
<field name="country_id" options='{"no_open": True, "no_create": True}'/>
- <field name="identification_id" groups="base.group_hr_user"/>
- <field name="passport_id" groups="base.group_hr_user"/>
+ <field name="identification_id" groups="hr.group_hr_user"/>
+ <field name="passport_id" groups="hr.group_hr_user"/>
<field name="bank_account_id"/>
</group>
<group string="Contact Information">
@@ -96,7 +96,7 @@
</group>
</group>
</page>
- <page string="HR Settings" groups="base.group_hr_user">
+ <page string="HR Settings" groups="hr.group_hr_user">
<group>
<group string='Status' name="active_group">
<field name="company_id" groups="base.group_multi_company"/>
@@ -139,7 +139,7 @@
<search string="Employees">
<field name="name" string="Employees" filter_domain="['|',('work_email','ilike',self),('name','ilike',self)]"/>
<field name="department_id"/>
- <field name="category_ids" groups="base.group_hr_user"/>
+ <field name="category_ids" groups="hr.group_hr_user"/>
<field name="job_id" />
<filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
<filter string="Archived" name="inactive" domain="[('active','=',False)]"/>
@@ -586,7 +586,7 @@
id="menu_hr_department_tree"
parent="menu_hr_root"
sequence="90"
- groups="base.group_hr_user"/>
+ groups="group_hr_user"/>
</data>
</odoo>
diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py
index 88b5db50ee87c9238a00be4f29d06c3092f621cf..2aaffad969319d9f212b737832a0c962fd4e4932 100644
--- a/addons/hr_attendance/models/hr_employee.py
+++ b/addons/hr_attendance/models/hr_employee.py
@@ -20,8 +20,8 @@ class HrEmployee(models.Model):
barcode = "".join(choice(digits) for i in range(8))
return barcode
- barcode = fields.Char(string="Badge ID", help="ID used for employee identification.", default=_default_random_barcode, copy=False, groups='base.group_hr_user')
- pin = fields.Char(string="PIN", default=_default_random_pin, help="PIN used for Check In/Out in Attendance.", copy=False, groups='base.group_hr_user')
+ barcode = fields.Char(string="Badge ID", help="ID used for employee identification.", default=_default_random_barcode, copy=False, groups='hr.group_hr_user')
+ pin = fields.Char(string="PIN", default=_default_random_pin, help="PIN used for Check In/Out in Attendance.", copy=False, groups='hr.group_hr_user')
attendance_ids = fields.One2many('hr.attendance', 'employee_id', help='list of attendances for the employee')
last_attendance_id = fields.Many2one('hr.attendance', compute='_compute_last_attendance_id')
@@ -34,7 +34,7 @@ class HrEmployee(models.Model):
@api.multi
def _compute_manual_attendance(self):
for employee in self:
- employee.manual_attendance = employee.user_id.has_group('base.group_hr_attendance') if employee.user_id else False
+ employee.manual_attendance = employee.user_id.has_group('hr.group_hr_attendance') if employee.user_id else False
@api.multi
def _inverse_manual_attendance(self):
@@ -76,7 +76,7 @@ class HrEmployee(models.Model):
@api.multi
def attendance_manual(self, next_action, entered_pin=None):
self.ensure_one()
- if self.env['res.users'].browse(SUPERUSER_ID).has_group('base.group_hr_attendance_use_pin') and (self.user_id and self.user_id.id != self._uid or not self.user_id):
+ if self.env['res.users'].browse(SUPERUSER_ID).has_group('hr_attenance.group_hr_attendance_use_pin') and (self.user_id and self.user_id.id != self._uid or not self.user_id):
if entered_pin != self.pin:
return {'warning': _('Wrong PIN')}
return self.attendance_action(next_action)
diff --git a/addons/hr_attendance/models/res_config.py b/addons/hr_attendance/models/res_config.py
index f9bffadc61b7448f04dabd80a996a4e550c4211d..6d7c9d4eb129fe6b16474220d7af4f5136faff41 100644
--- a/addons/hr_attendance/models/res_config.py
+++ b/addons/hr_attendance/models/res_config.py
@@ -9,4 +9,4 @@ class BaseConfigSettings(models.TransientModel):
group_attendance_use_pin = fields.Selection([(0, 'Employees do not need to enter their PIN to check in manually in the "Company Screen".'),
(1, 'Employees must enter their PIN to check in manually in the "Company Screen".')],
- string='Employee PIN', help='Enable or disable employee PIN identification at check in', implied_group="base.group_hr_attendance_use_pin")
+ string='Employee PIN', help='Enable or disable employee PIN identification at check in', implied_group="hr_attenance.group_hr_attendance_use_pin")
diff --git a/addons/hr_attendance/security/hr_attendance_security.xml b/addons/hr_attendance/security/hr_attendance_security.xml
index d033786fd5ebf0d73c6a7ffebc9df0c38f7abc63..742722d2fa21408e6a094b9524e90ad3a680c63b 100644
--- a/addons/hr_attendance/security/hr_attendance_security.xml
+++ b/addons/hr_attendance/security/hr_attendance_security.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record id="base.group_hr_manager" model="res.groups">
- <field name="implied_ids" eval="[(4, ref('base.group_hr_attendance'))]"/>
+ <record id="hr.group_hr_manager" model="res.groups">
+ <field name="implied_ids" eval="[(4, ref('hr.group_hr_attendance'))]"/>
</record>
- <record id="base.group_hr_user" model="res.groups">
- <field name="implied_ids" eval="[(4, ref('base.group_hr_attendance'))]"/>
+ <record id="hr.group_hr_user" model="res.groups">
+ <field name="implied_ids" eval="[(4, ref('hr.group_hr_attendance'))]"/>
</record>
- <record id="base.group_hr_attendance" model="res.groups">
+ <record id="hr.group_hr_attendance" model="res.groups">
<field name="name">Manual Attendances</field>
<field name="comment">The user will gain access to the human resources attendance menu, enabling him to manage his own attendance.</field>
</record>
- <record id="base.group_hr_attendance_use_pin" model="res.groups">
+ <record id="group_hr_attendance_use_pin" model="res.groups">
<field name="name">Enable PIN use</field>
<field name="category_id" ref="base.module_category_hidden"/>
<field name="comment">The user will have to enter his PIN to check in and out manually at the company screen.</field>
@@ -26,7 +26,7 @@
<field name="name">attendance officer: full access</field>
<field name="model_id" ref="model_hr_attendance"/>
<field name="domain_force">[(1,'=',1)]</field>
- <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+ <field name="groups" eval="[(4,ref('hr.group_hr_user'))]"/>
</record>
<record id="hr_attendance_rule_attendance_employee" model="ir.rule">
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 9f9d88c44a5692c97b949e273c0eb9e95056d10f..080245b84fb88fe4e61d32e23f45e9842f1b70c2 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,3 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_attendance_user,hr.attendance.user,model_hr_attendance,base.group_hr_user,1,1,1,1
+access_hr_attendance_user,hr.attendance.user,model_hr_attendance,hr.group_hr_user,1,1,1,1
access_hr_attendance_system_user,hr.attendance.system.user,model_hr_attendance,base.group_user,1,1,1,0
\ No newline at end of file
diff --git a/addons/hr_attendance/static/src/js/main_menu_confirm.js b/addons/hr_attendance/static/src/js/main_menu_confirm.js
index 81ea12da88365c89700b968cb4132066def96318..6d79f801435439b4981f6d46ef0daf07c92e02dd 100644
--- a/addons/hr_attendance/static/src/js/main_menu_confirm.js
+++ b/addons/hr_attendance/static/src/js/main_menu_confirm.js
@@ -64,7 +64,7 @@ var MainMenuConfirm = Widget.extend({
start: function () {
var self = this;
- self.session.user_has_group('base.group_hr_attendance_use_pin').then(function(has_group){
+ self.session.user_has_group('hr_attenance.group_hr_attendance_use_pin').then(function(has_group){
self.use_pin = has_group;
self.$el.html(QWeb.render("HrAttendanceMainMenuConfirm", {widget: self}));
self.start_clock();
diff --git a/addons/hr_attendance/static/src/js/message.js b/addons/hr_attendance/static/src/js/message.js
index 1c8b9b4ce6686a779ea4905e0fb4b7eacb16408c..65395c6da96f539f18ff1fc7decaeb250e2e4792 100644
--- a/addons/hr_attendance/static/src/js/message.js
+++ b/addons/hr_attendance/static/src/js/message.js
@@ -20,7 +20,7 @@ var Message = Widget.extend({
var self = this;
var default_action = { type: "ir.actions.client", name: 'Attendances', tag: 'hr_attendance_my_main_menu', params: {} };
if(!action.attendance){
- self.session.user_has_group('base.group_hr_user').then(function(has_group){
+ self.session.user_has_group('hr.group_hr_user').then(function(has_group){
if(has_group){
self.next_action = { type: "ir.actions.client", name: 'Attendances', tag: 'hr_attendance_main_menu', target: 'fullscreen', params: {} };
}
diff --git a/addons/hr_attendance/views/hr_attendance_view.xml b/addons/hr_attendance/views/hr_attendance_view.xml
index e708c678fa8334539141893aa49fd0e2fa7159e0..744695f4a5e4f19dcb864fc830b7f4f4bed8ab63 100644
--- a/addons/hr_attendance/views/hr_attendance_view.xml
+++ b/addons/hr_attendance/views/hr_attendance_view.xml
@@ -128,17 +128,17 @@
<!-- Menus -->
- <menuitem id="menu_hr_attendance_root" name="Attendances" sequence="90" groups="base.group_hr_attendance" web_icon="hr_attendance,static/description/icon.png"/>
+ <menuitem id="menu_hr_attendance_root" name="Attendances" sequence="90" groups="hr.group_hr_attendance" web_icon="hr_attendance,static/description/icon.png"/>
- <menuitem id="menu_hr_attendance_my_attendances" name="My Attendances" parent="menu_hr_attendance_root" sequence="10" groups="base.group_hr_attendance" action="hr_attendance_action_my_main_menu"/>
+ <menuitem id="menu_hr_attendance_my_attendances" name="My Attendances" parent="menu_hr_attendance_root" sequence="10" groups="hr.group_hr_attendance" action="hr_attendance_action_my_main_menu"/>
- <menuitem id="menu_hr_attendance_manage_attendances" name="Manage Attendances" parent="menu_hr_attendance_root" sequence="20" groups="base.group_hr_user"/>
+ <menuitem id="menu_hr_attendance_manage_attendances" name="Manage Attendances" parent="menu_hr_attendance_root" sequence="20" groups="hr.group_hr_user"/>
- <menuitem id="menu_hr_attendance_view_attendances" name="Attendances" parent="menu_hr_attendance_manage_attendances" sequence="10" groups="base.group_hr_user" action="hr_attendance_action"/>
+ <menuitem id="menu_hr_attendance_view_attendances" name="Attendances" parent="menu_hr_attendance_manage_attendances" sequence="10" groups="hr.group_hr_user" action="hr_attendance_action"/>
- <menuitem id="menu_hr_attendance_view_employees_kanban" name="Employees" parent="menu_hr_attendance_manage_attendances" sequence="15" groups="base.group_hr_user" action="hr.open_view_employee_list_my"/>
+ <menuitem id="menu_hr_attendance_view_employees_kanban" name="Employees" parent="menu_hr_attendance_manage_attendances" sequence="15" groups="hr.group_hr_user" action="hr.open_view_employee_list_my"/>
- <menuitem id="menu_hr_attendance_Kiosk_mode" name="Kiosk Mode" parent="menu_hr_attendance_manage_attendances" sequence="20" groups="base.group_hr_user" action="hr_attendance_action_main_menu"/>
+ <menuitem id="menu_hr_attendance_Kiosk_mode" name="Kiosk Mode" parent="menu_hr_attendance_manage_attendances" sequence="20" groups="hr.group_hr_user" action="hr_attendance_action_main_menu"/>
- <menuitem id="menu_hr_attendance_report" name="Reports" parent="menu_hr_attendance_root" sequence="30" groups="base.group_hr_user" action="hr_attendance_action_graph"/>
+ <menuitem id="menu_hr_attendance_report" name="Reports" parent="menu_hr_attendance_root" sequence="30" groups="hr.group_hr_user" action="hr_attendance_action_graph"/>
</odoo>
diff --git a/addons/hr_attendance/views/hr_employee_view.xml b/addons/hr_attendance/views/hr_employee_view.xml
index fd709ddcee66899a5e2cfc2f961d357342972a12..fcf7eb295d1551446aad9eff499d4543ca3ab6db 100644
--- a/addons/hr_attendance/views/hr_employee_view.xml
+++ b/addons/hr_attendance/views/hr_employee_view.xml
@@ -13,9 +13,9 @@
</div>
</field>
<field name="user_id" position="after">
- <field name="barcode" groups="base.group_hr_user"/>
- <field name="pin" groups="base.group_hr_user,base.group_hr_attendance_use_pin"/>
- <field name="manual_attendance" groups="base.group_hr_user"/>
+ <field name="barcode" groups="hr.group_hr_user"/>
+ <field name="pin" groups="hr.group_hr_user,hr_attendance.group_hr_attendance_use_pin"/>
+ <field name="manual_attendance" groups="hr.group_hr_user"/>
</field>
</field>
</record>
diff --git a/addons/hr_attendance/views/res_config_view.xml b/addons/hr_attendance/views/res_config_view.xml
index 66224e5d4aae7b63571928b574e7c97b7a973f9e..5ec645ad5841c1fc3618216888c8ea6a12983a12 100644
--- a/addons/hr_attendance/views/res_config_view.xml
+++ b/addons/hr_attendance/views/res_config_view.xml
@@ -26,5 +26,5 @@
</record>
<menuitem id="hr_attendance.menu_hr_attendance_settings" name="Configuration" parent="menu_hr_attendance_root"
- sequence="99" action="action_hr_attendance_settings" groups="base.group_hr_manager"/>
+ sequence="99" action="action_hr_attendance_settings" groups="hr.group_hr_manager"/>
</odoo>
\ No newline at end of file
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 820935111f0b4e14877fb5491c52d22c27398c18..41f553b9cee3d94d397107a9fe3986c5670ac2ba 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,6 +1,6 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_resource_manager,hr.employee.resource.manager,resource.model_resource_resource,base.group_hr_manager,1,1,1,1
-access_hr_resource_calendar_user,hr.employee.resource.calendar.user,resource.model_resource_calendar,base.group_hr_user,1,1,1,1
-access_hr_resource_calendar_attendance_user,hr.employee.resource.calendar.attendance.user,resource.model_resource_calendar_attendance,base.group_hr_user,1,1,1,1
-access_hr_contract_type_manager,hr.contract.type.manager,model_hr_contract_type,base.group_hr_manager,1,1,1,1
-access_hr_contract_manager,hr.contract.manager,model_hr_contract,base.group_hr_manager,1,1,1,1
+access_hr_resource_manager,hr.employee.resource.manager,resource.model_resource_resource,hr.group_hr_manager,1,1,1,1
+access_hr_resource_calendar_user,hr.employee.resource.calendar.user,resource.model_resource_calendar,hr.group_hr_user,1,1,1,1
+access_hr_resource_calendar_attendance_user,hr.employee.resource.calendar.attendance.user,resource.model_resource_calendar_attendance,hr.group_hr_user,1,1,1,1
+access_hr_contract_type_manager,hr.contract.type.manager,model_hr_contract_type,hr.group_hr_manager,1,1,1,1
+access_hr_contract_manager,hr.contract.manager,model_hr_contract,hr.group_hr_manager,1,1,1,1
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index 4174c9f22194c0515c0a40a1cb66eca4b211bf37..28ca3af545d3be2ba23c8d87fde14bec676c9896 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -20,7 +20,7 @@
class="oe_stat_button"
icon="fa-book"
type="action"
- groups="base.group_hr_manager">
+ groups="hr.group_hr_manager">
<field name="contracts_count" widget="statinfo" string="Contracts"/>
</button>
</xpath>
@@ -225,6 +225,6 @@
action="action_hr_contract"
parent="hr.menu_hr_root"
sequence="4"
- groups="base.group_hr_manager"/>
+ groups="hr.group_hr_manager"/>
</odoo>
diff --git a/addons/hr_expense/data/hr_expense_demo.xml b/addons/hr_expense/data/hr_expense_demo.xml
index 1128b8ceffb72b090eb48c8cd0a4da371f7e8b27..6c5b47c12b3468062d7736b90c1c00a3c7e56c37 100644
--- a/addons/hr_expense/data/hr_expense_demo.xml
+++ b/addons/hr_expense/data/hr_expense_demo.xml
@@ -6,7 +6,7 @@
<field name="address_home_id" ref="base.res_partner_address_3"/>
</record>
- <record id="base.res_partner_address_fp" model="res.partner">
+ <record id="res_partner_address_fp" model="res.partner">
<field name="name">Pieter Parter's Farm</field>
<field name="parent_id" eval="ref('base.partner_root')"/>
<field name="supplier">1</field>
@@ -17,7 +17,7 @@
</record>
<record id="hr.employee_root" model="hr.employee">
- <field name="address_home_id" ref="base.res_partner_address_fp"/>
+ <field name="address_home_id" ref="res_partner_address_fp"/>
</record>
<record id="car_travel" model="product.product">
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 0e60e20c01754f8f384dfad3d28383c0e4deed96..6ded19e6c782907b2b5cfcf7e7518f3752e02112 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,17 +1,17 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_expense_user,hr.expense.user,model_hr_expense,base.group_hr_user,1,1,1,1
+access_hr_expense_user,hr.expense.user,model_hr_expense,hr.group_hr_user,1,1,1,1
access_hr_expense_employee,hr.expense.employee,model_hr_expense,base.group_user,1,1,1,1
-access_hr_expense_sheet_user,hr.expense.sheet.user,model_hr_expense_sheet,base.group_hr_user,1,1,1,1
+access_hr_expense_sheet_user,hr.expense.sheet.user,model_hr_expense_sheet,hr.group_hr_user,1,1,1,1
access_hr_expense_sheet_employee,hr.expense.sheet.employee,model_hr_expense_sheet,base.group_user,1,1,1,1
-access_product_product_hr_expense_user,product.product.hr.expense.user,product.model_product_product,base.group_hr_user,1,1,1,1
-access_product_template_hr_expense_user,product.template.hr.expense.user,product.model_product_template,base.group_hr_user,1,1,1,1
-access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,base.group_hr_user,1,1,1,1
-access_account_journal_user,account.journal.user,account.model_account_journal,base.group_hr_user,1,1,1,1
+access_product_product_hr_expense_user,product.product.hr.expense.user,product.model_product_product,hr.group_hr_user,1,1,1,1
+access_product_template_hr_expense_user,product.template.hr.expense.user,product.model_product_template,hr.group_hr_user,1,1,1,1
+access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,hr.group_hr_user,1,1,1,1
+access_account_journal_user,account.journal.user,account.model_account_journal,hr.group_hr_user,1,1,1,1
access_account_journal_employee,account.journal.employee,account.model_account_journal,base.group_user,1,0,0,0
-access_account_invoice_user,account.invoice.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
-access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,base.group_hr_user,1,1,1,1
-access_account_invoice_tax_user,account.invoice.tax.user,account.model_account_invoice_tax,base.group_hr_user,1,0,0,0
-access_account_move_user,account.move.user,account.model_account_move,base.group_hr_user,1,0,0,0
-access_account_move_line_user,account.move.line.user,account.model_account_move_line,base.group_hr_user,1,0,0,0
-access_account_analytic_line_user,account.analytic.line.user,account.model_account_analytic_line,base.group_hr_user,1,1,1,1
+access_account_invoice_user,account.invoice.user,account.model_account_invoice,hr.group_hr_user,1,1,1,1
+access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,hr.group_hr_user,1,1,1,1
+access_account_invoice_tax_user,account.invoice.tax.user,account.model_account_invoice_tax,hr.group_hr_user,1,0,0,0
+access_account_move_user,account.move.user,account.model_account_move,hr.group_hr_user,1,0,0,0
+access_account_move_line_user,account.move.line.user,account.model_account_move_line,hr.group_hr_user,1,0,0,0
+access_account_analytic_line_user,account.analytic.line.user,account.model_account_analytic_line,hr.group_hr_user,1,1,1,1
diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index 6d13ad5d62c491a1f995ae706d738c461c7dacc7..01492f7d00acbbe4210cc44a209017260e117524 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -6,7 +6,7 @@
<field name="name">Manager Expense</field>
<field name="model_id" ref="model_hr_expense"/>
<field name="domain_force">[(1, '=', 1)]</field>
- <field name="groups" eval="[(4, ref('account.group_account_user')), (4, ref('base.group_hr_manager')), (4, ref('base.group_hr_user'))]"/>
+ <field name="groups" eval="[(4, ref('account.group_account_user')), (4, ref('hr.group_hr_manager')), (4, ref('hr.group_hr_user'))]"/>
</record>
<record id="property_rule_expense_employee" model="ir.rule">
<field name="name">Employee Expense</field>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index bd30fdf645817b99645c10b2cc5d2f3255f7027a..08f21f8ec9af4ce175d0ed644f1251dc719f0906 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -166,7 +166,7 @@
<filter domain="[('state', '=', 'refused')]" string="Refused" name="refused" help="Refused Expenses"/>
<filter domain="[('state', '!=', 'cancel')]" string="Not Refused" name="uncancelled" help="Actual expense sheets, not the refused ones"/>
<separator />
- <filter string="My Team Expenses" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="base.group_hr_manager" help="Expenses of Your Team Member"/>
+ <filter string="My Team Expenses" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr.group_hr_manager" help="Expenses of Your Team Member"/>
<filter string="My Expenses" domain="[('employee_id.user_id', '=', uid)]"/>
<separator />
<filter string="New Mail" name="message_unread" domain="[('message_unread', '=', True)]"/>
@@ -180,7 +180,7 @@
<filter string="Status" domain="[]" context="{'group_by': 'state'}"/>
</group>
<separator />
- <filter domain="[('employee_id.active', '=', False)]" string="Former Employees" name="inactive" groups="base.group_hr_user,base.group_hr_manager"/>
+ <filter domain="[('employee_id.active', '=', False)]" string="Former Employees" name="inactive" groups="hr.group_hr_user,hr.group_hr_manager"/>
</search>
</field>
</record>
@@ -406,11 +406,11 @@
<field name="arch" type="xml">
<form string="Expense Reports" class="o_expense_sheet">
<header>
- <button name="approve_expense_sheets" states="submit" string="Approve" type="object" groups="base.group_hr_user" class="oe_highlight o_expense_sheet_approve"/>
+ <button name="approve_expense_sheets" states="submit" string="Approve" type="object" groups="hr.group_hr_user" class="oe_highlight o_expense_sheet_approve"/>
<button name="action_sheet_move_create" states="approve" string="Post Journal Entries" type="object" groups="account.group_account_user" class="oe_highlight o_expense_sheet_post"/>
<button name="%(hr_expense.hr_expense_register_payment_wizard_action)d" type="action" string="Register Payment" class="oe_highlight o_expense_sheet_pay" attrs="{'invisible': [('state', '!=', 'post')]}" context="{'default_amount': total_amount, 'partner_id': address_id}" groups="account.group_account_user"/>
<button name="reset_expense_sheets" states="cancel" string="Resubmit" type="object"/>
- <button name="%(hr_expense.hr_expense_refuse_wizard_action)d" states="submit" string="Refuse" type="action" groups="base.group_hr_user" />
+ <button name="%(hr_expense.hr_expense_refuse_wizard_action)d" states="submit" string="Refuse" type="action" groups="hr.group_hr_user" />
<button name="%(hr_expense.hr_expense_refuse_wizard_action)d" states="approve" string="Refuse" type="action" groups="account.group_account_user"/>
<field name="state" widget="statusbar" statusbar_visible="draft,submit,approve,post,done"/>
</header>
@@ -549,7 +549,7 @@
<filter domain="[('state', '=', 'approve')]" string="To Post" name="to_post" help="Approved Expenses"/>
<filter domain="['|', ('state', '=', 'approve'), ('state', '=', 'post')]" string="To Pay" name="approved" help="Expenses to Invoice"/>
<separator/>
- <filter string="My Team Reports" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="base.group_hr_manager" help="Expenses of Your Team Member"/>
+ <filter string="My Team Reports" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr.group_hr_manager" help="Expenses of Your Team Member"/>
<filter string="My Reports" domain="[('employee_id.user_id', '=', uid)]"/>
<separator />
<filter string="New Mail" name="message_unread" domain="[('message_unread', '=', True)]"/>
@@ -561,7 +561,7 @@
<filter string="State" domain="[]" context="{'group_by': 'state'}" name="state"/>
</group>
<separator />
- <filter domain="[('employee_id.active', '=', False)]" string="Former Employees" name="inactive" groups="base.group_hr_user,base.group_hr_manager"/>
+ <filter domain="[('employee_id.active', '=', False)]" string="Former Employees" name="inactive" groups="hr.group_hr_user,hr.group_hr_manager"/>
</search>
</field>
</record>
@@ -748,23 +748,23 @@
<menuitem id="menu_hr_expense_my_expenses_refused" name="Refused Expenses" sequence="2" parent="menu_hr_expense_my_expenses" action="action_hr_expense_refused_expenses"/>
<menuitem id="menu_hr_expense_sheet_my_reports" name="Expense Reports" sequence="3" parent="menu_hr_expense_my_expenses" action="action_hr_expense_sheet_my_all" load_xmlid="True"/>
- <menuitem id="menu_hr_expense_to_approve" name="To Approve" sequence="2" parent="menu_hr_expense_root" groups="base.group_hr_user"/>
+ <menuitem id="menu_hr_expense_to_approve" name="To Approve" sequence="2" parent="menu_hr_expense_root" groups="hr.group_hr_user"/>
<menuitem id="menu_hr_expense_sheet_all_to_approve" name="Expense Reports To Approve" sequence="1" parent="menu_hr_expense_to_approve"
action="action_hr_expense_sheet_all_to_approve"/>
- <menuitem id="menu_hr_expense_accountant" name="Accountant" sequence="3" parent="menu_hr_expense_root" groups="base.group_hr_manager"/>
+ <menuitem id="menu_hr_expense_accountant" name="Accountant" sequence="3" parent="menu_hr_expense_root" groups="hr.group_hr_manager"/>
<menuitem id="menu_hr_expense_sheet_all_to_post" name="Expense Reports To Post" sequence="2" parent="menu_hr_expense_accountant"
action="action_hr_expense_sheet_all_to_post"/>
<menuitem id="menu_hr_expense_sheet_all_to_pay" name="Expense Reports To Pay" sequence="3" parent="menu_hr_expense_accountant"
action="action_hr_expense_sheet_all_to_pay"/>
- <menuitem id="menu_hr_expense_reports" name="Reports" sequence="4" parent="menu_hr_expense_root" groups="base.group_hr_manager"/>
+ <menuitem id="menu_hr_expense_reports" name="Reports" sequence="4" parent="menu_hr_expense_root" groups="hr.group_hr_manager"/>
<menuitem id="menu_hr_expense_all_expenses" name="All Expenses" sequence="0" parent="menu_hr_expense_reports" action="hr_expense_actions_all"/>
<menuitem id="menu_hr_expense_sheet_all_all" name="All Expense Reports" sequence="4" parent="menu_hr_expense_reports"
- action="action_hr_expense_sheet_all_all" groups="base.group_hr_manager"/>
+ action="action_hr_expense_sheet_all_all" groups="hr.group_hr_manager"/>
<menuitem id="menu_hr_expense_configuration" name="Configuration" parent="menu_hr_expense_root"
sequence="100"/>
<menuitem id="menu_hr_product" name="Expense Products" parent="menu_hr_expense_configuration"
- action="hr_expense_product" groups="base.group_hr_manager" sequence="10"/>
+ action="hr_expense_product" groups="hr.group_hr_manager" sequence="10"/>
</odoo>
diff --git a/addons/hr_gamification/security/gamification_security.xml b/addons/hr_gamification/security/gamification_security.xml
index 86671336c63b7d4785ad2e6ee4232f4c2e8ec538..f1de6b6d1e750562aafec5777586e9abe3a68782 100644
--- a/addons/hr_gamification/security/gamification_security.xml
+++ b/addons/hr_gamification/security/gamification_security.xml
@@ -3,7 +3,7 @@
<data noupdate="1">
<record id="gamification.goal_gamification_manager_visibility" model="ir.rule">
- <field name="groups" eval="[(4, ref('base.group_hr_user'))]"/>
+ <field name="groups" eval="[(4, ref('hr.group_hr_user'))]"/>
</record>
</data>
diff --git a/addons/hr_gamification/security/ir.model.access.csv b/addons/hr_gamification/security/ir.model.access.csv
index b89db7cd104f11066d1c9cb5c6a6aaddc5317e00..3cbe77aa6fa7cc619e1c99569d1ec56b90ae511b 100644
--- a/addons/hr_gamification/security/ir.model.access.csv
+++ b/addons/hr_gamification/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
-challenge_officer,"Challenge Officer",gamification.model_gamification_challenge,base.group_hr_user,1,1,1,1
-challenge_line_officer,"Challenge Line Officer",gamification.model_gamification_challenge_line,base.group_hr_user,1,1,1,1
-badge_officer,"Badge Officer",gamification.model_gamification_badge,base.group_hr_user,1,1,1,1
-badge_user_officer,"Badge-user Officer",gamification.model_gamification_badge_user,base.group_hr_user,1,1,1,1
\ No newline at end of file
+challenge_officer,"Challenge Officer",gamification.model_gamification_challenge,hr.group_hr_user,1,1,1,1
+challenge_line_officer,"Challenge Line Officer",gamification.model_gamification_challenge_line,hr.group_hr_user,1,1,1,1
+badge_officer,"Badge Officer",gamification.model_gamification_badge,hr.group_hr_user,1,1,1,1
+badge_user_officer,"Badge-user Officer",gamification.model_gamification_badge_user,hr.group_hr_user,1,1,1,1
\ No newline at end of file
diff --git a/addons/hr_gamification/views/gamification_views.xml b/addons/hr_gamification/views/gamification_views.xml
index 6dd61094c557239d932e2b204a788fdbbfef8176..e819b83e124120f6734e79253ad409ea4a48a26e 100644
--- a/addons/hr_gamification/views/gamification_views.xml
+++ b/addons/hr_gamification/views/gamification_views.xml
@@ -66,7 +66,7 @@
<menuitem id="menu_hr_gamification" parent="hr.menu_hr_root" name="Challenges" sequence="40"/>
<menuitem id="gamification_badge_menu_hr" parent="menu_hr_gamification" action="gamification.badge_list_action" />
- <menuitem id="gamification_challenge_menu_hr" parent="menu_hr_gamification" action="challenge_list_action2" groups="base.group_hr_user"/>
- <menuitem id="gamification_goal_menu_hr" parent="menu_hr_gamification" action="goals_menu_groupby_action2" groups="base.group_hr_user"/>
+ <menuitem id="gamification_challenge_menu_hr" parent="menu_hr_gamification" action="challenge_list_action2" groups="hr.group_hr_user"/>
+ <menuitem id="gamification_goal_menu_hr" parent="menu_hr_gamification" action="goals_menu_groupby_action2" groups="hr.group_hr_user"/>
</odoo>
diff --git a/addons/hr_holidays/models/hr.py b/addons/hr_holidays/models/hr.py
index 3ea382744e009e474a115ad4cc040018d2d528ad..9f79e35cc2ad0ed07092841cde9e9141f5746e44 100644
--- a/addons/hr_holidays/models/hr.py
+++ b/addons/hr_holidays/models/hr.py
@@ -176,7 +176,7 @@ class Employee(models.Model):
@api.multi
def _compute_show_leaves(self):
- show_leaves = self.env['res.users'].has_group('base.group_hr_user')
+ show_leaves = self.env['res.users'].has_group('hr.group_hr_user')
for employee in self:
if show_leaves or employee.user_id == self.env.user:
employee.show_leaves = True
diff --git a/addons/hr_holidays/models/hr_holidays.py b/addons/hr_holidays/models/hr_holidays.py
index 80d57ae62a8a8569273d9f14cff025ed8874c1b6..24b0b875d8fb652df828188f94900c6ae53d340a 100644
--- a/addons/hr_holidays/models/hr_holidays.py
+++ b/addons/hr_holidays/models/hr_holidays.py
@@ -224,7 +224,7 @@ class Holidays(models.Model):
or if he is an Hr Manager.
"""
user = self.env.user
- group_hr_manager = self.env.ref('base.group_hr_manager')
+ group_hr_manager = self.env.ref('hr.group_hr_manager')
for holiday in self:
if group_hr_manager in user.groups_id or holiday.employee_id and holiday.employee_id.user_id == user:
holiday.can_reset = True
@@ -332,7 +332,7 @@ class Holidays(models.Model):
return res
def _check_state_access_right(self, vals):
- if vals.get('state') and vals['state'] not in ['draft', 'confirm', 'cancel'] and not self.env['res.users'].has_group('base.group_hr_user'):
+ if vals.get('state') and vals['state'] not in ['draft', 'confirm', 'cancel'] and not self.env['res.users'].has_group('hr.group_hr_user'):
return False
return True
@@ -436,7 +436,7 @@ class Holidays(models.Model):
def action_approve(self):
# if double_validation: this method is the first approval approval
# if not double_validation: this method calls action_validate() below
- if not self.env.user.has_group('base.group_hr_user'):
+ if not self.env.user.has_group('hr.group_hr_user'):
raise UserError(_('Only an HR Officer or Manager can approve leave requests.'))
manager = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
@@ -451,14 +451,14 @@ class Holidays(models.Model):
@api.multi
def action_validate(self):
- if not self.env.user.has_group('base.group_hr_user'):
+ if not self.env.user.has_group('hr.group_hr_user'):
raise UserError(_('Only an HR Officer or Manager can approve leave requests.'))
manager = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
for holiday in self:
if holiday.state not in ['confirm', 'validate1']:
raise UserError(_('Leave request must be confirmed in order to approve it.'))
- if holiday.state == 'validate1' and not holiday.env.user.has_group('base.group_hr_manager'):
+ if holiday.state == 'validate1' and not holiday.env.user.has_group('hr.group_hr_manager'):
raise UserError(_('Only an HR Manager can apply the second approval on leave requests.'))
holiday.write({'state': 'validate'})
@@ -510,7 +510,7 @@ class Holidays(models.Model):
@api.multi
def action_refuse(self):
- if not self.env.user.has_group('base.group_hr_user'):
+ if not self.env.user.has_group('hr.group_hr_user'):
raise UserError(_('Only an HR Officer or Manager can refuse leave requests.'))
manager = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
@@ -556,7 +556,7 @@ class Holidays(models.Model):
recipients. Indeed those will have specific action in their notification
emails.
"""
- group_hr_user = self.env.ref('base.group_hr_user')
+ group_hr_user = self.env.ref('hr.group_hr_user')
for recipient in recipients:
if recipient.id in done_ids:
continue
diff --git a/addons/hr_holidays/security/hr_holidays_security.xml b/addons/hr_holidays/security/hr_holidays_security.xml
index 5598774fcd3ddfbfc766b1f650970261e951f145..fb6041db7fe1841f370c00d7914044cac8a97aa7 100644
--- a/addons/hr_holidays/security/hr_holidays_security.xml
+++ b/addons/hr_holidays/security/hr_holidays_security.xml
@@ -22,14 +22,14 @@
<field name="name">Holidays Officer</field>
<field name="model_id" ref="model_hr_holidays"/>
<field name="domain_force">[(1,'=',1)]</field>
- <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+ <field name="groups" eval="[(4,ref('hr.group_hr_user'))]"/>
</record>
<record id="resource_leaves_officer" model="ir.rule">
<field name="name">Leaves Officer</field>
<field name="model_id" ref="model_resource_calendar_leaves"/>
<field name="domain_force">[(1,'=',1)]</field>
- <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+ <field name="groups" eval="[(4,ref('hr.group_hr_user'))]"/>
</record>
<record id="hr_holidays_status_rule_multi_company" model="ir.rule">
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 0b8f5329842eba1888f916f5397e81e05392a641..cf7e7b24bed08ec33bc27eec65619ef9f30b0431 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,10 +1,10 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_holidays_user,hr.holidays.user,model_hr_holidays,base.group_hr_user,1,1,1,1
+access_hr_holidays_user,hr.holidays.user,model_hr_holidays,hr.group_hr_user,1,1,1,1
access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1
access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
-access_hr_holydays_status_manager,hr.holidays.status manager,model_hr_holidays_status,base.group_hr_manager,1,1,1,1
-access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,1,1,1,1
-access_resource_calendar_leaves_user,resource_calendar_leaves_user,resource.model_resource_calendar_leaves,base.group_hr_user,1,1,1,1
-access_calendar_event_hr_user,calendar.event.hr.user,calendar.model_calendar_event,base.group_hr_user,1,1,1,1
-access_calendar_event_type_manager,calendar.event.type.manager,calendar.model_calendar_event_type,base.group_hr_manager,1,1,1,1
-access_calendar_attendee_hr_user,calendar.attendee.hr.user,calendar.model_calendar_attendee,base.group_hr_user,1,1,1,1
+access_hr_holydays_status_manager,hr.holidays.status manager,model_hr_holidays_status,hr.group_hr_manager,1,1,1,1
+access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,hr.group_hr_user,1,1,1,1
+access_resource_calendar_leaves_user,resource_calendar_leaves_user,resource.model_resource_calendar_leaves,hr.group_hr_user,1,1,1,1
+access_calendar_event_hr_user,calendar.event.hr.user,calendar.model_calendar_event,hr.group_hr_user,1,1,1,1
+access_calendar_event_type_manager,calendar.event.type.manager,calendar.model_calendar_event_type,hr.group_hr_manager,1,1,1,1
+access_calendar_attendee_hr_user,calendar.attendee.hr.user,calendar.model_calendar_attendee,hr.group_hr_user,1,1,1,1
diff --git a/addons/hr_holidays/tests/common.py b/addons/hr_holidays/tests/common.py
index 8134675266a1b067df2290ceae4787f253da908b..40ec4e850b3e26d31a4aa9258e90bcecbf39fa21 100644
--- a/addons/hr_holidays/tests/common.py
+++ b/addons/hr_holidays/tests/common.py
@@ -19,13 +19,13 @@ class TestHrHolidaysBase(common.TransactionCase):
'name': 'Armande HrUser',
'login': 'Armande',
'email': 'armande.hruser@example.com',
- 'groups_id': [(6, 0, [group_employee_id, self.ref('base.group_hr_user')])]
+ 'groups_id': [(6, 0, [group_employee_id, self.ref('hr.group_hr_user')])]
}).id
self.user_hrmanager_id = Users.create({
'name': 'Bastien HrManager',
'login': 'bastien',
'email': 'bastien.hrmanager@example.com',
- 'groups_id': [(6, 0, [group_employee_id, self.ref('base.group_hr_manager')])]
+ 'groups_id': [(6, 0, [group_employee_id, self.ref('hr.group_hr_manager')])]
}).id
self.user_employee_id = Users.create({
'name': 'David Employee',
diff --git a/addons/hr_holidays/views/hr_holidays_views.xml b/addons/hr_holidays/views/hr_holidays_views.xml
index 7d3cf301a9a4d4115326905a4973cec72ebcbfe6..4bd0cba4722b3431f5627d8e89555e783fa60978 100644
--- a/addons/hr_holidays/views/hr_holidays_views.xml
+++ b/addons/hr_holidays/views/hr_holidays_views.xml
@@ -29,9 +29,9 @@
<filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
<separator/>
<filter string="My Department Leaves" name="department" domain="[('department_id.manager_id.user_id', '=', uid)]" help="My Department Leaves"/>
- <filter string="My Team Leaves" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="base.group_hr_manager" help="Leaves of Your Team Member"/>
+ <filter string="My Team Leaves" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr.group_hr_manager" help="Leaves of Your Team Member"/>
<separator/>
- <filter string="To Report in Payslip" name="gray" domain="[('payslip_status', '=', False)]" groups="base.group_hr_manager"/>
+ <filter string="To Report in Payslip" name="gray" domain="[('payslip_status', '=', False)]" groups="hr.group_hr_manager"/>
<separator/>
<filter string="To Do" name="todo" domain="[('payslip_status', '=', False), ('holiday_status_id.active', '=', True)]"/>
<separator/>
@@ -83,9 +83,9 @@
<field name="type" invisible="1"/>
<header>
<button string="Confirm" name="action_confirm" states="draft" type="object" class="oe_highlight"/>
- <button string="Approve" name="action_approve" states="confirm" type="object" groups="base.group_hr_user" class="oe_highlight"/>
- <button string="Validate" name="action_validate" states="validate1" type="object" groups="base.group_hr_manager" class="oe_highlight"/>
- <button string="Refuse" name="action_refuse" states="confirm,validate,validate1" type="object" groups="base.group_hr_user"/>
+ <button string="Approve" name="action_approve" states="confirm" type="object" groups="hr.group_hr_user" class="oe_highlight"/>
+ <button string="Validate" name="action_validate" states="validate1" type="object" groups="hr.group_hr_manager" class="oe_highlight"/>
+ <button string="Refuse" name="action_refuse" states="confirm,validate,validate1" type="object" groups="hr.group_hr_user"/>
<button string="Reset to Draft" name="action_draft" type="object"
attrs="{'invisible': ['|', ('can_reset', '=', False), ('state', 'not in', ['confirm', 'refuse'])]}"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate"/>
@@ -111,14 +111,14 @@
</div>
</group>
<group>
- <field name="holiday_type" attrs="{'readonly':[('type', '=', 'remove'),('state','!=','draft')]}" string="Mode" groups="base.group_hr_user" context="{'employee_id':employee_id}" />
- <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+ <field name="holiday_type" attrs="{'readonly':[('type', '=', 'remove'),('state','!=','draft')]}" string="Mode" groups="hr.group_hr_user" context="{'employee_id':employee_id}" />
+ <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="hr.group_hr_user"/>
<field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly': [('type', '=', 'remove'),('state','!=','draft'), ('state','!=','confirm')], 'invisible':[('holiday_type','=','employee')]}"/>
- <field name="department_id" groups="base.group_hr_user" attrs="{'readonly':['|','|' ,('type','=','add'),('holiday_type','=','category'),('state','=', 'validate')],'invisible':[('holiday_type','=','category')]}"/>
- <field name="payslip_status" groups="base.group_hr_manager" attrs="{'invisible':[('type','=','add')]}" widget="toggle_button"/>
+ <field name="department_id" groups="hr.group_hr_user" attrs="{'readonly':['|','|' ,('type','=','add'),('holiday_type','=','category'),('state','=', 'validate')],'invisible':[('holiday_type','=','category')]}"/>
+ <field name="payslip_status" groups="hr.group_hr_manager" attrs="{'invisible':[('type','=','add')]}" widget="toggle_button"/>
</group>
<field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..." attrs="{'invisible': [('type', '=', 'remove')]}"/>
- <div groups="base.group_hr_manager" attrs="{'invisible':[('type','=','add')]}">
+ <div groups="hr.group_hr_manager" attrs="{'invisible':[('type','=','add')]}">
<separator string="Comment by Manager"/>
<field name="report_note" placeholder="e.g. Report to the next month..."/>
</div>
@@ -169,8 +169,8 @@
<field name="number_of_days_temp" string="Allocated Days" sum="Remaining Days"/>
<field name="state"/>
<button name="toggle_payslip_status" field_name="payslip_status" type="object"
- widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="base.group_hr_manager"/>
- <field name="report_note" groups="base.group_hr_manager"/>
+ widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="hr.group_hr_manager"/>
+ <field name="report_note" groups="hr.group_hr_manager"/>
<field name="payslip_status" invisible="1"/>
</tree>
</field>
@@ -213,7 +213,7 @@
<field name="holiday_status_id"/>
<field name="state"/>
<button name="toggle_payslip_status" field_name="payslip_status" type="object"
- widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="base.group_hr_manager"/>
+ widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="hr.group_hr_manager"/>
<field name="report_note"/>
<field name="payslip_status" invisible="1"/>
</tree>
@@ -236,7 +236,7 @@
<field name="state"/>
<field name="payslip_status" invisible="1"/>
<button name="toggle_payslip_status" field_name="payslip_status" type="object"
- widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="base.group_hr_manager"/>
+ widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="hr.group_hr_manager"/>
<field name="category_id" invisible="1"/>
<field name="department_id" invisible="not context.get('set_visible',False)"/>
<field name="manager_id" invisible="1"/>
@@ -269,7 +269,7 @@
parent="menu_hr_holidays_root"
sequence="1"
action="action_hr_holidays_dashboard"
- groups="base.group_hr_manager"/>
+ groups="hr.group_hr_manager"/>
<menuitem
id="menu_hr_holidays_my_leaves"
@@ -282,14 +282,14 @@
name="Leaves to Approve"
parent="menu_hr_holidays_root"
sequence="3"
- groups="base.group_hr_manager,base.group_hr_user"/>
+ groups="hr.group_hr_manager,hr.group_hr_user"/>
<menuitem
id="menu_hr_holidays_report"
name="Reports"
parent="menu_hr_holidays_root"
sequence="99"
- groups="base.group_hr_manager,base.group_hr_user"/>
+ groups="hr.group_hr_manager,hr.group_hr_user"/>
<record id="open_ask_holidays" model="ir.actions.act_window">
<field name="name">Leaves Request</field>
@@ -518,7 +518,7 @@
id="menu_open_department_leave_approve"
name="Leaves"
parent="menu_hr_holidays_approvals"
- groups="base.group_hr_manager,base.group_hr_user"
+ groups="hr.group_hr_manager,hr.group_hr_user"
action="open_department_holidays_approve"
sequence="1"/>
@@ -538,7 +538,7 @@
</record>
<menuitem
- id="menu_open_department_leave_allocation_approve" groups="base.group_hr_manager,base.group_hr_user"
+ id="menu_open_department_leave_allocation_approve" groups="hr.group_hr_manager,hr.group_hr_user"
name="Leaves Allocation"
parent="menu_hr_holidays_approvals"
action="open_department_holidays_allocation_approve"
@@ -548,7 +548,7 @@
id="menu_open_employee_leave"
name="Leave Details"
parent="menu_hr_holidays_report"
- groups="base.group_hr_manager,base.group_hr_user"
+ groups="hr.group_hr_manager,hr.group_hr_user"
action="open_employee_leaves"
sequence="4"/>
@@ -637,7 +637,7 @@
name="Configuration"
parent="menu_hr_holidays_root"
sequence="100"
- groups="base.group_hr_manager"
+ groups="hr.group_hr_manager"
action="open_view_holiday_status"/>
<!-- Shortcuts -->
diff --git a/addons/hr_maintenance/security/equipment.xml b/addons/hr_maintenance/security/equipment.xml
index 1c5d4470b55d24a0ad70240a974dd56487008d9e..991651d813b2cf5fdbab9c35c1f9c50943f49e78 100644
--- a/addons/hr_maintenance/security/equipment.xml
+++ b/addons/hr_maintenance/security/equipment.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- HR officers and HR managers are allowed to manage equipments -->
- <record id="base.group_hr_user" model="res.groups">
- <field name="implied_ids" eval="[(4, ref('base.group_equipment_manager'))]"/>
+ <record id="hr.group_hr_user" model="res.groups">
+ <field name="implied_ids" eval="[(4, ref('maintenance.group_equipment_manager'))]"/>
</record>
</odoo>
diff --git a/addons/hr_payroll/models/hr_payroll.py b/addons/hr_payroll/models/hr_payroll.py
index 63d65c553c6392683bd4b72056a928cbb40ad1e8..53b5a491a780dda64322c0e8cb3dde3174935ff0 100644
--- a/addons/hr_payroll/models/hr_payroll.py
+++ b/addons/hr_payroll/models/hr_payroll.py
@@ -843,7 +843,7 @@ class HrEmployee(models.Model):
_description = 'Employee'
slip_ids = fields.One2many('hr.payslip', 'employee_id', string='Payslips', readonly=True)
- payslip_count = fields.Integer(compute='_compute_payslip_count', string='Payslips', groups="base.group_hr_user")
+ payslip_count = fields.Integer(compute='_compute_payslip_count', string='Payslips', groups="hr.group_hr_user")
@api.multi
def _compute_payslip_count(self):
diff --git a/addons/hr_payroll/security/hr_payroll_security.xml b/addons/hr_payroll/security/hr_payroll_security.xml
index d475c925f4258b88cc83b447e5233eb35c5e1caa..706cd96f1a130de37512a1e4abde710c90a43a69 100644
--- a/addons/hr_payroll/security/hr_payroll_security.xml
+++ b/addons/hr_payroll/security/hr_payroll_security.xml
@@ -6,7 +6,7 @@
<field name="name">Employee Payslip</field>
<field name="model_id" ref="model_hr_payslip"/>
<field name="domain_force">['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)]</field>
- <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+ <field name="groups" eval="[(4,ref('hr.group_hr_user'))]"/>
</record>
</data>
diff --git a/addons/hr_payroll/security/ir.model.access.csv b/addons/hr_payroll/security/ir.model.access.csv
index 24ca631c4d8673a3343ade51a5ba0d199a12cc84..8009c8646e8ceca8b6bfde4c02c60826aaab4299 100644
--- a/addons/hr_payroll/security/ir.model.access.csv
+++ b/addons/hr_payroll/security/ir.model.access.csv
@@ -1,11 +1,11 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_payroll_structure,hr.payroll.structure,model_hr_payroll_structure,base.group_hr_user,1,1,1,1
-access_hr_contribution_register,hr.contribution.register,model_hr_contribution_register,base.group_hr_user,1,1,1,1
-access_hr_salary_rule_category,hr.salary.rule.category,model_hr_salary_rule_category,base.group_hr_user,1,1,1,1
-access_hr_payslip,hr.payslip,model_hr_payslip,base.group_hr_user,1,1,1,1
-access_hr_payslip_line,hr.payslip.line,model_hr_payslip_line,base.group_hr_user,1,1,1,1
-access_hr_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,base.group_hr_user,1,1,1,1
-access_hr_payslip_worked_days ,hr.payslip.worked_days,model_hr_payslip_worked_days,base.group_hr_manager,1,1,1,1
-access_hr_payslip_run,hr.payslip.run,model_hr_payslip_run,base.group_hr_manager,1,1,1,1
-access_hr_rule_input,hr.rule.input,model_hr_rule_input,base.group_hr_manager,1,1,1,1
-access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,base.group_hr_user,1,1,1,1
+access_hr_payroll_structure,hr.payroll.structure,model_hr_payroll_structure,hr.group_hr_user,1,1,1,1
+access_hr_contribution_register,hr.contribution.register,model_hr_contribution_register,hr.group_hr_user,1,1,1,1
+access_hr_salary_rule_category,hr.salary.rule.category,model_hr_salary_rule_category,hr.group_hr_user,1,1,1,1
+access_hr_payslip,hr.payslip,model_hr_payslip,hr.group_hr_user,1,1,1,1
+access_hr_payslip_line,hr.payslip.line,model_hr_payslip_line,hr.group_hr_user,1,1,1,1
+access_hr_payslip_input_user,hr.payslip.input.user,model_hr_payslip_input,hr.group_hr_user,1,1,1,1
+access_hr_payslip_worked_days ,hr.payslip.worked_days,model_hr_payslip_worked_days,hr.group_hr_manager,1,1,1,1
+access_hr_payslip_run,hr.payslip.run,model_hr_payslip_run,hr.group_hr_manager,1,1,1,1
+access_hr_rule_input,hr.rule.input,model_hr_rule_input,hr.group_hr_manager,1,1,1,1
+access_hr_salary_rule_user,hr.salary.rule.user,model_hr_salary_rule,hr.group_hr_user,1,1,1,1
diff --git a/addons/hr_payroll/views/hr_payroll_views.xml b/addons/hr_payroll/views/hr_payroll_views.xml
index 5c0f5a9ba0439e76c4367e598fd45ec3ce530b8f..c0fe336d7d67ff13c4815eb4e71d9b55251e590e 100644
--- a/addons/hr_payroll/views/hr_payroll_views.xml
+++ b/addons/hr_payroll/views/hr_payroll_views.xml
@@ -4,7 +4,7 @@
<menuitem id="menu_hr_payroll_root" name="Payroll" sequence="45" web_icon="hr_payroll,static/description/icon.png"/>
<menuitem id="menu_hr_payroll_configuration" name="Configuration" parent="menu_hr_payroll_root"
- sequence="100" groups="base.group_hr_manager"/>
+ sequence="100" groups="hr.group_hr_manager"/>
<!-- Contract View -->
<record id="hr_contract_form_inherit" model="ir.ui.view">
@@ -369,7 +369,7 @@
<field name="search_view_id" ref="view_hr_payslip_filter"/>
</record>
- <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_payroll_root" groups="base.group_hr_user"/>
+ <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_payroll_root" groups="hr.group_hr_user"/>
<record id="act_hr_employee_payslip_list" model="ir.actions.act_window">
<field name="res_model">hr.payslip</field>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 2d1be8d77f3c746149cc44c14e30f294eede67ae..b374100f82341d6956ee1c521421ca63e9d6d4f1 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -1,13 +1,13 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_applicant_user,hr.applicant.user,model_hr_applicant,base.group_hr_user,1,1,1,1
-access_hr_recruitment_report,hr.recruitment.report,model_hr_recruitment_report,base.group_hr_manager,1,1,1,1
-access_hr_recruitment_stage_user,hr.recruitment.stage.user,model_hr_recruitment_stage,base.group_hr_user,1,0,0,0
-access_hr_recruitment_stage_manager,hr.recruitment.stage.manager,model_hr_recruitment_stage,base.group_hr_manager,1,1,1,1
-access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,base.group_hr_user,1,1,1,1
-access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1
-access_calendar_event_hruser,calendar.event.hruser,calendar.model_calendar_event,base.group_hr_user,1,1,1,1
-access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitment_source,base.group_hr_user,1,1,1,1
+access_hr_applicant_user,hr.applicant.user,model_hr_applicant,hr.group_hr_user,1,1,1,1
+access_hr_recruitment_report,hr.recruitment.report,model_hr_recruitment_report,hr.group_hr_manager,1,1,1,1
+access_hr_recruitment_stage_user,hr.recruitment.stage.user,model_hr_recruitment_stage,hr.group_hr_user,1,0,0,0
+access_hr_recruitment_stage_manager,hr.recruitment.stage.manager,model_hr_recruitment_stage,hr.group_hr_manager,1,1,1,1
+access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,hr.group_hr_user,1,1,1,1
+access_res_partner_hr_user,res.partner.user,base.model_res_partner,hr.group_hr_user,1,1,1,1
+access_calendar_event_hruser,calendar.event.hruser,calendar.model_calendar_event,hr.group_hr_user,1,1,1,1
+access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitment_source,hr.group_hr_user,1,1,1,1
access_hr_recruitment_source_all,hr.recruitment.source,model_hr_recruitment_source,,1,0,0,0
access_hr_applicant_category,hr.applicant_category,model_hr_applicant_category,,1,1,1,0
-access_hr_applicant_category_manager,hr.applicant_category,model_hr_applicant_category,base.group_hr_manager,1,1,1,1
-access_calendar_event_type_hr_officer,calendar.event.type.officer,calendar.model_calendar_event_type,base.group_hr_user,1,1,1,0
+access_hr_applicant_category_manager,hr.applicant_category,model_hr_applicant_category,hr.group_hr_manager,1,1,1,1
+access_calendar_event_type_hr_officer,calendar.event.type.officer,calendar.model_calendar_event_type,hr.group_hr_user,1,1,1,0
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 19ec05f58913bf52382f0bf16235ed36c22e01af..a88376c2d6e0dedf48687c7ae6c0a2553940e240 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -11,7 +11,7 @@
-
!record {model: res.users, id: res_users_hr_recruitment_officer}:
groups_id:
- - base.group_hr_user
+ - hr.group_hr_user
-
In Order to test process of Recruitment so giving HR officer's rights,
-
diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml
index f77c5d066f55b34f5b8962aedb912e82eab46be4..fb5ab058425077c29a3bfe0e22f456d6378a538c 100644
--- a/addons/hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_views.xml
@@ -537,15 +537,15 @@
name="Recruitment"
id="menu_hr_recruitment_root"
web_icon="hr_recruitment,static/description/icon.png"
- groups="base.group_hr_user"
+ groups="hr.group_hr_user"
sequence="80"/>
<menuitem id="menu_hr_recruitment_configuration" name="Configuration" parent="menu_hr_recruitment_root"
sequence="100"/>
<!-- ALL JOBS REQUESTS -->
- <menuitem parent="menu_hr_recruitment_root" id="hr.menu_hr_job_position" action="action_hr_job" sequence="1"/>
- <menuitem parent="menu_hr_recruitment_configuration" id="hr.menu_hr_job_position_config" action="action_hr_job_config" sequence="10"/>
+ <menuitem parent="menu_hr_recruitment_root" id="menu_hr_job_position" action="action_hr_job" sequence="1"/>
+ <menuitem parent="menu_hr_recruitment_configuration" id="menu_hr_job_position_config" action="action_hr_job_config" sequence="10"/>
<menuitem
name="Applications"
parent="menu_hr_recruitment_root"
diff --git a/addons/hr_recruitment_survey/security/hr_recruitment_survey_security.xml b/addons/hr_recruitment_survey/security/hr_recruitment_survey_security.xml
index 6b91d0bb7cc1d197db47f60b3313c5886fd4efe5..6817fa082fdf677dc68fd5c2b52d7ee3500883c7 100644
--- a/addons/hr_recruitment_survey/security/hr_recruitment_survey_security.xml
+++ b/addons/hr_recruitment_survey/security/hr_recruitment_survey_security.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <record id="base.group_hr_user" model="res.groups">
- <field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/>
+ <record id="hr.group_hr_user" model="res.groups">
+ <field name="implied_ids" eval="[(4, ref('survey.group_survey_user'))]"/>
</record>
</data>
</odoo>
diff --git a/addons/hr_recruitment_survey/security/ir.model.access.csv b/addons/hr_recruitment_survey/security/ir.model.access.csv
index 696c7d29670a68aae904f49ed076205443f4afae..f819ed9c362ad90c8d25ec39c28f000221ef0c4b 100644
--- a/addons/hr_recruitment_survey/security/ir.model.access.csv
+++ b/addons/hr_recruitment_survey/security/ir.model.access.csv
@@ -1,2 +1,2 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_survey_hr_user,survey.hr.user,survey.model_survey_survey,base.group_hr_user,1,1,1,0
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_survey_hr_user,survey.hr.user,survey.model_survey_survey,hr.group_hr_user,1,1,1,0
diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
index 08f6acf40deaada2df52cb005a7848d23acbf95c..a60dc747985e3e5290230ac001ab35c8717feb1f 100644
--- a/addons/hr_timesheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml
@@ -40,7 +40,7 @@
<menuitem id="menu_timesheets_reports" name="Reports"
- parent="timesheet_menu_root" sequence="99" groups="base.group_hr_manager"/>
+ parent="timesheet_menu_root" sequence="99" groups="hr.group_hr_manager"/>
<menuitem id="menu_hr_activity_analysis" parent="menu_timesheets_reports" action="act_hr_timesheet_report"
name="Activity Analysis"/>
</data>
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 3ace3a76584de58adac35bcea97e521221ed3bfe..88e6f7656f7297d0cd028a16f28e194a9056207a 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,7 +1,7 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_account_analytic_line,account.account.analytic.line,account.model_account_analytic_line,base.group_hr_user,1,1,1,1
+access_hr_account_analytic_line,account.account.analytic.line,account.model_account_analytic_line,hr.group_hr_user,1,1,1,1
access_hr_account_analytic_line_employee,account.account.analytic.line employee,account.model_account_analytic_line,base.group_user,1,1,1,1
-access_product_product_user,product.product user,product.model_product_product,base.group_hr_user,1,1,1,1
-access_product_template_hr_timesheet,product.template.hr.timesheet,product.model_product_template,base.group_hr_user,1,1,1,1
-access_product_uom_hr_timesheet,product.uom.hr.timesheet,product.model_product_uom,base.group_hr_user,1,1,1,1
+access_product_product_user,product.product user,product.model_product_product,hr.group_hr_user,1,1,1,1
+access_product_template_hr_timesheet,product.template.hr.timesheet,product.model_product_template,hr.group_hr_user,1,1,1,1
+access_product_uom_hr_timesheet,product.uom.hr.timesheet,product.model_product_uom,hr.group_hr_user,1,1,1,1
access_account_analytic_line_user,account.analytic.line.user,model_account_analytic_line,base.group_user,1,1,1,0
diff --git a/addons/hr_timesheet/test/hr_timesheet_users.yml b/addons/hr_timesheet/test/hr_timesheet_users.yml
index 181ce6b659720bf0020b0a745c689f8e4a7cba70..d1bf5167de8beee44c08a57a2d6f6ffd7e713e10 100644
--- a/addons/hr_timesheet/test/hr_timesheet_users.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_users.yml
@@ -10,7 +10,7 @@
-
!record {model: res.users, id: res_hr_timesheet_manager}:
groups_id:
- - base.group_hr_manager
+ - hr.group_hr_manager
-
Create a user as 'HR timesheet Officer'
-
@@ -23,7 +23,7 @@
-
!record {model: res.users, id: res_hr_timesheet_officer}:
groups_id:
- - base.group_hr_user
+ - hr.group_hr_user
-
Create a user as 'Timesheet Employee'
-
diff --git a/addons/hr_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/hr_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index 861b91ee4587f2b491a7fe48ed15cddf680f5c34..fbed4e21c01bd581849cae7d02e5f0f3f64bf821 100644
--- a/addons/hr_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/hr_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -6,7 +6,7 @@
name: HR Manager
login: hr
groups_id:
- - base.group_hr_manager
+ - hr.group_hr_manager
-
Create a product with type service used to specify employees designation
-
diff --git a/addons/hr_timesheet_attendance/security/ir.model.access.csv b/addons/hr_timesheet_attendance/security/ir.model.access.csv
index d958439c3a3f1b73a25d1ca141e92a841b78bcf9..13d82694216b3750ad161f9dd83a9a94699b222a 100644
--- a/addons/hr_timesheet_attendance/security/ir.model.access.csv
+++ b/addons/hr_timesheet_attendance/security/ir.model.access.csv
@@ -1,4 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_hr_user,1,1,1,1
+access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,hr.group_hr_user,1,1,1,1
access_hr_timesheet_sheet_sheet_day_user,hr.timesheet.sheet.sheet.day.user,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,0
-access_hr_timesheet_attendance_report,access_hr_timesheet_attendance_report,model_hr_timesheet_attendance_report,base.group_hr_manager,1,0,0,0
+access_hr_timesheet_attendance_report,access_hr_timesheet_attendance_report,model_hr_timesheet_attendance_report,hr.group_hr_manager,1,0,0,0
diff --git a/addons/hr_timesheet_attendance/views/hr_timesheet_sheet_views.xml b/addons/hr_timesheet_attendance/views/hr_timesheet_sheet_views.xml
index 56cadf5e076415d5c8bba4dce234e783c0a468f2..7aba1d01c339db55ae232b6084b0fd0cea6171d7 100644
--- a/addons/hr_timesheet_attendance/views/hr_timesheet_sheet_views.xml
+++ b/addons/hr_timesheet_attendance/views/hr_timesheet_sheet_views.xml
@@ -14,9 +14,9 @@
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_tree_simplified" />
<field name="arch" type="xml">
<field name="department_id" position="after">
- <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
+ <field name="total_attendance" widget="float_time" groups="hr.group_hr_attendance"/>
<field name="total_timesheet" widget="float_time"/>
- <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
+ <field name="total_difference" widget="float_time" groups="hr.group_hr_attendance"/>
</field>
</field>
</record>
@@ -47,7 +47,7 @@
<span class="o_stat_text">Timesheet</span>
</div>
</button>
- <button type="object" groups="base.group_hr_attendance"
+ <button type="object" groups="hr.group_hr_attendance"
class="oe_stat_button" icon="fa-users"
name="action_sheet_report">
<field name="attendance_count" widget="statinfo" string="Attendances"/>
@@ -55,9 +55,9 @@
</div>
</div>
<xpath expr="//page[@class='o_hr_timesheet_sheet_details']" position="after">
- <page string="Attendances" groups="base.group_hr_attendance">
+ <page string="Attendances" groups="hr.group_hr_attendance">
<group>
- <group groups="base.group_hr_attendance">
+ <group groups="hr.group_hr_attendance">
<field name="total_attendance" widget="float_time"/>
<field name="total_difference" widget="float_time"/>
</group>
@@ -115,7 +115,7 @@
context="{'search_default_sheet_id': [active_id]}"
id="act_hr_timesheet_sheet_sheet_by_account"
name="Timesheet by Account"
- groups="base.group_hr_attendance"
+ groups="hr.group_hr_attendance"
res_model="hr_timesheet_sheet.sheet.account"
src_model="hr_timesheet_sheet.sheet"/>
@@ -123,7 +123,7 @@
context="{'search_default_sheet_id': [active_id]}"
id="act_hr_timesheet_sheet_sheet_by_day"
name="Timesheet by Day"
- groups="base.group_hr_attendance"
+ groups="hr.group_hr_attendance"
res_model="hr_timesheet_sheet.sheet.day"
src_model="hr_timesheet_sheet.sheet"/>
@@ -133,9 +133,9 @@
<field name="arch" type="xml">
<tree decoration-info="total_difference<0.1" decoration-danger="total_difference>=0.1" string="Period">
<field name="name"/>
- <field name="total_attendance" widget="float_time" sum="Total Attendances" groups="base.group_hr_attendance"/>
+ <field name="total_attendance" widget="float_time" sum="Total Attendances" groups="hr.group_hr_attendance"/>
<field name="total_timesheet" widget="float_time" sum="Total Timesheet"/>
- <field name="total_difference" widget="float_time" sum="Total Difference" groups="base.group_hr_attendance"/>
+ <field name="total_difference" widget="float_time" sum="Total Difference" groups="hr.group_hr_attendance"/>
</tree>
</field>
</record>
diff --git a/addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py
index af694054355779ba16f4cbad31846d705e6b6120..4aa851b1ff0c800e82cc400887e8169ccc66b40b 100644
--- a/addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/models/hr_timesheet_sheet.py
@@ -119,7 +119,7 @@ class HrTimesheetSheet(models.Model):
@api.multi
def action_timesheet_draft(self):
- if not self.env.user.has_group('base.group_hr_user'):
+ if not self.env.user.has_group('hr.group_hr_user'):
raise UserError(_('Only an HR Officer or Manager can refuse timesheets or reset them to draft.'))
self.write({'state': 'draft'})
return True
@@ -134,7 +134,7 @@ class HrTimesheetSheet(models.Model):
@api.multi
def action_timesheet_done(self):
- if not self.env.user.has_group('base.group_hr_user'):
+ if not self.env.user.has_group('hr.group_hr_user'):
raise UserError(_('Only an HR Officer or Manager can approve timesheets.'))
if self.filtered(lambda sheet: sheet.state != 'confirm'):
raise UserError(_("Cannot approve a non-submitted timesheet."))
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 48c01c5dc437167392fe6f9bdd5631a70a0d2430..55922702d597b8ee8dc8f55075b322fed032bc83 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,4 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_hr_timesheet_sheet_sheet_user,hr_timesheet_sheet.sheet.user,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,1
access_hr_timesheet_sheet_sheet_system_employee,hr_timesheet_sheet.sheet.system.employee,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,0
-access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_hr_user,1,1,1,1
+access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,hr.group_hr_user,1,1,1,1
diff --git a/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml
index 8418b61a9214c4c94ceb10b9f827d0a66c97ee83..5497c6497cfa1293960832641da6e5dd949a5fdc 100644
--- a/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml
+++ b/addons/hr_timesheet_sheet/views/hr_timesheet_sheet_views.xml
@@ -58,9 +58,9 @@
<form string="Timesheet">
<header>
<button name="action_timesheet_confirm" states="draft" string="Submit to Manager" type="object" class="oe_highlight"/>
- <button name="action_timesheet_done" states="confirm" string="Approve" type="object" groups="base.group_hr_user" class="oe_highlight"/>
- <button name="action_timesheet_draft" states="done" string="Set to Draft" type="object" groups="base.group_hr_user"/>
- <button name="action_timesheet_draft" states="confirm" string="Refuse" type="object" groups="base.group_hr_user"/>
+ <button name="action_timesheet_done" states="confirm" string="Approve" type="object" groups="hr.group_hr_user" class="oe_highlight"/>
+ <button name="action_timesheet_draft" states="done" string="Set to Draft" type="object" groups="hr.group_hr_user"/>
+ <button name="action_timesheet_draft" states="confirm" string="Refuse" type="object" groups="hr.group_hr_user"/>
<field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
</header>
<sheet>
@@ -190,7 +190,7 @@
<menuitem id="menu_hr_to_approve" name="To Approve" parent="hr_timesheet.timesheet_menu_root" sequence="7"/>
<menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="menu_hr_to_approve"
- sequence="11" groups="base.group_hr_user"/>
+ sequence="11" groups="hr.group_hr_user"/>
<!--
account.analytic.line inheritancy
@@ -238,7 +238,7 @@
type="action"
class="oe_stat_button"
icon="fa-clock-o"
- groups="base.group_hr_manager">
+ groups="hr.group_hr_manager">
<field name="timesheet_count" widget="statinfo" string="Timesheets"/>
</button>
</div>
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
index f1e1ce401e2288194cc9d349b16132412ec881da..01961bb3ffdee306836ef9fe686f30078301ac3b 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -76,6 +76,6 @@
<field name="help">This report performs analysis on Payment Advices</field>
</record>
- <menuitem name="Reports" id="menu_l10n_in_hr_payroll_report" parent="hr_payroll.menu_hr_payroll_root" sequence="99" groups="base.group_hr_manager"/>
+ <menuitem name="Reports" id="menu_l10n_in_hr_payroll_report" parent="hr_payroll.menu_hr_payroll_root" sequence="99" groups="hr.group_hr_manager"/>
<menuitem action="action_payment_advice_report_all" id="menu_reporting_payment_advice" parent="menu_l10n_in_hr_payroll_report" sequence="5" />
</odoo>
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
index a333b7ee9fbce9c6dfccf1ef5ef634c8bffb3aff..177ffb7935856255b99836a0bed46d73583fb43a 100644
--- a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
@@ -74,8 +74,8 @@
<field name="help">This report performs analysis on Payslip</field>
</record>
- <menuitem name="Reports" id="menu_l10n_in_hr_payroll_report" parent="hr_payroll.menu_hr_payroll_root" sequence="99" groups="base.group_hr_manager"/>
- <menuitem action="action_payslip_report_all" id="menu_reporting_payslip" parent="menu_l10n_in_hr_payroll_report" sequence="5" groups="base.group_hr_manager"/>
+ <menuitem name="Reports" id="menu_l10n_in_hr_payroll_report" parent="hr_payroll.menu_hr_payroll_root" sequence="99" groups="hr.group_hr_manager"/>
+ <menuitem action="action_payslip_report_all" id="menu_reporting_payslip" parent="menu_l10n_in_hr_payroll_report" sequence="5" groups="hr.group_hr_manager"/>
<!--Hr Department Inherit Kanban view-->
<record id="hr_department_view_kanban" model="ir.ui.view">
<field name="name">hr.department.kanban.inherit</field>
diff --git a/addons/l10n_in_hr_payroll/security/ir.model.access.csv b/addons/l10n_in_hr_payroll/security/ir.model.access.csv
index 7ca0834449b67985be84bac85b81c0cbd0a66fab..dcebadc22099df11030b8ad31c99e87b0e1a60d6 100644
--- a/addons/l10n_in_hr_payroll/security/ir.model.access.csv
+++ b/addons/l10n_in_hr_payroll/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_hr_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1
-"access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_user",1,1,1,1
-"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","base.group_hr_manager",1,1,1,1
-"access_hr_payroll_payslip_report_user","payslip.report","model_payslip_report","base.group_hr_manager",1,1,1,1
+"access_hr_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","hr.group_hr_user",1,1,1,1
+"access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","hr.group_hr_user",1,1,1,1
+"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","hr.group_hr_manager",1,1,1,1
+"access_hr_payroll_payslip_report_user","payslip.report","model_payslip_report","hr.group_hr_manager",1,1,1,1
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
index 0f8ceb6046da5ad3484cb10e5e9f26371753cba7..0f76c4eb198ab99f874f77148ccfc805a651e4c6 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
@@ -36,6 +36,6 @@
sequence="200"
action="action_salary_employee_month"
id="menu_salary_employee_month"
- groups="base.group_hr_manager,base.group_hr_user"
+ groups="hr.group_hr_manager,hr.group_hr_user"
/>
</odoo>
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
index c4655e65a2f97c8dbc8afbcd06a7f1f80e640cf6..3f52d40269ef1bb3610c9b90ff144b936707aa06 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
@@ -35,6 +35,6 @@
action="action_yearly_salary_detail"
sequence="250"
id="menu_yearly_salary_detail"
- groups="base.group_hr_manager,base.group_hr_user"
+ groups="hr.group_hr_manager,hr.group_hr_user"
/>
</odoo>
diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml
index fcd1142192782f6fa328328c8c065a0b067b173c..daaabf92657485c8a63231273ff01152a52a04fe 100644
--- a/addons/mail/views/res_partner_views.xml
+++ b/addons/mail/views/res_partner_views.xml
@@ -52,7 +52,7 @@
multi="True"
target="new"
key2="client_action_multi"
- id="base.action_partner_mass_mail"
+ id="action_partner_mass_mail"
context="{
'default_composition_mode': 'mass_mail',
'default_partner_to': '${object.id or \'\'}',
@@ -61,7 +61,7 @@
}"/>
<record id="email_template_partner" model="mail.template">
- <field name="ref_ir_act_window" ref="base.action_partner_mass_mail"/>
+ <field name="ref_ir_act_window" ref="action_partner_mass_mail"/>
</record>
</data>
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index b6efbf967ac55692348f3c8c201b0f4ecf3c981a..2ae03360d140397a7634e1cab608f9151dd2344d 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -92,7 +92,7 @@
multi="True"
target="new"
key2="client_action_multi"
- id="base.action_partner_mass_mail"
+ id="action_partner_mass_mail"
context="{
'default_composition_mode': 'mass_mail',
'default_partner_to': '${object.id or \'\'}',
diff --git a/addons/maintenance/security/ir.model.access.csv b/addons/maintenance/security/ir.model.access.csv
index 8788384fa4f071390dad1c5bed306d299c1a0a48..f066a807a55d90c425934a23b9715d575bbb0b50 100644
--- a/addons/maintenance/security/ir.model.access.csv
+++ b/addons/maintenance/security/ir.model.access.csv
@@ -1,9 +1,9 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_equipment_user,equipment.user,model_maintenance_equipment,base.group_user,1,0,0,0
-access_equipment_admin_user,equipment.admin.user,model_maintenance_equipment,base.group_equipment_manager,1,1,1,1
+access_equipment_admin_user,equipment.admin.user,model_maintenance_equipment,group_equipment_manager,1,1,1,1
access_maintenance_system_user,equipment.request system user,model_maintenance_request,base.group_user,1,1,1,1
access_equipment_category_user,equipment.category.user,model_maintenance_equipment_category,base.group_user,1,0,0,0
-access_equipment_category_admin_user,equipment.category system user,model_maintenance_equipment_category,base.group_equipment_manager,1,1,1,1
+access_equipment_category_admin_user,equipment.category system user,model_maintenance_equipment_category,group_equipment_manager,1,1,1,1
access_maintenance_stage_user,maintenance.stage.user,model_maintenance_stage,base.group_user,1,0,0,0
-access_maintenance_stage_admin_user,equipment.request.stage system user,model_maintenance_stage,base.group_equipment_manager,1,1,1,1
+access_maintenance_stage_admin_user,equipment.request.stage system user,model_maintenance_stage,group_equipment_manager,1,1,1,1
access_maintenance_team_user,maintenance.team.user,model_maintenance_team,base.group_user,1,0,0,0
\ No newline at end of file
diff --git a/addons/maintenance/security/maintenance.xml b/addons/maintenance/security/maintenance.xml
index 313548b8a17d1d36301e191b72286cac1f619431..cf564b0c859e02ce4721249642656864c96cfc2f 100644
--- a/addons/maintenance/security/maintenance.xml
+++ b/addons/maintenance/security/maintenance.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- This group is only allowed to deal with equipment registration and maintenance -->
- <record id="base.group_equipment_manager" model="res.groups">
+ <record id="group_equipment_manager" model="res.groups">
<field name="name">Equipment Manager</field>
<field name="category_id" ref="base.module_category_human_resources"/>
<field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
@@ -27,14 +27,14 @@
<field name="name">Administrator of maintenance requests</field>
<field name="model_id" ref="model_maintenance_request"/>
<field name="domain_force">[(1, '=', 1)]</field>
- <field name="groups" eval="[(4, ref('base.group_equipment_manager'))]"/>
+ <field name="groups" eval="[(4, ref('group_equipment_manager'))]"/>
</record>
<record id="equipment_rule_admin_user" model="ir.rule">
<field name="name">Equipments administrator</field>
<field name="model_id" ref="model_maintenance_equipment"/>
<field name="domain_force">[(1, '=', 1)]</field>
- <field name="groups" eval="[(4, ref('base.group_equipment_manager'))]"/>
+ <field name="groups" eval="[(4, ref('group_equipment_manager'))]"/>
</record>
</odoo>
diff --git a/addons/maintenance/tests/test_maintenance.py b/addons/maintenance/tests/test_maintenance.py
index 11aae3d69864f8ebef0c3b3c579150acdcda9805..a9c55d95ffca6d11ed3e8e03c03215ee9094e37e 100644
--- a/addons/maintenance/tests/test_maintenance.py
+++ b/addons/maintenance/tests/test_maintenance.py
@@ -16,7 +16,7 @@ class TestEquipment(TransactionCase):
self.res_users = self.env['res.users']
self.main_company = self.env.ref('base.main_company')
res_user = self.env.ref('base.group_user')
- res_manager = self.env.ref('base.group_equipment_manager')
+ res_manager = self.env.ref('maintenance.group_equipment_manager')
self.user = self.res_users.create(dict(
name="Normal User/Employee",
diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml
index 26071d620910b95407e7adb57bcc2628159c8306..109cd016affe70d5c8ab4037f9196d681265c8fa 100644
--- a/addons/maintenance/views/maintenance_views.xml
+++ b/addons/maintenance/views/maintenance_views.xml
@@ -65,7 +65,7 @@
<group>
<field name="owner_user_id" string="Requested By"/>
<field name="equipment_id" context="{'default_category_id':category_id}"/>
- <field name="category_id" groups="base.group_equipment_manager"/>
+ <field name="category_id" groups="maintenance.group_equipment_manager"/>
<field name="request_date" groups="base.group_no_one"/>
<field name="close_date" groups="base.group_no_one"/>
<field name="archive" invisible="1"/>
@@ -165,7 +165,7 @@
<field name="request_date" groups="base.group_no_one"/>
<field name="owner_user_id"/>
<field name="technician_user_id"/>
- <field name="category_id" groups="base.group_equipment_manager"/>
+ <field name="category_id" groups="maintenance.group_equipment_manager"/>
<field name="stage_id"/>
</tree>
</field>
@@ -312,7 +312,7 @@
<field name="model"/>
<field name="serial_no"/>
</group><group>
- <field name="cost" groups="base.group_equipment_manager"/>
+ <field name="cost" groups="maintenance.group_equipment_manager"/>
<field name="warranty"/>
</group>
</group>
@@ -789,7 +789,7 @@
id="menu_m_dashboard"
name="Dashboard"
parent="menu_maintenance_title"
- groups="base.group_equipment_manager,base.group_user"
+ groups="group_equipment_manager,base.group_user"
action="maintenance_dashboard_action"
sequence="0"/>
@@ -797,7 +797,7 @@
id="menu_m_request"
name="Maintenance"
parent="menu_maintenance_title"
- groups="base.group_equipment_manager,base.group_user"
+ groups="group_equipment_manager,base.group_user"
sequence="1"/>
<menuitem
@@ -805,7 +805,7 @@
name="Maintenance Requests"
parent="menu_m_request"
action="hr_equipment_request_action"
- groups="base.group_equipment_manager,base.group_user"
+ groups="group_equipment_manager,base.group_user"
sequence="1"/>
<menuitem
@@ -813,7 +813,7 @@
name="Maintenance Calendar"
parent="menu_m_request"
action="hr_equipment_request_action_cal"
- groups="base.group_equipment_manager,base.group_user"
+ groups="group_equipment_manager,base.group_user"
sequence="2"/>
<menuitem
@@ -821,35 +821,35 @@
name="Equipments"
parent="menu_maintenance_title"
action="hr_equipment_action"
- groups="base.group_equipment_manager,base.group_user"
+ groups="group_equipment_manager,base.group_user"
sequence="2"/>
<menuitem
id="menu_m_reports"
name="Reporting"
parent="menu_maintenance_title"
- groups="base.group_equipment_manager,base.group_user"
+ groups="group_equipment_manager,base.group_user"
sequence="3"/>
<menuitem
id="menu_m_reports_oee"
name="Overall Equipment Effectiveness (OEE)"
parent="menu_m_reports"
- groups="base.group_equipment_manager,base.group_user"
+ groups="group_equipment_manager,base.group_user"
sequence="1"/>
<menuitem
id="menu_m_reports_losses"
name="Losses Analysis"
parent="menu_m_reports"
- groups="base.group_equipment_manager,base.group_user"
+ groups="group_equipment_manager,base.group_user"
sequence="2"/>
<menuitem
id="menu_maintenance_configuration"
name="Configuration"
parent="menu_maintenance_title"
- groups="base.group_equipment_manager"
+ groups="group_equipment_manager"
sequence="100"/>
<menuitem
@@ -857,7 +857,7 @@
name="Maintenance Teams"
parent="menu_maintenance_configuration"
action="maintenance_team_action_settings"
- groups="base.group_equipment_manager"
+ groups="group_equipment_manager"
sequence="1"/>
<menuitem
diff --git a/addons/membership/report/report_membership_views.xml b/addons/membership/report/report_membership_views.xml
index 9cb9e873526e372946aeb2c4f39ffeea0a350c77..d7eb4fee96af8bb2729c1bb456ece69fe4d312f9 100644
--- a/addons/membership/report/report_membership_views.xml
+++ b/addons/membership/report/report_membership_views.xml
@@ -65,7 +65,7 @@
<field name="context">{"search_default_start_date":1,"search_default_member":1, 'search_default_Revenue':1, 'search_default_this_month':1, 'search_default_salesman':1,'group_by_no_leaf':1}</field>
</record>
- <menuitem name="Reports" parent="base.menu_association"
+ <menuitem name="Reports" parent="menu_association"
sequence="99"
action="action_report_membership_tree"
id="menu_report_membership"
diff --git a/addons/membership/views/partner_views.xml b/addons/membership/views/partner_views.xml
index 6c34a5a175aa29609c62e326a401a783539a53e7..6d19bb5327949e5e120c5e8cc748360a40538de6 100644
--- a/addons/membership/views/partner_views.xml
+++ b/addons/membership/views/partner_views.xml
@@ -79,7 +79,7 @@
<field name="view_id" ref="base.res_partner_kanban_view"/>
<field name="act_window_id" ref="action_membership_members"/>
</record>
- <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association" action="action_membership_members"/>
+ <menuitem name="Members" id="menu_membership" sequence="0" parent="menu_association" action="action_membership_members"/>
<!-- PARTNERS -->
diff --git a/addons/membership/views/product_views.xml b/addons/membership/views/product_views.xml
index 18aaad1842bc25651736d48a8d87fe14bae4cf59..9651e2aa381ee68a0cba2b58252399a5dde56c3a 100644
--- a/addons/membership/views/product_views.xml
+++ b/addons/membership/views/product_views.xml
@@ -101,8 +101,8 @@
<field name="act_window_id" ref="action_membership_products"/>
</record>
- <menuitem name="Members" id="base.menu_association" sequence="15" web_icon="membership,static/description/icon.png"/>
- <menuitem name="Configuration" id="base.menu_marketing_config_association"
- parent="base.menu_association" sequence="100" action="action_membership_products"/>
+ <menuitem name="Members" id="menu_association" sequence="15" web_icon="membership,static/description/icon.png"/>
+ <menuitem name="Configuration" id="menu_marketing_config_association"
+ parent="menu_association" sequence="100" action="action_membership_products"/>
</odoo>
diff --git a/addons/mrp/data/mrp_demo.xml b/addons/mrp/data/mrp_demo.xml
index f5aba0ea2d9333b677f6e6e7b320c809dd92d160..70da69628f8e3d3dc5753b2d5f9f7fed39091d96 100644
--- a/addons/mrp/data/mrp_demo.xml
+++ b/addons/mrp/data/mrp_demo.xml
@@ -11,7 +11,7 @@
<field eval="1.0" name="manufacturing_lead"/>
</record>
- <record id="product.product_assembly" model="product.product">
+ <record id="product_assembly" model="product.product">
<field name="standard_price">0.1</field>
<field name="uom_id" ref="product.product_uom_hour"/>
<field name="uom_po_id" ref="product.product_uom_hour"/>
diff --git a/addons/mrp/views/mrp_config_settings_views.xml b/addons/mrp/views/mrp_config_settings_views.xml
index 148a99cbd4830d7c47929d6c3f8dc9accb98091e..c5d960500e07d9f9652f3792aa62a8cfb2ddf042 100644
--- a/addons/mrp/views/mrp_config_settings_views.xml
+++ b/addons/mrp/views/mrp_config_settings_views.xml
@@ -36,7 +36,7 @@
<field name="target">inline</field>
</record>
- <menuitem id="base.menu_mrp_config" name="Settings" parent="menu_mrp_configuration"
+ <menuitem id="menu_mrp_config" name="Settings" parent="menu_mrp_configuration"
sequence="0" action="action_mrp_configuration" groups="base.group_system"/>
</data>
</odoo>
diff --git a/addons/mrp/views/mrp_views_menus.xml b/addons/mrp/views/mrp_views_menus.xml
index 7595bedf0cb3ba871d80b7cbb36a7ae0070e3870..066c1f6aab190f7e59d7bd8bc5eb38ee0a81c256 100644
--- a/addons/mrp/views/mrp_views_menus.xml
+++ b/addons/mrp/views/mrp_views_menus.xml
@@ -2,7 +2,7 @@
<odoo>
<data>
<!-- Top menu item -->
- <menuitem id="base.menu_mrp_root"
+ <menuitem id="menu_mrp_root"
name="Manufacturing"
groups="group_mrp_user,group_mrp_manager"
icon="fa-wrench"
@@ -11,22 +11,22 @@
<menuitem id="menu_mrp_manufacturing"
name="Operations"
- parent="base.menu_mrp_root"
+ parent="menu_mrp_root"
sequence="10"/>
<menuitem id="menu_mrp_bom"
name="Master Data"
- parent="base.menu_mrp_root"
+ parent="menu_mrp_root"
sequence="20"/>
<menuitem id="menu_mrp_reporting"
name="Reporting"
- parent="base.menu_mrp_root"
+ parent="menu_mrp_root"
sequence="25"/>
<menuitem id="menu_mrp_configuration"
name="Configuration"
- parent="base.menu_mrp_root"
+ parent="menu_mrp_root"
groups="group_mrp_manager"
sequence="100"/>
diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml
index cccd5e5816db57cb62e6480270cf213b8a57a166..3947ea11dde07851a378f6a3601a85e315b760fb 100644
--- a/addons/mrp/views/mrp_workcenter_views.xml
+++ b/addons/mrp/views/mrp_workcenter_views.xml
@@ -385,7 +385,7 @@
name="Dashboard"
action="mrp_workcenter_kanban_action"
groups="group_mrp_routings"
- parent="base.menu_mrp_root"
+ parent="menu_mrp_root"
sequence="5"/>
diff --git a/addons/pos_data_drinks/data/pos_data_drinks.xml b/addons/pos_data_drinks/data/pos_data_drinks.xml
index 7fd6c218ab43afa4302d8a99405f0e90fb1d0205..31e83f23cded5d4c524ed9d8b2f61f99dfc2f75f 100644
--- a/addons/pos_data_drinks/data/pos_data_drinks.xml
+++ b/addons/pos_data_drinks/data/pos_data_drinks.xml
@@ -2,457 +2,457 @@
<data noupdate="1">
<!-- Drink Categories -->
- <record id="point_of_sale.beverage" model="pos.category">
+ <record id="beverage" model="pos.category">
<field name="name">Beverages</field>
<field name="image" type="base64" file="point_of_sale/static/img/beverage-image.jpg"/>
</record>
- <record id="point_of_sale.soft" model="pos.category">
- <field name="parent_id" ref="point_of_sale.beverage"/>
+ <record id="soft" model="pos.category">
+ <field name="parent_id" ref="beverage"/>
<field name="name">Soft Drinks</field>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-soft_drinks.jpg"/>
<field name="sequence">1</field>
</record>
- <record id="point_of_sale.milkshake" model="pos.category">
- <field name="parent_id" ref="point_of_sale.beverage"/>
+ <record id="milkshake" model="pos.category">
+ <field name="parent_id" ref="beverage"/>
<field name="name">Milkshakes</field>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-milkshakes.jpg"/>
<field name="sequence">3</field>
</record>
- <record id="point_of_sale.hot" model="pos.category">
- <field name="parent_id" ref="point_of_sale.beverage"/>
+ <record id="hot" model="pos.category">
+ <field name="parent_id" ref="beverage"/>
<field name="name">Hot Drinks</field>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-hot_drinks.jpg"/>
<field name="sequence">2</field>
</record>
- <record id="point_of_sale.beer" model="pos.category">
- <field name="parent_id" ref="point_of_sale.beverage"/>
+ <record id="beer" model="pos.category">
+ <field name="parent_id" ref="beverage"/>
<field name="name">Beers</field>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-beers.jpg"/>
<field name="sequence">4</field>
</record>
- <record id="point_of_sale.alcohol" model="pos.category">
- <field name="parent_id" ref="point_of_sale.beverage"/>
+ <record id="alcohol" model="pos.category">
+ <field name="parent_id" ref="beverage"/>
<field name="name">Import Drinks</field>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-import_drinks.jpg"/>
<field name="sequence">6</field>
</record>
- <record id="point_of_sale.wine" model="pos.category">
- <field name="parent_id" ref="point_of_sale.beverage"/>
+ <record id="wine" model="pos.category">
+ <field name="parent_id" ref="beverage"/>
<field name="name">Wine</field>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-wine.jpg"/>
<field name="sequence">5</field>
</record>
- <record id="point_of_sale.cocktail" model="pos.category">
- <field name="parent_id" ref="point_of_sale.beverage"/>
+ <record id="cocktail" model="pos.category">
+ <field name="parent_id" ref="beverage"/>
<field name="name">Cocktails</field>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-cocktail.jpg"/>
<field name="sequence">7</field>
</record>
<!-- Soft Products -->
- <record id="point_of_sale.coke" model="product.product">
+ <record id="coke" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">2.20</field>
<field name="name">Coca-Cola</field>
- <field name="pos_categ_id" ref="point_of_sale.soft"/>
+ <field name="pos_categ_id" ref="soft"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-coke.jpg"/>
</record>
- <record id="point_of_sale.fanta" model="product.product">
+ <record id="fanta" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">2.20</field>
<field name="name">Fanta</field>
- <field name="pos_categ_id" ref="point_of_sale.soft"/>
+ <field name="pos_categ_id" ref="soft"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-fanta.jpg"/>
</record>
- <record id="point_of_sale.ice_tea" model="product.product">
+ <record id="ice_tea" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">2.20</field>
<field name="name">Ice Tea</field>
- <field name="pos_categ_id" ref="point_of_sale.soft"/>
+ <field name="pos_categ_id" ref="soft"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-ice_tea.jpg"/>
</record>
- <record id="point_of_sale.minute_maid" model="product.product">
+ <record id="minute_maid" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">2.20</field>
<field name="name">Minute Maid</field>
- <field name="pos_categ_id" ref="point_of_sale.soft"/>
+ <field name="pos_categ_id" ref="soft"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-minute_maid.jpg"/>
</record>
- <record id="point_of_sale.redbull" model="product.product">
+ <record id="redbull" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">2.60</field>
<field name="name">RedBull</field>
- <field name="pos_categ_id" ref="point_of_sale.soft"/>
+ <field name="pos_categ_id" ref="soft"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-redbull.jpg"/>
</record>
- <record id="point_of_sale.schweppes" model="product.product">
+ <record id="schweppes" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">2.20</field>
<field name="name">Schweppes</field>
- <field name="pos_categ_id" ref="point_of_sale.soft"/>
+ <field name="pos_categ_id" ref="soft"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-schweppes.jpg"/>
</record>
- <record id="point_of_sale.sprite" model="product.product">
+ <record id="sprite" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">2.20</field>
<field name="name">Sprite</field>
- <field name="pos_categ_id" ref="point_of_sale.soft"/>
+ <field name="pos_categ_id" ref="soft"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-sprite.jpg"/>
</record>
- <record id="point_of_sale.water" model="product.product">
+ <record id="water" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">2.20</field>
<field name="name">Water</field>
- <field name="pos_categ_id" ref="point_of_sale.soft"/>
+ <field name="pos_categ_id" ref="soft"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-water.jpg"/>
</record>
<!-- Milk Shakes -->
- <record id="point_of_sale.milkshake_banana" model="product.product">
+ <record id="milkshake_banana" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.60</field>
<field name="name">Milkshake Banana</field>
- <field name="pos_categ_id" ref="point_of_sale.milkshake"/>
+ <field name="pos_categ_id" ref="milkshake"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-milkshake_banana.jpg"/>
</record>
- <record id="point_of_sale.milkshake_cherry" model="product.product">
+ <record id="milkshake_cherry" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.60</field>
<field name="name">Milkshake Cherry</field>
- <field name="pos_categ_id" ref="point_of_sale.milkshake"/>
+ <field name="pos_categ_id" ref="milkshake"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-milkshake_cherry.jpg"/>
</record>
- <record id="point_of_sale.milkshake_chocolate" model="product.product">
+ <record id="milkshake_chocolate" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.60</field>
<field name="name">Milkshake Chocolate</field>
- <field name="pos_categ_id" ref="point_of_sale.milkshake"/>
+ <field name="pos_categ_id" ref="milkshake"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-milkshake_chocolate.jpg"/>
</record>
- <record id="point_of_sale.milkshake_strawberry" model="product.product">
+ <record id="milkshake_strawberry" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.60</field>
<field name="name">Milkshake Strawberry</field>
- <field name="pos_categ_id" ref="point_of_sale.milkshake"/>
+ <field name="pos_categ_id" ref="milkshake"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-milkshake_strawberry.jpg"/>
</record>
- <record id="point_of_sale.milkshake_vanilla" model="product.product">
+ <record id="milkshake_vanilla" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.60</field>
<field name="name">Milkshake Vanilla</field>
- <field name="pos_categ_id" ref="point_of_sale.milkshake"/>
+ <field name="pos_categ_id" ref="milkshake"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-milkshake_vanilla.jpg"/>
</record>
<!-- Hot Drinks Products -->
- <record id="point_of_sale.tea" model="product.product">
+ <record id="tea" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">4.70</field>
<field name="name">Yellow Tea</field>
- <field name="pos_categ_id" ref="point_of_sale.hot"/>
+ <field name="pos_categ_id" ref="hot"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-tea.jpg"/>
</record>
- <record id="point_of_sale.nescafe" model="product.product">
+ <record id="nescafe" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">4.70</field>
<field name="name">Nescafe</field>
- <field name="pos_categ_id" ref="point_of_sale.hot"/>
+ <field name="pos_categ_id" ref="hot"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-nescafe.jpg"/>
</record>
- <record id="point_of_sale.irish_coffee" model="product.product">
+ <record id="irish_coffee" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">4.70</field>
<field name="name">Irish Coffee</field>
- <field name="pos_categ_id" ref="point_of_sale.hot"/>
+ <field name="pos_categ_id" ref="hot"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-irish_coffee.jpg"/>
</record>
- <record id="point_of_sale.green_tea" model="product.product">
+ <record id="green_tea" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">4.70</field>
<field name="name">Green Tea</field>
- <field name="pos_categ_id" ref="point_of_sale.hot"/>
+ <field name="pos_categ_id" ref="hot"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-green_tea.jpg"/>
</record>
- <record id="point_of_sale.capuccino" model="product.product">
+ <record id="capuccino" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">4.70</field>
<field name="name">Capuccino</field>
- <field name="pos_categ_id" ref="point_of_sale.hot"/>
+ <field name="pos_categ_id" ref="hot"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-capuccino.jpg"/>
</record>
- <record id="point_of_sale.coffee" model="product.product">
+ <record id="coffee" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">4.70</field>
<field name="name">Coffee</field>
- <field name="pos_categ_id" ref="point_of_sale.hot"/>
+ <field name="pos_categ_id" ref="hot"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-coffee.jpg"/>
</record>
- <record id="point_of_sale.espresso" model="product.product">
+ <record id="espresso" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">4.70</field>
<field name="name">Espresso</field>
- <field name="pos_categ_id" ref="point_of_sale.hot"/>
+ <field name="pos_categ_id" ref="hot"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-espresso.jpg"/>
</record>
<!-- Wine Products-->
- <record id="point_of_sale.red_wine" model="product.product">
+ <record id="red_wine" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.50</field>
<field name="name">Red Wine</field>
- <field name="pos_categ_id" ref="point_of_sale.wine"/>
+ <field name="pos_categ_id" ref="wine"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-red_wine.jpg"/>
</record>
- <record id="point_of_sale.white_wine" model="product.product">
+ <record id="white_wine" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.50</field>
<field name="name">White Wine</field>
- <field name="pos_categ_id" ref="point_of_sale.wine"/>
+ <field name="pos_categ_id" ref="wine"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-white_wine.jpg"/>
</record>
- <record id="point_of_sale.rose_wine" model="product.product">
+ <record id="rose_wine" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.50</field>
<field name="name">Rose Wine</field>
- <field name="pos_categ_id" ref="point_of_sale.wine"/>
+ <field name="pos_categ_id" ref="wine"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-rose_wine.jpg"/>
</record>
<!-- Import Drink Products -->
- <record id="point_of_sale.bacardi" model="product.product">
+ <record id="bacardi" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Bacardi</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-bacardi.jpg"/>
</record>
- <record id="point_of_sale.baileys" model="product.product">
+ <record id="baileys" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Baileys</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-baileys.jpg"/>
</record>
- <record id="point_of_sale.captain_morgan" model="product.product">
+ <record id="captain_morgan" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Captain Morgan</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-captain_morgan.jpg"/>
</record>
- <record id="point_of_sale.disaronno" model="product.product">
+ <record id="disaronno" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Disaronno</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-disaronno.jpg"/>
</record>
- <record id="point_of_sale.gordon" model="product.product">
+ <record id="gordon" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Gordon</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-gordon.jpg"/>
</record>
- <record id="point_of_sale.jack_daniels" model="product.product">
+ <record id="jack_daniels" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Jack Daniel's</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-jack_daniels.jpg"/>
</record>
- <record id="point_of_sale.jim_beam" model="product.product">
+ <record id="jim_beam" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Jim Beam</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-jim_beam.jpg"/>
</record>
- <record id="point_of_sale.malibu" model="product.product">
+ <record id="malibu" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Malibu</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-malibu.jpg"/>
</record>
- <record id="point_of_sale.martini" model="product.product">
+ <record id="martini" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Martini</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-martini.jpg"/>
</record>
- <record id="point_of_sale.red_label" model="product.product">
+ <record id="red_label" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Red Label</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-red_label.jpg"/>
</record>
- <record id="point_of_sale.safari" model="product.product">
+ <record id="safari" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Safari</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-safari.jpg"/>
</record>
- <record id="point_of_sale.smirnoff" model="product.product">
+ <record id="smirnoff" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Smirnoff</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-smirnoff.jpg"/>
</record>
- <record id="point_of_sale.tequila" model="product.product">
+ <record id="tequila" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">5.50</field>
<field name="name">Tequila</field>
- <field name="pos_categ_id" ref="point_of_sale.alcohol"/>
+ <field name="pos_categ_id" ref="alcohol"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-tequila.jpg"/>
</record>
<!-- Beers Products -->
- <record id="point_of_sale.tuborg" model="product.product">
+ <record id="tuborg" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.40</field>
<field name="name">Tuborg</field>
- <field name="pos_categ_id" ref="point_of_sale.beer"/>
+ <field name="pos_categ_id" ref="beer"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-tuborg.jpg"/>
</record>
- <record id="point_of_sale.stella_artois" model="product.product">
+ <record id="stella_artois" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.40</field>
<field name="name">Stella Artois</field>
- <field name="pos_categ_id" ref="point_of_sale.beer"/>
+ <field name="pos_categ_id" ref="beer"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-stella_artois.jpg"/>
</record>
- <record id="point_of_sale.miller" model="product.product">
+ <record id="miller" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.40</field>
<field name="name">Miller</field>
- <field name="pos_categ_id" ref="point_of_sale.beer"/>
+ <field name="pos_categ_id" ref="beer"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-miller.jpg"/>
</record>
- <record id="point_of_sale.guinness" model="product.product">
+ <record id="guinness" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.40</field>
<field name="name">Guinness</field>
- <field name="pos_categ_id" ref="point_of_sale.beer"/>
+ <field name="pos_categ_id" ref="beer"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-guinness.jpg"/>
</record>
- <record id="point_of_sale.fosters" model="product.product">
+ <record id="fosters" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.40</field>
<field name="name">Foster's</field>
- <field name="pos_categ_id" ref="point_of_sale.beer"/>
+ <field name="pos_categ_id" ref="beer"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-fosters.jpg"/>
</record>
- <record id="point_of_sale.efes" model="product.product">
+ <record id="efes" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.40</field>
<field name="name">Efes</field>
- <field name="pos_categ_id" ref="point_of_sale.beer"/>
+ <field name="pos_categ_id" ref="beer"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-efes.jpg"/>
</record>
- <record id="point_of_sale.corona" model="product.product">
+ <record id="corona" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.40</field>
<field name="name">Corona</field>
- <field name="pos_categ_id" ref="point_of_sale.beer"/>
+ <field name="pos_categ_id" ref="beer"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-corona.jpg"/>
</record>
- <record id="point_of_sale.carlsberg" model="product.product">
+ <record id="carlsberg" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.40</field>
<field name="name">Carlsberg</field>
- <field name="pos_categ_id" ref="point_of_sale.beer"/>
+ <field name="pos_categ_id" ref="beer"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-carlsberg.jpg"/>
</record>
- <record id="point_of_sale.budweiser" model="product.product">
+ <record id="budweiser" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">3.40</field>
<field name="name">Budweiser</field>
- <field name="pos_categ_id" ref="point_of_sale.beer"/>
+ <field name="pos_categ_id" ref="beer"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-budweiser.jpg"/>
</record>
<!-- Cocktails Products -->
- <record id="point_of_sale.bloody_mary" model="product.product">
+ <record id="bloody_mary" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">Bloody Mary</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-bloody_mary.jpg"/>
</record>
- <record id="point_of_sale.caipirinha" model="product.product">
+ <record id="caipirinha" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">Caipirinha</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-caipirinha.jpg"/>
</record>
- <record id="point_of_sale.cosmopolitan" model="product.product">
+ <record id="cosmopolitan" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">Cosmopolitan</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-cosmopolitan.jpg"/>
</record>
- <record id="point_of_sale.cuba_libre" model="product.product">
+ <record id="cuba_libre" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">Cuba Libre</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-cuba_libre.jpg"/>
</record>
- <record id="point_of_sale.daiquiri" model="product.product">
+ <record id="daiquiri" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">Daiquiri</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-daiquiri.jpg"/>
</record>
- <record id="point_of_sale.manhattan" model="product.product">
+ <record id="manhattan" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">Manhattan</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-manhattan.jpg"/>
</record>
- <record id="point_of_sale.margarita" model="product.product">
+ <record id="margarita" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">Margarita</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-margarita.jpg"/>
</record>
- <record id="point_of_sale.martini_cocktail" model="product.product">
+ <record id="martini_cocktail" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">Martini</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-martini_cocktail.jpg"/>
</record>
- <record id="point_of_sale.mojito" model="product.product">
+ <record id="mojito" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">Mojito</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-mojito.jpg"/>
</record>
- <record id="point_of_sale.pina_colada" model="product.product">
+ <record id="pina_colada" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">Pina Colada</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-pina_colada.jpg"/>
</record>
- <record id="point_of_sale.white_russian" model="product.product">
+ <record id="white_russian" model="product.product">
<field name="available_in_pos">True</field>
<field name="list_price">7.50</field>
<field name="name">White Russian</field>
- <field name="pos_categ_id" ref="point_of_sale.cocktail"/>
+ <field name="pos_categ_id" ref="cocktail"/>
<field name="image" type="base64" file="pos_data_drinks/static/img/th-white_russian.jpg"/>
</record>
diff --git a/addons/project/data/web_planner_data.xml b/addons/project/data/web_planner_data.xml
index 10716495060c1d0dfe897f1fe5926b33a2d6dab2..ce1b1be207724e5b9111844f48a554dbb5c9ae83 100644
--- a/addons/project/data/web_planner_data.xml
+++ b/addons/project/data/web_planner_data.xml
@@ -1076,7 +1076,7 @@
<record id="planner_project" model="web.planner">
<field name="name">Project Management planner</field>
<field name="view_id" ref="project_planner"/>
- <field name="menu_id" ref="base.menu_main_pm"/>
+ <field name="menu_id" ref="menu_main_pm"/>
<field name="progress">7</field>
<field name="planner_application">planner_project</field>
<field name="tooltip_planner"><![CDATA[
diff --git a/addons/project/static/src/js/tour.js b/addons/project/static/src/js/tour.js
index 4f9813c61d0348831ed5511f9b417983ce04e8f6..a455f9278345b83c86de92aee52bef55ca939093 100644
--- a/addons/project/static/src/js/tour.js
+++ b/addons/project/static/src/js/tour.js
@@ -9,7 +9,7 @@ var _t = core._t;
tour.register('project_tour', {
url: "/web",
}, [tour.STEPS.MENU_MORE, {
- trigger: '.o_app[data-menu-xmlid="base.menu_main_pm"], .oe_menu_toggler[data-menu-xmlid="base.menu_main_pm"]',
+ trigger: '.o_app[data-menu-xmlid="project.menu_main_pm"], .oe_menu_toggler[data-menu-xmlid="project.menu_main_pm"]',
content: _t('Want a better way to <b>manage your projects</b>? <i>It starts here.</i>'),
position: 'bottom',
}, {
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index dc8013c4e15782d47dc6164387feec6faba78253..0ed16dcaf4bcef9d2c3986dd95b8645ed05073d2 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -3,17 +3,17 @@
<!-- Top menu item -->
<menuitem name="Project"
- id="base.menu_main_pm"
+ id="menu_main_pm"
groups="group_project_manager,group_project_user"
web_icon="project,static/description/icon.png"
sequence="50"/>
<menuitem name="Search"
id="menu_project_management"
- parent="base.menu_main_pm"
+ parent="menu_main_pm"
sequence="2" groups="base.group_no_one,group_project_user"/>
- <menuitem id="menu_project_config" name="Configuration" parent="base.menu_main_pm"
+ <menuitem id="menu_project_config" name="Configuration" parent="menu_main_pm"
sequence="100" groups="project.group_project_manager"/>
<record id="view_task_search_form" model="ir.ui.view">
@@ -680,9 +680,9 @@ action = model.activate_sample_project()
<menuitem id="menu_tasks_config" name="GTD" parent="menu_project_config" sequence="2"/>
- <menuitem action="open_task_type_form" id="base.menu_project_config_project" name="Stages" parent="menu_project_config" sequence="3" groups="group_project_manager"/>
+ <menuitem action="open_task_type_form" id="menu_project_config_project" name="Stages" parent="menu_project_config" sequence="3" groups="group_project_manager"/>
- <menuitem action="open_view_project_all" id="menu_projects" name="Dashboard" parent="base.menu_main_pm" sequence="1"/>
+ <menuitem action="open_view_project_all" id="menu_projects" name="Dashboard" parent="menu_main_pm" sequence="1"/>
<menuitem action="open_view_project_all_config" id="menu_projects_config" name="Projects" parent="menu_project_config" sequence="10"/>
<!-- User Form -->
@@ -724,9 +724,9 @@ action = model.activate_sample_project()
<menuitem action="project_tags_action" id="menu_project_tags_act" parent="menu_project_config" groups="base.group_no_one"/>
<!-- Reporting menus -->
- <menuitem id="base.menu_project_report" name="Reports"
+ <menuitem id="menu_project_report" name="Reports"
groups="project.group_project_manager"
action="project.action_project_task_user_tree"
- parent="base.menu_main_pm" sequence="99"/>
+ parent="menu_main_pm" sequence="99"/>
</odoo>
diff --git a/addons/project/views/res_config_views.xml b/addons/project/views/res_config_views.xml
index 3a7abe453e1c0de7c9fffc2416a9087354b1d66e..265a08ce932e9e0d3e208d3f45192772a2939d92 100644
--- a/addons/project/views/res_config_views.xml
+++ b/addons/project/views/res_config_views.xml
@@ -43,6 +43,6 @@
<field name="target">inline</field>
</record>
- <menuitem id="base.menu_project_general_settings" name="Settings" parent="menu_project_config"
+ <menuitem id="menu_project_general_settings" name="Settings" parent="menu_project_config"
sequence="0" action="action_config_settings" groups="base.group_system"/>
</odoo>
diff --git a/addons/project/views/tour_views.xml b/addons/project/views/tour_views.xml
index 541c4e0f251a2aff339caa004f6ad85f94f9c0f1..3a572ab85cc778751f6979ec17984536829c4f9f 100644
--- a/addons/project/views/tour_views.xml
+++ b/addons/project/views/tour_views.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- Make the xmlid of menus required by the Project tour available in webclient -->
- <record id="base.menu_main_pm" model="ir.ui.menu">
+ <record id="menu_main_pm" model="ir.ui.menu">
<field name="load_xmlid" eval="True"/>
</record>
<record id="menu_projects" model="ir.ui.menu">
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 68217744ca807f117895bac93298eb67c9fdebf9..5f2d2260fdb20812201e33cf945bc2bf6c160720 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -93,5 +93,5 @@
</record>
<menuitem id="menu_project_issue_report_tree" action="action_project_issue_report"
- parent="base.menu_project_report"/>
+ parent="project.menu_project_report"/>
</odoo>
diff --git a/addons/purchase/report/purchase_report_views.xml b/addons/purchase/report/purchase_report_views.xml
index f47a36e0a15e60b7db6bd21b9056ccd07038d0f6..ae673cc5b79a654d076a7ec555d25070b8345852 100644
--- a/addons/purchase/report/purchase_report_views.xml
+++ b/addons/purchase/report/purchase_report_views.xml
@@ -91,7 +91,7 @@
<field name="help">Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your vendors, etc.</field>
</record>
- <menuitem id="base.purchase_report" name="Reports" parent="base.menu_purchase_root" sequence="99"
+ <menuitem id="purchase_report" name="Reports" parent="menu_purchase_root" sequence="99"
groups="purchase.group_purchase_manager" action="action_purchase_order_report_all"/>
</odoo>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index 1cd13f7c3dba0786d0db370ae47dd58d5f7ea901..2208d7cf2378b448e227738c4394805cf7e59890 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -3,20 +3,20 @@
<!-- Top menu item -->
<menuitem name="Purchases"
- id="base.menu_purchase_root"
+ id="menu_purchase_root"
groups="group_purchase_manager,group_purchase_user"
web_icon="purchase,static/description/icon.png"
sequence="25"/>
<menuitem id="menu_procurement_management" name="Purchase"
- parent="base.menu_purchase_root" sequence="1" />
+ parent="menu_purchase_root" sequence="1" />
<!--Supplier menu-->
<menuitem id="menu_procurement_management_supplier_name" name="Vendors"
parent="menu_procurement_management"
action="base.action_partner_supplier_form" sequence="15"/>
- <menuitem id="menu_purchase_config" name="Configuration" parent="base.menu_purchase_root" sequence="100" groups="group_purchase_manager"/>
+ <menuitem id="menu_purchase_config" name="Configuration" parent="menu_purchase_root" sequence="100" groups="group_purchase_manager"/>
<menuitem
action="product.product_supplierinfo_type_action" id="menu_product_pricelist_action2_purchase"
@@ -40,7 +40,7 @@
<!-- Purchase Control Menu -->
- <menuitem id="menu_purchase_control" name="Control" parent="base.menu_purchase_root" sequence="4"/>
+ <menuitem id="menu_purchase_control" name="Control" parent="purchase.menu_purchase_root" sequence="4"/>
<!--Inventory control-->
<menuitem action="stock.action_receipt_picking_move" id="menu_action_picking_tree_in_move"
diff --git a/addons/rating_project/views/project_view.xml b/addons/rating_project/views/project_view.xml
index a054d12b41e709b7373fa2411481f1f0ede0cd48..f545285a6763842972f75289b7f01e2d215e6df7 100644
--- a/addons/rating_project/views/project_view.xml
+++ b/addons/rating_project/views/project_view.xml
@@ -104,7 +104,7 @@
</p>
</field>
</record>
- <menuitem id="rating_rating_menu_project" action="rating_rating_action_project" parent="base.menu_project_report" sequence="5"/>
+ <menuitem id="rating_rating_menu_project" action="rating_rating_action_project" parent="project.menu_project_report" sequence="5"/>
</data>
</odoo>
diff --git a/addons/sale/report/sale_report_views.xml b/addons/sale/report/sale_report_views.xml
index af00b04801a617a127801a578e71534bf7e14025..3e5c81922707ac6340400cd542fb57ff05fc0a15 100644
--- a/addons/sale/report/sale_report_views.xml
+++ b/addons/sale/report/sale_report_views.xml
@@ -94,6 +94,6 @@
<field name="help">This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application.</field>
</record>
- <menuitem name="Sales" action="action_order_report_all" id="menu_report_product_all" parent="base.menu_sale_report" sequence="10"/>
+ <menuitem name="Sales" action="action_order_report_all" id="menu_report_product_all" parent="sales_team.menu_sale_report" sequence="10"/>
</odoo>
diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml
index 500aa9bc191f59db31afcd29189401f8ce5e879d..0b64cccde2222f7aa64fc85e5f8f9288ca084897 100644
--- a/addons/sale/views/sale_config_settings_views.xml
+++ b/addons/sale/views/sale_config_settings_views.xml
@@ -61,9 +61,4 @@
</field>
</record>
- <menuitem id="sales_team.menu_sale_config" name="Configuration" parent="sales_team.menu_base_partner"
- sequence="100" groups="sales_team.group_sale_manager"/>
- <menuitem id="sales_team.menu_sale_general_settings" name="Settings" parent="sales_team.menu_sale_config"
- sequence="0" action="sales_team.action_sale_config" groups="base.group_system"/>
-
</odoo>
diff --git a/addons/sale/views/sale_layout_category_view.xml b/addons/sale/views/sale_layout_category_view.xml
index 9104798247e8d2f28237a6fa7c5294373883b926..ecb0bbebb740f94ab5a6cfb2bc56c9a8be0b21cc 100644
--- a/addons/sale/views/sale_layout_category_view.xml
+++ b/addons/sale/views/sale_layout_category_view.xml
@@ -53,7 +53,7 @@
<menuitem
action="report_configuration_action"
id="Report_configuration"
- parent="sales_team.menu_sales_config"
+ parent="menu_sales_config"
sequence="2"
name="Report Layout Categories"
groups="sale.group_sale_layout"
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 33389e9359a48ca01036a2202c41674c1ce582aa..a68a044db213b83c1552b6fcba21262efd2d788d 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -11,7 +11,7 @@
web_icon="sale,static/description/icon.png"/>
<menuitem
- id= "sales_team.menu_sales_config"
+ id= "menu_sales_config"
parent= "sales_team.menu_sale_config"
sequence= "1"
name= "Sales"
@@ -28,7 +28,6 @@
<menuitem id="next_id_16" name="Units of Measure" parent="sale.prod_config_main" sequence="30" groups="product.group_uom"/>
<menuitem action="product.product_uom_form_action" id="menu_product_uom_form_action" parent="sale.prod_config_main" sequence="6" groups="product.group_uom"/>
<menuitem action="product.product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="sale.prod_config_main" sequence="7" groups="base.group_no_one"/>
- <menuitem id="sales_team.menu_sale_config_sales" name="Configuration" parent="sales_team.menu_base_partner" sequence="100" groups="account.group_account_user"/>
<menuitem id="menu_product_pricelist_main" name="Pricelists" parent="sales_team.menu_sale_config" groups="product.group_sale_pricelist" sequence="3"/>
<menuitem action="product.product_pricelist_action2" id="menu_product_pricelist_action2" parent="menu_product_pricelist_main" sequence="1" groups="product.group_sale_pricelist"/>
diff --git a/addons/sale_stock/views/stock_views.xml b/addons/sale_stock/views/stock_views.xml
index 5ca76285232d7e451728f65d6f4691fc0ff43cfb..fdd641ccd907164b9780b5755ad6a4a251c02e6d 100644
--- a/addons/sale_stock/views/stock_views.xml
+++ b/addons/sale_stock/views/stock_views.xml
@@ -7,10 +7,10 @@
</xpath>
</template>
- <menuitem id="base.menu_aftersale" name="After-Sale"
+ <menuitem id="menu_aftersale" name="After-Sale"
groups="sales_team.group_sale_salesman"
parent="sales_team.menu_base_partner" sequence="5" />
- <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_aftersale" sequence="1"/>
+ <menuitem id="menu_invoiced" name="Invoicing" parent="menu_aftersale" sequence="1"/>
<record id="stock_location_route_form_view_inherit_sale_stock" model="ir.ui.view">
<field name="name">stock.location.route.form</field>
diff --git a/addons/sales_team/__openerp__.py b/addons/sales_team/__openerp__.py
index b29ce7ca17b3ae09ec71013985ff46ae49fa0f35..9d515d5ce94da17154f7f3dbc0979363a89f5060 100644
--- a/addons/sales_team/__openerp__.py
+++ b/addons/sales_team/__openerp__.py
@@ -14,9 +14,9 @@ Using this application you can manage Sales Team with CRM and/or Sales
'data': ['security/sales_team_security.xml',
'security/ir.model.access.csv',
'data/sales_team_data.xml',
+ 'views/res_config_view.xml',
'views/crm_team_views.xml',
'views/sales_team_dashboard.xml',
- 'views/res_config_view.xml',
],
'qweb': [
"static/src/xml/sales_team_dashboard.xml",
diff --git a/addons/sales_team/data/sales_team_data.xml b/addons/sales_team/data/sales_team_data.xml
index c460851f1d8ad4f9aa52f8a94db2218165ec9f39..4ecca9ff36f01dd42fd81c2b92f082d8b6b2bfd0 100644
--- a/addons/sales_team/data/sales_team_data.xml
+++ b/addons/sales_team/data/sales_team_data.xml
@@ -5,6 +5,10 @@
<field name="name">Direct Sales</field>
<field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
</record>
+
+ <record model="crm.team" id="salesteam_website_sales">
+ <field name="name">Website Sales</field>
+ </record>
</data>
<record model="res.groups" id="sales_team.group_sale_salesman">
diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml
index a55b85e8f9b1f0a6c1b93130519bec89c6032d77..50365a22e07a5e499dc0c819b5a5dcee59856bbf 100644
--- a/addons/sales_team/views/crm_team_views.xml
+++ b/addons/sales_team/views/crm_team_views.xml
@@ -1,15 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
- <menuitem name="Sales"
- id="menu_base_partner"
- groups="group_sale_salesman,group_sale_manager" sequence="6"/>
- <menuitem id="menu_sales" name="Sales" parent="menu_base_partner" sequence="5"/>
- <menuitem id="menu_sale_config" name="Configuration" parent="menu_base_partner"
- sequence="100" groups="group_sale_manager"/>
+<menuitem name="Sales"
+ id="menu_base_partner"
+ groups="group_sale_salesman,group_sale_manager" sequence="6"/>
+
+ <menuitem id="menu_sales" name="Sales" parent="menu_base_partner" sequence="5"/>
<menuitem id="menu_partner_form" parent="menu_sales" action="base.action_partner_form" sequence="3"/>
+ <menuitem id="menu_sale_config" name="Configuration" parent="menu_base_partner"
+ sequence="100" groups="group_sale_manager"/>
+ <menuitem id="menu_sale_general_settings" name="Settings" parent="menu_sale_config"
+ sequence="0" action="action_sale_config" groups="base.group_system"/>
+
<menuitem id="menu_config_address_book" parent="menu_sale_config" name="Contacts" sequence="4" groups="base.group_system"/>
<menuitem action="base.action_partner_category_form" id="menu_partner_category_form" name="Contact Tags" sequence="1" parent="menu_config_address_book" groups="base.group_no_one"/>
<menuitem action="base.action_partner_title_contact" id="menu_partner_title_contact" name="Contact Titles" parent="menu_config_address_book" sequence="3" groups="base.group_no_one"/>
@@ -17,10 +21,11 @@
<menuitem action="base.action_country" id="menu_country_partner" parent="menu_localisation" sequence="1" groups="base.group_no_one"/>
<menuitem action="base.action_country_group" id="menu_country_group" name="Country Group" parent="menu_localisation" sequence="3" groups="base.group_no_one"/>
<menuitem action="base.action_country_state" id="menu_country_state_partner" parent="menu_localisation" sequence="2" groups="base.group_no_one"/>
- <menuitem action="base.action_currency_form" id="base.menu_action_currency_form" parent="menu_localisation" sequence="3" groups="base.group_multi_currency"/>
+ <menuitem action="base.action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="3" groups="base.group_multi_currency"/>
<menuitem id="menu_config_bank_accounts" name="Bank Accounts" parent="menu_config_address_book" sequence="6" groups="base.group_no_one"/>
- <menuitem action="base.action_res_bank_form" id="base.menu_action_res_bank_form" parent="menu_config_bank_accounts" sequence="1" groups="base.group_no_one"/>
- <menuitem action="base.action_res_partner_bank_account_form" id="base.menu_action_res_partner_bank_form" parent="menu_config_bank_accounts" groups="base.group_no_one" sequence="2"/>
+ <menuitem action="base.action_res_bank_form" id="menu_action_res_bank_form" parent="menu_config_bank_accounts" sequence="1" groups="base.group_no_one"/>
+ <menuitem action="base.action_res_partner_bank_account_form" id="menu_action_res_partner_bank_form" parent="menu_config_bank_accounts" groups="base.group_no_one" sequence="2"/>
+
<!-- Cateamions Search view -->
@@ -165,7 +170,7 @@
</xpath>
</template>
- <menuitem id="base.menu_sale_report" name="Reports" parent="sales_team.menu_base_partner" sequence="99" groups="sales_team.group_sale_manager"/>
+ <menuitem id="menu_sale_report" name="Reports" parent="sales_team.menu_base_partner" sequence="99" groups="sales_team.group_sale_manager"/>
<record id="sales_team_config_action" model="ir.actions.act_window">
<field name="name">Sales Teams</field>
@@ -186,7 +191,7 @@
</record>
<menuitem name="Sales Teams"
- id="base.sales_team_config"
+ id="sales_team_config"
parent="sales_team.menu_sale_config"
action="sales_team_config_action"/>
diff --git a/addons/survey/data/survey_demo_user.xml b/addons/survey/data/survey_demo_user.xml
index f1baaed445f4139549b4a34908b3a0ff95a9e20c..0daa9eb465e615b7273f49e5f41fd914c60f5e5c 100644
--- a/addons/survey/data/survey_demo_user.xml
+++ b/addons/survey/data/survey_demo_user.xml
@@ -3,7 +3,7 @@
<data noupdate="1">
<!-- Grant survey permissions to demo user -->
<record id="base.user_demo" model="res.users">
- <field eval="[(4, ref('base.group_survey_manager'))]" name="groups_id"/>
+ <field eval="[(4, ref('group_survey_manager'))]" name="groups_id"/>
</record>
</data>
</odoo>
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index e49c976ea1f4c65806ab67784a54a04113c32bb1..09b5ae48178542af5ed01872bfbdae3dd0cb1397 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -6,17 +6,17 @@ access_survey_label_public,survey.label public,model_survey_label,,1,0,0,0
access_survey_user_input_public,survey.user_input public,model_survey_user_input,,1,1,1,0
access_survey_user_input_line_public,survey.user_input_line public,model_survey_user_input_line,,1,1,1,0
access_survey_stage_public,survey.stage public,model_survey_stage,,1,0,0,0
-access_survey_user,survey.survey user,model_survey_survey,base.group_survey_user,1,0,0,0
-access_survey_page_user,survey.page user,model_survey_page,base.group_survey_user,1,0,0,0
-access_survey_question_user,survey.question user,model_survey_question,base.group_survey_user,1,0,0,0
-access_survey_label_user,survey.label user,model_survey_label,base.group_survey_user,1,0,0,0
-access_survey_user_input_user,survey.user_input user,model_survey_user_input,base.group_survey_user,1,1,1,0
-access_survey_user_input_line_user,survey.user_input_line user,model_survey_user_input_line,base.group_survey_user,1,1,1,0
-access_survey_stage_user,survey.stage user,model_survey_stage,base.group_survey_user,1,0,0,0
-access_survey_manager,survey.survey manager,model_survey_survey,base.group_survey_manager,1,1,1,1
-access_survey_page_manager,survey.page manager,model_survey_page,base.group_survey_manager,1,1,1,1
-access_survey_question_manager,survey.question manager,model_survey_question,base.group_survey_manager,1,1,1,1
-access_survey_label_manager,survey.label manager,model_survey_label,base.group_survey_manager,1,1,1,1
-access_survey_user_input_manager,survey.user_input manager,model_survey_user_input,base.group_survey_manager,1,1,1,1
-access_survey_user_input_line_manager,survey.user_input_line manager,model_survey_user_input_line,base.group_survey_manager,1,1,1,1
-access_survey_stage_manager,survey.stage manager,model_survey_stage,base.group_survey_manager,1,1,1,1
\ No newline at end of file
+access_survey_user,survey.survey user,model_survey_survey,group_survey_user,1,0,0,0
+access_survey_page_user,survey.page user,model_survey_page,group_survey_user,1,0,0,0
+access_survey_question_user,survey.question user,model_survey_question,group_survey_user,1,0,0,0
+access_survey_label_user,survey.label user,model_survey_label,group_survey_user,1,0,0,0
+access_survey_user_input_user,survey.user_input user,model_survey_user_input,group_survey_user,1,1,1,0
+access_survey_user_input_line_user,survey.user_input_line user,model_survey_user_input_line,group_survey_user,1,1,1,0
+access_survey_stage_user,survey.stage user,model_survey_stage,group_survey_user,1,0,0,0
+access_survey_manager,survey.survey manager,model_survey_survey,group_survey_manager,1,1,1,1
+access_survey_page_manager,survey.page manager,model_survey_page,group_survey_manager,1,1,1,1
+access_survey_question_manager,survey.question manager,model_survey_question,group_survey_manager,1,1,1,1
+access_survey_label_manager,survey.label manager,model_survey_label,group_survey_manager,1,1,1,1
+access_survey_user_input_manager,survey.user_input manager,model_survey_user_input,group_survey_manager,1,1,1,1
+access_survey_user_input_line_manager,survey.user_input_line manager,model_survey_user_input_line,group_survey_manager,1,1,1,1
+access_survey_stage_manager,survey.stage manager,model_survey_stage,group_survey_manager,1,1,1,1
\ No newline at end of file
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 65b9bcc3ff4bbed75fc7ed9ceaa05869b0c6d4c4..357e939525e52a7ad42d586dd2b5bf5b96ce20a4 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -2,21 +2,21 @@
<odoo>
<data noupdate="1">
<!-- Survey users -->
- <record model="res.groups" id="base.group_survey_user">
+ <record model="res.groups" id="group_survey_user">
<field name="name">User</field>
<field name="category_id" ref="base.module_category_survey"/>
</record>
<!-- Survey managers -->
- <record model="res.groups" id="base.group_survey_manager">
+ <record model="res.groups" id="group_survey_manager">
<field name="name">Manager</field>
<field name="category_id" ref="base.module_category_survey"/>
- <field name="implied_ids" eval="[(4, ref('base.group_survey_user'))]"/>
+ <field name="implied_ids" eval="[(4, ref('group_survey_user'))]"/>
<field name="users" eval="[(4, ref('base.user_root'))]"/>
</record>
<record id="base.default_user" model="res.users">
- <field name="groups_id" eval="[(4,ref('base.group_survey_manager'))]"/>
+ <field name="groups_id" eval="[(4,ref('group_survey_manager'))]"/>
</record>
<!-- Record rules -->
@@ -24,7 +24,7 @@
<field name="name">Access to survey for regular users</field>
<field name="model_id" ref="survey.model_survey_survey"/>
<field name="domain_force">[('stage_id.closed', '=', False)]</field>
- <field name="groups" eval="[(4, ref('base.group_survey_user'))]"/>
+ <field name="groups" eval="[(4, ref('group_survey_user'))]"/>
<field eval="0" name="perm_unlink"/>
<field eval="0" name="perm_write"/>
<field eval="1" name="perm_read"/>
@@ -35,7 +35,7 @@
<field name="name">Survey Manager access rights</field>
<field name="model_id" ref="survey.model_survey_survey"/>
<field name="domain_force">[(1, '=', 1)]</field>
- <field name="groups" eval="[(4, ref('base.group_survey_manager'))]"/>
+ <field name="groups" eval="[(4, ref('group_survey_manager'))]"/>
<field eval="1" name="perm_unlink"/>
<field eval="1" name="perm_write"/>
<field eval="1" name="perm_read"/>
@@ -57,7 +57,7 @@
<field name="name">Access to user_input for regular users</field>
<field name="model_id" ref="survey.model_survey_user_input"/>
<field name="domain_force">['|', ('create_uid', '=', user.id), ('partner_id', '=', user.partner_id.id)]</field>
- <field name="groups" eval="[(4, ref('base.group_survey_user'))]"/>
+ <field name="groups" eval="[(4, ref('group_survey_user'))]"/>
<field eval="0" name="perm_unlink"/>
<field eval="0" name="perm_write"/>
<field eval="1" name="perm_read"/>
@@ -68,7 +68,7 @@
<field name="name">Survey Manager access rights</field>
<field name="model_id" ref="survey.model_survey_user_input"/>
<field name="domain_force">[(1, '=', 1)]</field>
- <field name="groups" eval="[(4, ref('base.group_survey_manager'))]"/>
+ <field name="groups" eval="[(4, ref('group_survey_manager'))]"/>
<field eval="1" name="perm_unlink"/>
<field eval="1" name="perm_write"/>
<field eval="1" name="perm_read"/>
diff --git a/addons/survey/tests/test_survey.py b/addons/survey/tests/test_survey.py
index 81f55a95eefc35b82e8fb295b0f1f56663c67e5c..322289d4e33ae0a22316526bbd3826e550f2f4f4 100644
--- a/addons/survey/tests/test_survey.py
+++ b/addons/survey/tests/test_survey.py
@@ -18,10 +18,10 @@ class TestSurvey(TransactionCase):
def setUp(self):
super(TestSurvey, self).setUp()
User = self.env['res.users'].with_context({'no_reset_password': True})
- (group_survey_user, group_employee) = (self.ref('base.group_survey_user'), self.ref('base.group_user'))
+ (group_survey_user, group_employee) = (self.ref('survey.group_survey_user'), self.ref('base.group_user'))
self.survey_manager = User.create({
'name': 'Gustave Doré', 'login': 'Gustav','email': 'gustav.dore@example.com',
- 'groups_id': [(6, 0, [self.ref('base.group_survey_manager'), group_survey_user, group_employee])]})
+ 'groups_id': [(6, 0, [self.ref('survey.group_survey_manager'), group_survey_user, group_employee])]})
self.survey_user = User.create({
'name': 'Lukas Peeters', 'login': 'Lukas', 'email': 'lukas.petters@example.com',
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index c49110b80b0620922df42fafc13513e60e94cd32..4a1f4caed6cd08e682e6e42f3a2359034a5db2e5 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -63,7 +63,7 @@
<!-- Back Button to redirect in form view of survey -->
<template id="back" name="Back">
- <div groups="base.group_website_publisher" t-ignore="true" class="pull-right">
+ <div groups="website.group_website_publisher" t-ignore="true" class="pull-right">
<a t-attf-href="/web#view_type=form&model=survey.survey&id=#{survey.id}&action=survey.action_survey_form" class="btn btn-default">Back to Survey</a>
</div>
</template>
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index 0a4279ba05340bc0c2a3f5f14852c37721b49730..07655717df513212f7503c7f9754b15d87438450 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -115,7 +115,7 @@
<field name="id" invisible="1"/>
<field name="tot_start_survey" invisible="1"/>
<field name="is_closed" invisible="1"/>
- <header groups="base.group_survey_manager">
+ <header groups="survey.group_survey_manager">
<button name="action_test_survey" string="Design Survey" type="object" class="oe_highlight"/>
<button name="action_test_survey" string="Test Survey" type="object" attrs="{'invisible': [('id', '=', False)]}"/>
<button name="action_print_survey" string="Print Survey" type="object" attrs="{'invisible': [('id', '=', False)]}"/>
@@ -639,7 +639,7 @@
<!-- MENU ELEMENTS -->
<!-- Left menu categories-->
- <menuitem name="Surveys" id="menu_surveys" sequence="70" groups="base.group_survey_user" web_icon="survey,static/description/icon.png"/>
+ <menuitem name="Surveys" id="menu_surveys" sequence="70" groups="group_survey_user" web_icon="survey,static/description/icon.png"/>
<!-- Left menu elements: Survey -->
<menuitem name="Surveys" id="menu_survey_form" action="action_survey_form" parent="menu_surveys" sequence="1"/>
diff --git a/addons/survey_crm/views/survey_crm_views.xml b/addons/survey_crm/views/survey_crm_views.xml
index 4b37cd91a4ddbf780d6a8d0b2d2627e0ed0c09f0..3531d95dafd3f3d6c2c40f5768a322478c0c3330 100644
--- a/addons/survey_crm/views/survey_crm_views.xml
+++ b/addons/survey_crm/views/survey_crm_views.xml
@@ -8,7 +8,7 @@
multi="True"
target="new"
key2="client_action_multi"
- id="survey.action_partner_survey_mail_crm"
+ id="action_partner_survey_mail_crm"
context="{
'default_use_template': True,
'default_template_id': ref('survey.email_template_survey'),
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index e167bdae4d11b94f10f776a269c5fd5073d7733a..722a1d17ca92d66323d22401db786a268b7c5689 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -30,21 +30,21 @@
<field name="website_id" ref="default_website"/>
</record>
- <record id="base.group_website_publisher" model="res.groups">
+ <record id="group_website_publisher" model="res.groups">
<field name="name">Editor</field>
<field name="category_id" ref="base.module_category_website"/>
</record>
<!-- Access rules to edit ir.ui.view with qWeb type -->
- <record id="base.group_website_designer" model="res.groups">
+ <record id="group_website_designer" model="res.groups">
<field name="name">Editor and Designer</field>
<field name="users" eval="[(4, ref('base.user_root'))]"/>
- <field name="implied_ids" eval="[(4, ref('base.group_website_publisher'))]"/>
+ <field name="implied_ids" eval="[(4, ref('group_website_publisher'))]"/>
<field name="category_id" ref="base.module_category_website"/>
</record>
<record id="base.default_user" model="res.users">
- <field name="groups_id" eval="[(4,ref('base.group_website_designer'))]"/>
+ <field name="groups_id" eval="[(4,ref('group_website_designer'))]"/>
</record>
<record id="action_module_website" model="ir.actions.act_window">
diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index 8bc2fdf6be1e4ae339d33b643069816f087daa42..e08116c1465f97471abd1471ca995e17fa1c1c8b 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -145,7 +145,7 @@ class View(models.Model):
if not qcontext.get('translatable') and not qcontext.get('rendering_bundle'):
if qcontext.get('editable'):
new_context = dict(self._context, inherit_branding=True)
- elif request.env.user.has_group('base.group_website_publisher'):
+ elif request.env.user.has_group('website.group_website_publisher'):
new_context = dict(self._context, inherit_branding_auto=True)
if 'main_object' not in qcontext:
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index a2ce44f72caf873c3707929dd667e5f3dd673965..bb4ba97a7dd17824c19a782d3d094a4a71f73587 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -688,7 +688,7 @@ class WebsitePublishedMixin(models.AbstractModel):
@api.multi
def website_publish_button(self):
self.ensure_one()
- if self.env.user.has_group('base.group_website_publisher') and self.website_url != '#':
+ if self.env.user.has_group('website.group_website_publisher') and self.website_url != '#':
return self.open_website_url()
return self.write({'website_published': not self.website_published})
diff --git a/addons/website/security/ir.model.access.csv b/addons/website/security/ir.model.access.csv
index 4c91ee15c85a3b740c74d7fde072d4753e731d2c..849724a409435a9ee497abf548ebea17d67240c9 100644
--- a/addons/website/security/ir.model.access.csv
+++ b/addons/website/security/ir.model.access.csv
@@ -1,10 +1,10 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_website_public,website,website.model_website,,1,0,0,0
-access_website,website,website.model_website,base.group_website_designer,1,1,1,1
+access_website,website,website.model_website,group_website_designer,1,1,1,1
access_website_menu,access_website_menu,model_website_menu,,1,0,0,0
-access_website_menu_designer,Web Menu Manager,model_website_menu,base.group_website_designer,1,1,1,1
-access_website,web menu manager,website.model_website,base.group_website_designer,1,1,1,1
-access_website_ir_ui_view,access_website_ir_ui_view,model_ir_ui_view,base.group_website_designer,1,1,1,1
+access_website_menu_designer,Web Menu Manager,model_website_menu,group_website_designer,1,1,1,1
+access_website,web menu manager,website.model_website,group_website_designer,1,1,1,1
+access_website_ir_ui_view,access_website_ir_ui_view,model_ir_ui_view,group_website_designer,1,1,1,1
access_seo_public,access_seo_public,model_website_seo_metadata,,1,0,0,0
-access_seo_public,access_seo_manager,model_website_seo_metadata,base.group_website_designer,1,1,1,1
-access_seo_designer,access_seo_designer,model_website_seo_metadata,base.group_website_designer,1,1,1,1
+access_seo_public,access_seo_manager,model_website_seo_metadata,group_website_designer,1,1,1,1
+access_seo_designer,access_seo_designer,model_website_seo_metadata,group_website_designer,1,1,1,1
diff --git a/addons/website/security/website_security.xml b/addons/website/security/website_security.xml
index 47711f3c712ae4656e31b5e2ab8a92330eba95f9..893310ae475caaef3f245b8283986021c5a8e705 100644
--- a/addons/website/security/website_security.xml
+++ b/addons/website/security/website_security.xml
@@ -4,7 +4,7 @@
<field name="name">website_designer: Manage Website and qWeb view</field>
<field name="model_id" ref="base.model_ir_ui_view"/>
<field name="domain_force">[('type', '=', 'qweb')]</field>
- <field name="groups" eval="[(4, ref('base.group_website_designer'))]"/>
+ <field name="groups" eval="[(4, ref('group_website_designer'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
@@ -14,7 +14,7 @@
<field name="name">website_designer: global view</field>
<field name="model_id" ref="base.model_ir_ui_view"/>
<field name="domain_force">[('type', '!=', 'qweb')]</field>
- <field name="groups" eval="[(4, ref('base.group_website_designer'))]"/>
+ <field name="groups" eval="[(4, ref('group_website_designer'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
diff --git a/addons/website/views/website_navbar_templates.xml b/addons/website/views/website_navbar_templates.xml
index 1b5c4718baeb324f184832de42450d5ae651c22c..8ae2538ceba00e03a6e03261d6489c2331ee12d9 100644
--- a/addons/website/views/website_navbar_templates.xml
+++ b/addons/website/views/website_navbar_templates.xml
@@ -32,19 +32,19 @@
<ul class="o_menu_sections">
<!-- Content -->
- <li class="dropdown content" groups="base.group_website_publisher" t-if="editable">
+ <li class="dropdown content" groups="website.group_website_publisher" t-if="editable">
<a id="content-menu-button" class="dropdown-toggle waves" data-toggle="dropdown" href="#">Content</a>
<ul class="dropdown-menu oe_content_menu" role="menu">
- <li groups="base.group_website_designer">
+ <li groups="website.group_website_designer">
<a data-action="edit_menu" href="#" title="Edit Top Menu">Edit Menu</a>
</li>
- <li t-if="deletable" groups="base.group_website_designer" role="separator" class="divider"></li>
- <li t-if="deletable" groups="base.group_website_designer"><a href="#" data-action="rename_page">Rename Page</a></li>
- <li t-if="deletable" groups="base.group_website_designer"><a href="#" data-action="delete_page">Delete Page</a></li>
+ <li t-if="deletable" groups="website.group_website_designer" role="separator" class="divider"></li>
+ <li t-if="deletable" groups="website.group_website_designer"><a href="#" data-action="rename_page">Rename Page</a></li>
+ <li t-if="deletable" groups="website.group_website_designer"><a href="#" data-action="delete_page">Delete Page</a></li>
</ul>
</li>
<!-- Customize -->
- <li class="dropdown" groups="base.group_website_designer" id="customize-menu">
+ <li class="dropdown" groups="website.group_website_designer" id="customize-menu">
<a class="dropdown-toggle waves" data-toggle="dropdown" href="#" id="customize-menu-button">Customize</a>
<ul class="dropdown-menu" role="menu">
<li id="html_editor"><a data-action="ace" href="#advanced-view-editor">HTML Editor</a></li>
@@ -54,7 +54,7 @@
</ul>
</li>
<!-- Promote -->
- <li class="dropdown" groups="base.group_website_designer">
+ <li class="dropdown" groups="website.group_website_designer">
<a class="dropdown-toggle waves" data-toggle="dropdown" href="#" id="promote-menu-button">Promote</a>
<ul class="dropdown-menu oe_promote_menu" role="menu">
<li><a data-action="promote-current-page" href="#" title="Promote page on the web">Optimize SEO</a></li>
@@ -68,16 +68,16 @@
<a data-action="show-mobile-preview" href="#"><span title="Mobile preview" class="fa fa-mobile"/></a>
</li>
<!-- Page Edition -->
- <li groups="base.group_website_publisher,base.group_website_designer">
+ <li groups="website.group_website_publisher,website.group_website_designer">
<a data-action="new_page" href="#" data-toggle="modal" data-target="#o_website_add_page_modal"><span class="fa fa-plus"/>New</a>
</li>
- <li t-if="not translatable" groups="base.group_website_publisher">
+ <li t-if="not translatable" groups="website.group_website_publisher">
<a data-action="edit" href="#"><span class="fa fa-pencil"/>Edit</a>
</li>
- <li t-if="translatable" groups="base.group_website_publisher">
+ <li t-if="translatable" groups="website.group_website_publisher">
<a data-action="translate" href="#">TRANSLATE</a>
</li>
- <li t-if="translatable" groups="base.group_website_publisher">
+ <li t-if="translatable" groups="website.group_website_publisher">
<a data-action="edit_master" href="#">or Edit Master</a>
</li>
</ul>
@@ -89,7 +89,7 @@
<div groups="base.group_user" class="modal" id="o_website_add_page_modal">
<div class="modal-dialog modal-lg">
<ul>
- <li groups="base.group_website_designer"><a href="#" data-action="new_page"><i class="fa fa-file-o"/><p>New Page</p></a></li>
+ <li groups="website.group_website_designer"><a href="#" data-action="new_page"><i class="fa fa-file-o"/><p>New Page</p></a></li>
</ul>
</div>
</div>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 95faf0c0f4fa7e2502a9fd72a042b53919c8558b..7793466b51f7ed50a89889ea2d515b88d54bf37f 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -127,15 +127,15 @@
<t t-call-assets="web.assets_common" t-js="false"/>
<t t-call-assets="web.assets_frontend" t-js="false"/>
- <t t-call-assets="web_editor.summernote" t-js="false" groups="base.group_website_designer"/>
- <t t-call-assets="web_editor.assets_editor" t-js="false" groups="base.group_website_designer"/>
- <t t-call-assets="website.assets_editor" t-js="false" groups="base.group_website_publisher"/>
+ <t t-call-assets="web_editor.summernote" t-js="false" groups="website.group_website_designer"/>
+ <t t-call-assets="web_editor.assets_editor" t-js="false" groups="website.group_website_designer"/>
+ <t t-call-assets="website.assets_editor" t-js="false" groups="website.group_website_publisher"/>
<t t-call-assets="web.assets_common" t-css="false"/>
<t t-call-assets="web.assets_frontend" t-css="false"/>
- <t t-call-assets="web_editor.summernote" t-css="false" groups="base.group_website_designer"/>
- <t t-call-assets="web_editor.assets_editor" t-css="false" groups="base.group_website_designer"/>
- <t t-call-assets="website.assets_editor" t-css="false" groups="base.group_website_publisher"/>
+ <t t-call-assets="web_editor.summernote" t-css="false" groups="website.group_website_designer"/>
+ <t t-call-assets="web_editor.assets_editor" t-css="false" groups="website.group_website_designer"/>
+ <t t-call-assets="website.assets_editor" t-css="false" groups="website.group_website_publisher"/>
</t>
<t t-set="head" t-value="head_website + (head or '')"/>
@@ -351,7 +351,7 @@
<t t-esc="lg[1].split('/').pop()"/>
</a>
</li>
- <li groups="base.group_website_publisher">
+ <li groups="website.group_website_publisher">
<t t-set="url_return" t-value="url_for('', '[lang]') + '?' + keep_query()"/>
<a t-attf-href="/web#action=base.action_view_base_language_install&website_id=#{website.id if website else ''}&url_return=#{url_return}">
<i class="fa fa-plus-circle"/>
@@ -414,7 +414,7 @@
<!-- Util template -->
<template id="publish_management">
- <div groups="base.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden" t-att-style="style or None">
+ <div groups="website.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden" t-att-style="style or None">
<div t-attf-class="btn-group js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller">
<button class="btn btn-danger js_publish_btn">Unpublished</button>
<button class="btn btn-success js_publish_btn">Published</button>
@@ -433,7 +433,7 @@
</template>
<template id="publish_short">
- <t groups="base.group_website_publisher" t-ignore="true">
+ <t groups="website.group_website_publisher" t-ignore="true">
<div t-attf-class="pull-right js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller">
<button class="btn btn-danger js_publish_btn">Unpublished</button>
<button class="btn btn-success js_publish_btn">Published</button>
@@ -566,7 +566,7 @@
Information about the <t t-esc="res_company.name"/> instance of Odoo, the <a href="https://www.odoo.com">Open Source ERP</a>.
</p>
- <div class="alert alert-warning alert-dismissable mt16" groups="base.group_website_publisher">
+ <div class="alert alert-warning alert-dismissable mt16" groups="website.group_website_publisher">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<p>
Note: To hide this page, uncheck it from the top Customize menu.
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index f66e3a4a6aa381849d47bdb7e5dc83696e7c1699..b436ef35b1099c84823c5ae1ab6e5072323b77de 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -19,7 +19,7 @@ class WebsiteBlog(http.Controller):
def nav_list(self, blog=None):
dom = blog and [('blog_id', '=', blog.id)] or []
- if not request.env.user.has_group('base.group_website_designer'):
+ if not request.env.user.has_group('website.group_website_designer'):
dom += [('post_date', '<=', fields.Datetime.now())]
groups = request.env['blog.post']._read_group_raw(
dom,
@@ -106,7 +106,7 @@ class WebsiteBlog(http.Controller):
if date_begin and date_end:
domain += [("post_date", ">=", date_begin), ("post_date", "<=", date_end)]
- if request.env.user.has_group('base.group_website_designer'):
+ if request.env.user.has_group('website.group_website_designer'):
count_domain = domain + [("website_published", "=", True), ("post_date", "<=", fields.Datetime.now())]
published_count = BlogPost.search_count(count_domain)
unpublished_count = BlogPost.search_count(domain) - published_count
@@ -216,7 +216,7 @@ class WebsiteBlog(http.Controller):
# Find next Post
all_post = BlogPost.search([('blog_id', '=', blog.id)])
- if not request.env.user.has_group('base.group_website_designer'):
+ if not request.env.user.has_group('website.group_website_designer'):
all_post = all_post.filtered(lambda r: r.post_date <= fields.Datetime.now())
if blog_post not in all_post:
@@ -292,7 +292,7 @@ class WebsiteBlog(http.Controller):
@http.route(['/blog/post_discussion'], type='json', auth="public", website=True)
def post_discussion(self, blog_post_id, **post):
- publish = request.env.user.has_group('base.group_website_publisher')
+ publish = request.env.user.has_group('website.group_website_publisher')
message_id = self._blog_post_message(blog_post_id, post.get('comment'), **post)
return self._get_discussion_detail([message_id], publish, **post)
@@ -319,7 +319,7 @@ class WebsiteBlog(http.Controller):
def discussion(self, post_id=0, path=None, count=False, **post):
domain = [('res_id', '=', int(post_id)), ('model', '=', 'blog.post'), ('path', '=', path)]
#check current user belongs to website publisher group
- publish = request.env.user.has_group('base.group_website_publisher')
+ publish = request.env.user.has_group('website.group_website_publisher')
if not publish:
domain.append(('website_published', '=', True))
messages = request.env['mail.message'].sudo().search(domain, count=count)
diff --git a/addons/website_blog/data/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml
index c0e4aba0ce8a464435324c56b00eefd02f5d1e24..bc6281503cae16f94f2f3780fab3d4792b0b8317 100644
--- a/addons/website_blog/data/website_blog_data.xml
+++ b/addons/website_blog/data/website_blog_data.xml
@@ -15,7 +15,7 @@
<!-- Pre loaded covers -->
- <record id="website.blog_post_cover_01" model="ir.attachment">
+ <record id="blog_post_cover_01" model="ir.attachment">
<field name="name">Blog Post Cover 1</field>
<field name="datas_fname">Blog Post Cover 1</field>
<field name="res_model">ir.ui.view</field>
@@ -23,7 +23,7 @@
<field name="url">/website_blog/static/src/img/demo/blog_post_cover_1.jpg</field>
</record>
- <record id="website.blog_post_cover_02" model="ir.attachment">
+ <record id="blog_post_cover_02" model="ir.attachment">
<field name="name">Blog Post Cover 2</field>
<field name="datas_fname">Blog Post Cover 2</field>
<field name="res_model">ir.ui.view</field>
diff --git a/addons/website_blog/data/website_blog_demo.xml b/addons/website_blog/data/website_blog_demo.xml
index 4821327d5a0bbb7d62e1ab0e2a2399d91b9df326..957a4daf66adb9a9c1b279e2e7e3b5039eb99363 100644
--- a/addons/website_blog/data/website_blog_demo.xml
+++ b/addons/website_blog/data/website_blog_demo.xml
@@ -19,7 +19,7 @@
<field name="published_date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
<field name="website_meta_keywords">Odoo, email</field>
<field name="website_meta_description">The Future of Emails</field>
- <field name="cover_properties">{"background-image": "url(/web/image/website.blog_post_cover_01)", "resize_class": "cover container cover_narrow"}</field>
+ <field name="cover_properties">{"background-image": "url(/web/image/website_blog.blog_post_cover_01)", "resize_class": "cover container cover_narrow"}</field>
<field name="content"><![CDATA[
<section class="s_text_block">
<div class="container">
@@ -133,7 +133,7 @@
<field name="website_published" eval="True"/>
<field name="published_date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
<field name="tag_ids" eval="[(6, 0, [ref('blog_tag_1'), ref('blog_tag_2')])]"/>
- <field name="cover_properties">{"background-image": "url(/web/image/website.blog_post_cover_02)", "resize_class": "cover container-fluid cover_full"}</field>
+ <field name="cover_properties">{"background-image": "url(/web/image/website_blog.blog_post_cover_02)", "resize_class": "cover container-fluid cover_full"}</field>
<field name="content"><![CDATA[
<section class="s_image_text">
<div class="container">
diff --git a/addons/website_blog/security/ir.model.access.csv b/addons/website_blog/security/ir.model.access.csv
index df9abd86b33d53b84755012ea92de04554e5285e..c3f549640aef356934d1d9cfecb7b46e5cd3ab79 100644
--- a/addons/website_blog/security/ir.model.access.csv
+++ b/addons/website_blog/security/ir.model.access.csv
@@ -1,7 +1,7 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
blog_blog_all,blog.blog,model_blog_blog,,1,0,0,0
-blog_blog,blog.blog,model_blog_blog,base.group_website_designer,1,1,1,1
+blog_blog,blog.blog,model_blog_blog,website.group_website_designer,1,1,1,1
blog_post_all,blog.post,model_blog_post,,1,0,0,0
-blog_post,blog.post,model_blog_post,base.group_website_designer,1,1,1,1
+blog_post,blog.post,model_blog_post,website.group_website_designer,1,1,1,1
blog_tag,blog.tag,model_blog_tag,,1,0,0,0
-blog_tag_edition,blog.tag,model_blog_tag,base.group_website_designer,1,1,1,1
+blog_tag_edition,blog.tag,model_blog_tag,website.group_website_designer,1,1,1,1
diff --git a/addons/website_blog/tests/common.py b/addons/website_blog/tests/common.py
index c71f2ac6764b9a87e17aa1972f1a6cc2ea307ff4..078f334e7ff730e0c0b580d0fc32af161937130f 100644
--- a/addons/website_blog/tests/common.py
+++ b/addons/website_blog/tests/common.py
@@ -10,7 +10,7 @@ class TestWebsiteBlogCommon(common.TransactionCase):
Users = self.env['res.users']
- group_blog_manager_id = self.ref('base.group_website_designer')
+ group_blog_manager_id = self.ref('website.group_website_designer')
group_employee_id = self.ref('base.group_user')
group_public_id = self.ref('base.group_public')
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index a0afb424c3efbb20acd98c7c882b436f6b34f831..93c97a9c8ac2f7a38a743ac01572dde5de86298d 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -30,7 +30,7 @@
<div id="wrap">
<div class="oe_structure"/>
<section class="container">
- <div class="alert alert-warning alert-dismissable mt16" groups="base.group_website_publisher">
+ <div class="alert alert-warning alert-dismissable mt16" groups="website.group_website_publisher">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<p>
This page is great to improve your <strong>Search Engine Optimization</strong>;
@@ -127,7 +127,7 @@
<p class="css_editable_hidden">
<h1>No blog post yet.</h1>
</p>
- <p groups="base.group_website_designer">
+ <p groups="website.group_website_designer">
Click on "Content" on the top menu to write your first blog post.
</p>
</div>
@@ -487,7 +487,7 @@
<attribute name="class">col-sm-8</attribute>
</xpath>
<xpath expr="//div[@id='blog_right_column']" position="inside">
- <section class="mt32 mb32" groups="base.group_website_designer">
+ <section class="mt32 mb32" groups="website.group_website_designer">
<h4>Status</h4>
<ul class="nav nav-pills nav-stacked">
<t t-set="state" t-value="state_info['state']"/>
@@ -527,7 +527,7 @@
<!-- User Navbar -->
<template id="content_new_blogpost" inherit_id="website.user_navbar">
<xpath expr="//div[@id='o_website_add_page_modal']//ul" position="inside">
- <li groups="base.group_website_designer"><a href="#" data-action="new_blog_post"><i class="fa fa-rss"/><p>New Blog Post</p></a></li>
+ <li groups="website.group_website_designer"><a href="#" data-action="new_blog_post"><i class="fa fa-rss"/><p>New Blog Post</p></a></li>
</xpath>
</template>
diff --git a/addons/website_crm/data/website_crm_data.xml b/addons/website_crm/data/website_crm_data.xml
index 66ac5d58151b8338261c4e8691f7870d150530b5..0981537275bc9ebaef68b581ee36ba889efeebc4 100644
--- a/addons/website_crm/data/website_crm_data.xml
+++ b/addons/website_crm/data/website_crm_data.xml
@@ -30,8 +30,7 @@
<field name="state">open</field>
</record>
- <record model="crm.team" id="website.salesteam_website_sales">
- <field name="name">Website Sales</field>
+ <record model="crm.team" id="sales_team.salesteam_website_sales">
<field name="use_leads">True</field>
<field name="use_opportunities" eval="False"/>
</record>
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index e7cdc15bdc7f69c8aa6658744e3c9823c86a54ec..4bceb62fbf92bc703b00c84e15e33ab43a604f67 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -175,7 +175,7 @@ class WebsiteCrmPartnerAssign(WebsitePartnerPage):
search = post.get('search', '')
base_partner_domain = [('is_company', '=', True), ('grade_id', '!=', False), ('website_published', '=', True)]
- if not request.env['res.users'].has_group('base.group_website_publisher'):
+ if not request.env['res.users'].has_group('website.group_website_publisher'):
base_partner_domain += [('grade_id.website_published', '=', True)]
if search:
base_partner_domain += ['|', ('name', 'ilike', search), ('website_description', 'ilike', search)]
@@ -286,7 +286,7 @@ class WebsiteCrmPartnerAssign(WebsitePartnerPage):
current_country = request.env['res.country'].browse(int(country_id)).exists()
if partner_id:
partner = request.env['res.partner'].sudo().browse(partner_id)
- is_website_publisher = request.env['res.users'].has_group('base.group_website_publisher')
+ is_website_publisher = request.env['res.users'].has_group('website.group_website_publisher')
if partner.exists() and (partner.website_published or is_website_publisher):
values = {
'main_object': partner,
diff --git a/addons/website_crm_partner_assign/report/crm_lead_report_view.xml b/addons/website_crm_partner_assign/report/crm_lead_report_view.xml
index 33e37a6c42f5cf48d7e70a50782ad0ac218a82a4..d87c26106e9facfa52173dd7f71f7866a7b3050d 100644
--- a/addons/website_crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/website_crm_partner_assign/report/crm_lead_report_view.xml
@@ -70,6 +70,6 @@
</record>
<menuitem id="menu_report_crm_opportunities_assign_tree"
- parent="base.menu_sale_report" action="action_report_crm_opportunity_assign" sequence="20"/>
+ parent="sales_team.menu_sale_report" action="action_report_crm_opportunity_assign" sequence="20"/>
</odoo>
diff --git a/addons/website_crm_partner_assign/report/crm_partner_report_view.xml b/addons/website_crm_partner_assign/report/crm_partner_report_view.xml
index f6105e0f75b004ba462dcf82641ec5cd58a211aa..6ecf4ff15d38842e7fc947748d4afd136af1934d 100644
--- a/addons/website_crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/website_crm_partner_assign/report/crm_partner_report_view.xml
@@ -51,6 +51,6 @@
</record>
<menuitem name="Partnerships" id="menu_report_crm_partner_assign_tree"
- parent="base.menu_sale_report" action="action_report_crm_partner_assign" sequence="25"/>
+ parent="sales_team.menu_sale_report" action="action_report_crm_partner_assign" sequence="25"/>
</odoo>
diff --git a/addons/website_event/views/website_event_templates.xml b/addons/website_event/views/website_event_templates.xml
index ca95573eba0a3a960d434842f1002de2d8fd2d91..51ef1b5470eae21f83c937230b15e226a0a4bbad 100644
--- a/addons/website_event/views/website_event_templates.xml
+++ b/addons/website_event/views/website_event_templates.xml
@@ -48,7 +48,7 @@
<div class="col-md-9" id="middle_column">
<div class="text-center text-muted" t-if="not event_ids">
<h1>No event found</h1>
- <t groups="base.group_website_publisher">
+ <t groups="website.group_website_publisher">
<p groups="event.group_event_manager">Use the top menu <i>'Content'</i> to create your first event.</p>
</t>
</div>
diff --git a/addons/website_form/models/models.py b/addons/website_form/models/models.py
index 60c6976f70f633ee44221461d1e5d95b28a3c802..16aba290a2a8f4bf91a61aee6eb5810361f7a8c5 100644
--- a/addons/website_form/models/models.py
+++ b/addons/website_form/models/models.py
@@ -96,7 +96,7 @@ class website_form_model_fields(models.Model):
if not fields: return False
# only allow users who can change the website structure
- if not self.env['res.users'].has_group('base.group_website_designer'):
+ if not self.env['res.users'].has_group('website.group_website_designer'):
return False
# the ORM only allows writing on custom fields and will trigger a
diff --git a/addons/website_forum/views/forum.xml b/addons/website_forum/views/forum.xml
index 9d482b4af0800361d68c98bc961a5cbee765b29c..76e269cd10595aaa80ef1791955d39fb5a7f5db6 100644
--- a/addons/website_forum/views/forum.xml
+++ b/addons/website_forum/views/forum.xml
@@ -3,7 +3,7 @@
<data>
<!-- MAIN FORUM MENU -->
<menuitem name="Forum" id="menu_website_forum"
- parent="website.menu_website_configuration" sequence="50" groups="base.group_website_designer"/>
+ parent="website.menu_website_configuration" sequence="50" groups="website.group_website_designer"/>
<!-- FORUM VIEWS -->
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 5a7fd7fdfdcd95f1494b60749a87d3e201c2ca2b..f45b5cd0c0418c09c60dd0a3c322348956f77f79 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -1337,7 +1337,7 @@
<h1 class="mt0 page-header">
<span t-field="user.name"/>
<small>profile</small>
- <t t-call="website.publish_management" groups="base.group_website_publisher">
+ <t t-call="website.publish_management" groups="website.group_website_publisher">
<t t-set="object" t-value="user"/>
<t t-set="publish_edit" t-value="True"/>
</t>
diff --git a/addons/website_gengo/models/base_gengo_translations.py b/addons/website_gengo/models/base_gengo_translations.py
index 7ce868f90594c875a4402d6bc7fabe7c504a5650..4d76ebe052b42e3e0bbd9da5b922d4dc84308959 100644
--- a/addons/website_gengo/models/base_gengo_translations.py
+++ b/addons/website_gengo/models/base_gengo_translations.py
@@ -9,4 +9,4 @@ class BaseGengoTranslations(models.TransientModel):
# update GROUPS, that are the groups allowing to access the gengo key.
# this is done here because in the base_gengo module, the various website
# groups do not exist, limiting the access to the admin group.
- GROUPS = ['base.group_website_designer', 'base.group_website_publisher']
+ GROUPS = ['website.group_website_designer', 'website.group_website_publisher']
diff --git a/addons/website_hr/controllers/main.py b/addons/website_hr/controllers/main.py
index c1d54a1bbd9370acfb2b15e357db2abf41c09bb0..23559284cb528050e686d53e874754e9ada4664e 100644
--- a/addons/website_hr/controllers/main.py
+++ b/addons/website_hr/controllers/main.py
@@ -9,7 +9,7 @@ class WebsiteHr(http.Controller):
@http.route(['/page/website.aboutus', '/page/aboutus'], type='http', auth="public", website=True)
def blog(self, **post):
employees_domain = []
- if not request.env['res.users'].has_group('base.group_website_publisher'):
+ if not request.env['res.users'].has_group('website.group_website_publisher'):
employees_domain += [('website_published', '=', True)]
employees = request.env['hr.employee'].search(employees_domain)
return request.render("website.aboutus", {'employees': employees})
diff --git a/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml b/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml
index 8fffadaa3bb81a53b6f59d5db07b1c4126b2719f..c3e6a4054e770ad82910e23a4dd406cd91c2e55c 100644
--- a/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml
+++ b/addons/website_hr_recruitment/security/website_hr_recruitment_security.xml
@@ -25,7 +25,7 @@
<field name="name">Job Positions: HR Officer</field>
<field name="model_id" ref="hr.model_hr_job"/>
<field name="domain_force">[(1, '=', 1)]</field>
- <field name="groups" eval="[(4, ref('base.group_hr_user'))]"/>
+ <field name="groups" eval="[(4, ref('hr.group_hr_user'))]"/>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
index 2b02ecb325dbe20eabef8eb3c84b5cef5f1cc44f..c0b81298788c29a3d2d147d02dee9d9bfaa6667e 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml
@@ -39,8 +39,8 @@
<div t-if="not jobs">
<div class="text-center text-muted">
<h3 class="css_editable_hidden"><a t-attf-href="/page/website.contactus">Contact us</a> for job opportunities.</h3>
- <t groups="base.group_website_publisher">
- <h4 groups="base.group_hr_manager">
+ <t groups="website.group_website_publisher">
+ <h4 groups="hr.group_hr_manager">
Create new job pages from the <strong><i>+New</i></strong> top-right button.
</h4>
</t>
@@ -467,7 +467,7 @@
<!-- User Navbar -->
<template id="content_new_job_offer" inherit_id="website.user_navbar">
<xpath expr="//div[@id='o_website_add_page_modal']//ul" position="inside">
- <li groups="base.group_hr_manager"><a href="/jobs/add" class="js_link2post"><i class="fa fa-briefcase"/><p>New Job Offer</p></a></li>
+ <li groups="hr.group_hr_manager"><a href="/jobs/add" class="js_link2post"><i class="fa fa-briefcase"/><p>New Job Offer</p></a></li>
</xpath>
</template>
diff --git a/addons/website_links/security/ir.model.access.csv b/addons/website_links/security/ir.model.access.csv
index 6e1368eb93d42bb6c6b22d1a32067e359c0a53bd..ddeeb39dee58750d6675f7971297706ecf6c4dd5 100644
--- a/addons/website_links/security/ir.model.access.csv
+++ b/addons/website_links/security/ir.model.access.csv
@@ -1,4 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_link_tracker_manager,link.tracker,link_tracker.model_link_tracker,base.group_website_designer,1,1,1,1
-access_link_tracker_code_manager,link.tracker.code,link_tracker.model_link_tracker_code,base.group_website_designer,1,1,1,1
-access_link_tracker_click_manager,link.tracker.click,link_tracker.model_link_tracker_click,base.group_website_designer,1,1,1,1
+access_link_tracker_manager,link.tracker,link_tracker.model_link_tracker,website.group_website_designer,1,1,1,1
+access_link_tracker_code_manager,link.tracker.code,link_tracker.model_link_tracker_code,website.group_website_designer,1,1,1,1
+access_link_tracker_click_manager,link.tracker.click,link_tracker.model_link_tracker_click,website.group_website_designer,1,1,1,1
diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml
index c91db330dc911a8bf6c0cba70dd1d29e2f79f75e..a8e1995a91a7f696b6333dbdd305fb699277615e 100644
--- a/addons/website_links/views/website_links_template.xml
+++ b/addons/website_links/views/website_links_template.xml
@@ -12,7 +12,7 @@
</template>
<template id="share_page_menu" inherit_id="website.user_navbar">
- <xpath expr="//li[@groups='base.group_website_designer']//ul" position="inside">
+ <xpath expr="//li[@groups='website.group_website_designer']//ul" position="inside">
<li>
<a href="/r" id="o_website_links_share_page">
<span title="Track this page to count clicks">Share this Page</span>
diff --git a/addons/website_mail/views/website_mail_templates.xml b/addons/website_mail/views/website_mail_templates.xml
index cf250cc18b20720053bfe5610783585093ebcd55..a0f117ce53867cadae4ac5cd86c13efaf3eea9ac 100644
--- a/addons/website_mail/views/website_mail_templates.xml
+++ b/addons/website_mail/views/website_mail_templates.xml
@@ -72,7 +72,7 @@
<t t-set="messages" t-value="object.message_ids.filtered(lambda m: m.subtype_id.internal == False)"/>
</t>
<t t-foreach="messages" t-as="message">
- <t t-if="message.website_published or website.env.user.sudo(website.env.user.id).has_group('base.group_website_publisher')">
+ <t t-if="message.website_published or website.env.user.sudo(website.env.user.id).has_group('website.group_website_publisher')">
<li class="media" t-if="message.message_type != 'notification'" t-att-id="'message-%s' % message.id">
<div class="media-body">
<img class="media-object pull-left img-circle" t-attf-src="/mail/#{message.model}/#{message.res_id}/avatar/#{message.author_id.id}"
diff --git a/addons/website_mail_channel/views/website_mail_channel_templates.xml b/addons/website_mail_channel/views/website_mail_channel_templates.xml
index f773dfe362393a8f66a71a58f97c614e1b17071c..853ab99de9e7c27f1d97f809bc6db07726b6c860 100644
--- a/addons/website_mail_channel/views/website_mail_channel_templates.xml
+++ b/addons/website_mail_channel/views/website_mail_channel_templates.xml
@@ -18,7 +18,7 @@
<template id="editor" inherit_id="website.assets_editor" name="Mail Group Editor">
<xpath expr="/t" position="inside">
- <script type="text/javascript" src="/website_mail_channel/static/src/js/website_mail_channel.editor.js" groups="base.group_website_publisher"></script>
+ <script type="text/javascript" src="/website_mail_channel/static/src/js/website_mail_channel.editor.js" groups="website.group_website_publisher"></script>
</xpath>
</template>
diff --git a/addons/website_mass_mailing/views/website_mass_mailing_templates.xml b/addons/website_mass_mailing/views/website_mass_mailing_templates.xml
index edc76c5dd864d4d2d63592cc9220563015cea42e..4f633b8303f5a602133a6be6159848bcb152d554 100644
--- a/addons/website_mass_mailing/views/website_mass_mailing_templates.xml
+++ b/addons/website_mass_mailing/views/website_mass_mailing_templates.xml
@@ -10,7 +10,7 @@
<template id="assets_editor" inherit_id="website.assets_editor" name="wesbite_mass_mailing Editor assets">
<xpath expr="/t" position="inside">
- <script type="text/javascript" src="/website_mass_mailing/static/src/js/website_mass_mailing.editor.js" groups="base.group_website_publisher"/>
+ <script type="text/javascript" src="/website_mass_mailing/static/src/js/website_mass_mailing.editor.js" groups="website.group_website_publisher"/>
</xpath>
</template>
diff --git a/addons/website_partner/controllers/main.py b/addons/website_partner/controllers/main.py
index 0f41b3ef4b440b1308cb63c0ae9aa22ab7a19a3e..1cc4fce906fec39f6b23a538040e8ce877cd608a 100644
--- a/addons/website_partner/controllers/main.py
+++ b/addons/website_partner/controllers/main.py
@@ -13,7 +13,7 @@ class WebsitePartnerPage(http.Controller):
_, partner_id = unslug(partner_id)
if partner_id:
partner_sudo = request.env['res.partner'].sudo().browse(partner_id)
- is_website_publisher = request.env['res.users'].has_group('base.group_website_publisher')
+ is_website_publisher = request.env['res.users'].has_group('website.group_website_publisher')
if partner_sudo.exists() and (partner_sudo.website_published or is_website_publisher):
values = {
'main_object': partner_sudo,
diff --git a/addons/website_partner/views/website_partner_templates.xml b/addons/website_partner/views/website_partner_templates.xml
index 2d975074dff1164d43b97006e7e15d8a725afb00..a7ee2150428b409ddb2d2efb711e81b8c8589dfc 100644
--- a/addons/website_partner/views/website_partner_templates.xml
+++ b/addons/website_partner/views/website_partner_templates.xml
@@ -33,7 +33,7 @@
<div class="col-md-8 mt32">
<t t-if="partner">
<div t-field="partner.website_description"/>
- <t groups="base.group_website_publisher">
+ <t groups="website.group_website_publisher">
<h2 class="css_non_editable_mode_hidden">Short Description for List View</h2>
<div class="css_non_editable_mode_hidden" t-field="partner.website_short_description"/>
</t>
diff --git a/addons/website_project/security/project_security.xml b/addons/website_project/security/project_security.xml
index 0e163b77dd2c976da8e4bbf2ff704e89f294aeb0..18987be6dbf356ab9da2ed25502c286b83f96d26 100644
--- a/addons/website_project/security/project_security.xml
+++ b/addons/website_project/security/project_security.xml
@@ -2,7 +2,7 @@
<odoo>
<data noupdate="1">
<!-- Portal -->
- <record id="project.portal_project_rule" model="ir.rule">
+ <record id="portal_project_rule" model="ir.rule">
<field name="name">Project: portal users: portal and following</field>
<field name="model_id" ref="project.model_project_project"/>
<field name="domain_force">[
@@ -13,7 +13,7 @@
<field name="groups" eval="[(4, ref('base.group_portal'))]"/>
</record>
- <record id="project.portal_task_rule" model="ir.rule">
+ <record id="portal_task_rule" model="ir.rule">
<field name="name">Project/Task: portal users: (portal and following project) or (portal and following task)</field>
<field name="model_id" ref="project.model_project_task"/>
<field name="domain_force">[
diff --git a/addons/website_quote/views/sale_quote_views.xml b/addons/website_quote/views/sale_quote_views.xml
index 644a3cbd7ac00eb68b866b8793e3b277ef95d3b1..2fb2097d6ff7b8a92c9dd79d510e554539c700f8 100644
--- a/addons/website_quote/views/sale_quote_views.xml
+++ b/addons/website_quote/views/sale_quote_views.xml
@@ -118,5 +118,5 @@
</field>
</record>
- <menuitem id="menu_sale_quote_template" action="action_sale_quotation_template" parent="sales_team.menu_sales_config" sequence="1" name="Quotation Templates" groups="sales_team.group_sale_salesman,sales_team.group_sale_manager"/>
+ <menuitem id="menu_sale_quote_template" action="action_sale_quotation_template" parent="sale.menu_sales_config" sequence="1" name="Quotation Templates" groups="sales_team.group_sale_salesman,sales_team.group_sale_manager"/>
</odoo>
diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml
index 7505867f21d18cf0aa5a36b3b32f0e4bc8582b8b..72a98fa7e96c306bd3374292a2265c12fd582d8a 100644
--- a/addons/website_quote/views/website_quote_templates.xml
+++ b/addons/website_quote/views/website_quote_templates.xml
@@ -455,7 +455,7 @@
<small t-field="quotation.state"/>
<div t-ignore="true" class="pull-right css_editable_mode_hidden hidden-print">
<ul class="list-inline">
- <li groups="base.group_sale_salesman">
+ <li groups="sales_team.group_sale_salesman">
<a t-if="quotation.state not in ('manual')" class="btn btn-info" t-att-href="'/web#return_label=Website&model=%s&id=%s&action=%s&view_type=form' % (quotation._name, quotation.id, action)">Edit Quote</a>
<a t-if="quotation.state in ('manual')" class=" btn btn-info" t-att-href="'/web#return_label=Website&model=%s&id=%s&action=%s&view_type=form' % (quotation._name, quotation.id, action)">Back to Sale Order</a>
</li>
diff --git a/addons/website_sale/data/data.xml b/addons/website_sale/data/data.xml
index 709796afebd459ed6c52b7ddb503289e4c2fc1d3..6463b0c27a523545409a95308596900800e8dace 100644
--- a/addons/website_sale/data/data.xml
+++ b/addons/website_sale/data/data.xml
@@ -27,13 +27,12 @@
<field name="html_class">oe_image_full</field>
</record>
- <record model="crm.team" id="website.salesteam_website_sales">
- <field name="name">Website Sales</field>
+ <record model="crm.team" id="sales_team.salesteam_website_sales">
<field name="use_quotations" eval="False"/>
</record>
<record model="website" id="website.default_website">
- <field name="salesteam_id" ref="website.salesteam_website_sales"/>
+ <field name="salesteam_id" ref="sales_team.salesteam_website_sales"/>
</record>
<record id="wlist0" model="website_pricelist">
diff --git a/addons/website_sale/data/demo.xml b/addons/website_sale/data/demo.xml
index a5a9e247942357ff143bd48d25059af70624b729..8e3f137959095d54d10f3fadac987a8c7017014c 100644
--- a/addons/website_sale/data/demo.xml
+++ b/addons/website_sale/data/demo.xml
@@ -551,159 +551,159 @@ Weight: 31 grams</field>
<!-- product.public.category -->
- <record id="product.Components" model="product.public.category">
+ <record id="Components" model="product.public.category">
<field name="name">Components</field>
<field name="sequence">15</field>
</record>
- <record id="product.devices" model="product.public.category">
+ <record id="devices" model="product.public.category">
<field name="name">Devices</field>
<field name="sequence">5</field>
</record>
- <record id="product.Screen" model="product.public.category">
- <field name="parent_id" ref="product.devices"/>
+ <record id="Screen" model="product.public.category">
+ <field name="parent_id" ref="devices"/>
<field name="name">Screen</field>
<field name="sequence">11</field>
</record>
- <record id="product.Pen_Drive" model="product.public.category">
- <field name="parent_id" ref="product.devices"/>
+ <record id="Pen_Drive" model="product.public.category">
+ <field name="parent_id" ref="devices"/>
<field name="name">Pen Drive</field>
<field name="sequence">9</field>
</record>
- <record id="product.External_Hard_Drive" model="product.public.category">
- <field name="parent_id" ref="product.devices"/>
+ <record id="External_Hard_Drive" model="product.public.category">
+ <field name="parent_id" ref="devices"/>
<field name="name">External Hard Drive</field>
<field name="sequence">6</field>
</record>
- <record id="product.Keyboard_Mouse" model="product.public.category">
- <field name="parent_id" ref="product.devices"/>
+ <record id="Keyboard_Mouse" model="product.public.category">
+ <field name="parent_id" ref="devices"/>
<field name="name">Keyboard / Mouse</field>
<field name="sequence">8</field>
</record>
- <record id="product.printer" model="product.public.category">
- <field name="parent_id" ref="product.devices"/>
+ <record id="printer" model="product.public.category">
+ <field name="parent_id" ref="devices"/>
<field name="name">Printer</field>
<field name="sequence">10</field>
</record>
- <record id="product.Speakers" model="product.public.category">
- <field name="parent_id" ref="product.devices"/>
+ <record id="Speakers" model="product.public.category">
+ <field name="parent_id" ref="devices"/>
<field name="name">Speakers</field>
<field name="sequence">13</field>
</record>
- <record id="product.Headset" model="product.public.category">
- <field name="parent_id" ref="product.devices"/>
+ <record id="Headset" model="product.public.category">
+ <field name="parent_id" ref="devices"/>
<field name="name">Headset</field>
<field name="sequence">7</field>
</record>
- <record id="product.Software" model="product.public.category">
- <field name="parent_id" ref="product.devices"/>
+ <record id="Software" model="product.public.category">
+ <field name="parent_id" ref="devices"/>
<field name="name">Software</field>
<field name="sequence">12</field>
</record>
- <record id="product.laptops" model="product.public.category">
+ <record id="laptops" model="product.public.category">
<field name="name">Laptops</field>
<field name="sequence">1</field>
</record>
- <record id="product.sub_computers" model="product.public.category">
+ <record id="sub_computers" model="product.public.category">
<field name="name">Computers</field>
<field name="sequence">2</field>
</record>
- <record id="product.Computer_all_in_one" model="product.public.category">
- <field name="parent_id" ref="product.sub_computers"/>
+ <record id="Computer_all_in_one" model="product.public.category">
+ <field name="parent_id" ref="sub_computers"/>
<field name="name">Computer all-in-one</field>
<field name="sequence">3</field>
</record>
- <record id="product.server" model="product.public.category">
- <field name="parent_id" ref="product.sub_computers"/>
+ <record id="server" model="product.public.category">
+ <field name="parent_id" ref="sub_computers"/>
<field name="name">Server</field>
<field name="sequence">4</field>
</record>
- <record id="product.network" model="product.public.category">
+ <record id="network" model="product.public.category">
<field name="name">Network</field>
<field name="sequence">14</field>
</record>
- <record id="product.services" model="product.public.category">
+ <record id="services" model="product.public.category">
<field name="name">Services</field>
<field name="sequence">16</field>
</record>
<record id="product.product_product_1_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.services')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('services')])]"/>
</record>
<record id="product.product_product_2_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.services')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('services')])]"/>
</record>
<record id="product.product_product_3_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Computer_all_in_one')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Computer_all_in_one')])]"/>
</record>
<record id="product.product_product_4_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Computer_all_in_one')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Computer_all_in_one')])]"/>
</record>
<record id="product.product_product_5_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Computer_all_in_one')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Computer_all_in_one')])]"/>
</record>
<record id="product.product_product_5b_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Speakers')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Speakers')])]"/>
</record>
<record id="product.product_product_6_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Screen')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Screen')])]"/>
</record>
<record id="product.product_product_7_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Headset')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Headset')])]"/>
</record>
<record id="product.product_product_8_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Computer_all_in_one')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Computer_all_in_one')])]"/>
</record>
<record id="product.product_product_9_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Keyboard_Mouse')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Keyboard_Mouse')])]"/>
</record>
<record id="product.product_product_10_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Keyboard_Mouse')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Keyboard_Mouse')])]"/>
</record>
<record id="product.product_product_11_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Computer_all_in_one')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Computer_all_in_one')])]"/>
</record>
<record id="product.product_product_12_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Keyboard_Mouse')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Keyboard_Mouse')])]"/>
</record>
<record id="product.product_product_13_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Components')])]"/>
</record>
<record id="product.product_product_16_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Components')])]"/>
</record>
<record id="product.product_product_17_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Components')])]"/>
</record>
<record id="product.product_product_20_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Components')])]"/>
</record>
<record id="product.product_product_22_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Components')])]"/>
</record>
<record id="product.product_product_24_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Components')])]"/>
</record>
<record id="product.product_product_25_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.laptops')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('laptops')])]"/>
</record>
<record id="product.product_product_27_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.laptops')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('laptops')])]"/>
</record>
<record id="product.product_delivery_02_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.External_Hard_Drive')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('External_Hard_Drive')])]"/>
</record>
<record id="product.product_order_01_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Software')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Software')])]"/>
</record>
<record id="product.product_delivery_01_product_template" model="product.template">
- <field name="public_categ_ids" eval="[(6,0,[ref('product.Components')])]"/>
+ <field name="public_categ_ids" eval="[(6,0,[ref('Components')])]"/>
</record>
<record id="product.product_attribute_value_3" model="product.attribute.value">
<field name="html_color">#FFFFFF</field>
diff --git a/addons/website_sale/security/ir.model.access.csv b/addons/website_sale/security/ir.model.access.csv
index a34ea2d88f58bcfc158626118ca419534bc69a71..05c97bc89d0480e056e9fb434972acd23384ffae 100644
--- a/addons/website_sale/security/ir.model.access.csv
+++ b/addons/website_sale/security/ir.model.access.csv
@@ -18,5 +18,5 @@ access_fiscal_position_public,fiscal position public,account.model_account_fisca
access_payment_term,payment term public,account.model_account_payment_term,base.group_portal,1,0,0,0
access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_public,1,0,0,0
access_product_image_public,product.image public,model_product_image,,1,0,0,0
-access_product_image_publisher,product.image wbesite publisher,model_product_image,base.group_website_publisher,1,1,1,1
+access_product_image_publisher,product.image wbesite publisher,model_product_image,website.group_website_publisher,1,1,1,1
access_product_image_sale,product.image sale,model_product_image,sales_team.group_sale_manager,1,1,1,1
\ No newline at end of file
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 6ae09998f82e622a4c8c01cbd965cb5439fc906c..19deb3f20e153d5a5ab45e2e96ed2f9325fed9b1 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -200,7 +200,7 @@
<t t-if="not bins">
<div class="text-center text-muted">
<h3 class="css_editable_display">No product defined.</h3>
- <t groups="base.group_website_publisher">
+ <t groups="website.group_website_publisher">
<p groups="sales_team.group_sale_manager">Use the <i>'New Page'</i> top menu to create your first product.</p>
</t>
</div>
diff --git a/addons/website_slides/models/slides.py b/addons/website_slides/models/slides.py
index 602b95014e7e202d8a51ef8b396f4fd21fc4cf65..836b32f6235c54006963b8cd1b090327e4288478 100644
--- a/addons/website_slides/models/slides.py
+++ b/addons/website_slides/models/slides.py
@@ -374,7 +374,7 @@ class Slide(models.Model):
for key, value in doc_data.iteritems():
values.setdefault(key, value)
# Do not publish slide if user has not publisher rights
- if not self.user_has_groups('base.group_website_publisher'):
+ if not self.user_has_groups('website.group_website_publisher'):
values['website_published'] = False
slide = super(Slide, self).create(values)
slide.channel_id.message_subscribe_users()
diff --git a/addons/website_slides/view/website_slides.xml b/addons/website_slides/view/website_slides.xml
index 5cd28afef2c62034bb93b1c166b6d2efe4e0a37a..d4cde9537a3b4587988a45019b7722d33d4be4dd 100644
--- a/addons/website_slides/view/website_slides.xml
+++ b/addons/website_slides/view/website_slides.xml
@@ -201,7 +201,7 @@
<t t-set="header_object" t-value="category"/>
</t>
</t>
- <section t-if="not channel.promoted_slide_id and not tag and not slide_type and not search and not is_public_user and not category and display_channel_settings" class="wrap mt16 mb0" groups="base.group_website_designer">
+ <section t-if="not channel.promoted_slide_id and not tag and not slide_type and not search and not is_public_user and not category and display_channel_settings" class="wrap mt16 mb0" groups="website.group_website_designer">
<div class="container">
<div class="alert alert-danger alert-dismissable mb0">
<button type="button" class="close o_slides_hide_channel_settings" t-att-data-channel-id="channel.id" data-dismiss="alert">x</button>
diff --git a/addons/website_theme_install/models/ir_module_module.py b/addons/website_theme_install/models/ir_module_module.py
index 333a0a7495c2f5ab593ca66e436fd151b3942e32..e621cb47db52a053de52ad9de3423d89e5862127 100644
--- a/addons/website_theme_install/models/ir_module_module.py
+++ b/addons/website_theme_install/models/ir_module_module.py
@@ -45,7 +45,7 @@ class IrModuleModule(models.Model):
theme_category_id = self.env.ref('base.module_category_theme').id
self.search([ # Uninstall the theme(s) which is (are) installed
('state', '=', 'installed'),
- '|', ('category_id', 'not in', [self.env.ref('base.module_category_hidden').id, self.env.ref('base.module_category_theme_hidden').id]), ('name', '=', 'theme_default'),
+ '|', ('category_id', 'not in', [self.env.ref('base.module_category_hidden').id, self.env.ref('website_theme_install.module_category_theme_hidden').id]), ('name', '=', 'theme_default'),
'|', ('category_id', '=', theme_category_id), ('category_id.parent_id', '=', theme_category_id)
]).button_immediate_uninstall()
diff --git a/addons/website_theme_install/views/views.xml b/addons/website_theme_install/views/views.xml
index 008913813d39bc021f1ff7c81ced9d491c8d9527..ad47c1688a8e0e5fd79d40e597c716ba66ecf670 100644
--- a/addons/website_theme_install/views/views.xml
+++ b/addons/website_theme_install/views/views.xml
@@ -42,7 +42,7 @@
</record>
<!-- Make sure the category Theme/Hidden is created -->
- <record model="ir.module.category" id="base.module_category_theme_hidden">
+ <record model="ir.module.category" id="module_category_theme_hidden">
<field name="name">Hidden</field>
</record>
@@ -54,7 +54,7 @@
<field name="view_id" ref="theme_view_kanban"/>
<field name="search_view_id" ref="theme_view_search"/>
<field name="domain" eval="[
- '|', ('category_id', 'not in', [ref('base.module_category_hidden'), ref('base.module_category_theme_hidden')]), ('name', '=', 'theme_default'),
+ '|', ('category_id', 'not in', [ref('base.module_category_hidden'), ref('module_category_theme_hidden')]), ('name', '=', 'theme_default'),
'|', ('category_id', '=', ref('base.module_category_theme')), ('category_id.parent_id', '=', ref('base.module_category_theme'))
]"/>
</record>
diff --git a/addons/website_twitter/controllers/main.py b/addons/website_twitter/controllers/main.py
index 9d0e2c40edd723c1c98212b933dd09326421e1d4..59bfc55a49c09722d9bdbaddc9d0e8fd2450113b 100644
--- a/addons/website_twitter/controllers/main.py
+++ b/addons/website_twitter/controllers/main.py
@@ -17,7 +17,7 @@ class Twitter(http.Controller):
key = request.website.twitter_api_key
secret = request.website.twitter_api_secret
screen_name = request.website.twitter_screen_name
- debug = request.env['res.users'].has_group('base.group_website_publisher')
+ debug = request.env['res.users'].has_group('website.group_website_publisher')
if not key or not secret:
if debug:
return {"error": _("Please set the Twitter API Key and Secret in the Website Settings.")}
diff --git a/addons/website_twitter/security/ir.model.access.csv b/addons/website_twitter/security/ir.model.access.csv
index 77cdce2adaaf0c8e01bbae8d30acf0f80409ce2b..7f4e830affded3431fbeefa6a158370c05bf62aa 100644
--- a/addons/website_twitter/security/ir.model.access.csv
+++ b/addons/website_twitter/security/ir.model.access.csv
@@ -1,3 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_website_twitter_tweet_public,access of twitter snippet,website_twitter.model_website_twitter_tweet,,1,0,0,0
-access_website_twitter_tweet_manage,manage tweets,website_twitter.model_website_twitter_tweet,base.group_website_publisher,1,1,1,1
+access_website_twitter_tweet_manage,manage tweets,website_twitter.model_website_twitter_tweet,website.group_website_publisher,1,1,1,1
diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 42a0f5e19aa7a7e6887c625196033e67bdc1ce68..89f3fd1511808f1628a56ffc4e69f6fbca49a8ce 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -26,6 +26,8 @@
<menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
<menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
+ <menuitem id="base.menu_tests" name="Tests" sequence="1000000" web_icon="test_exceptions,static/description/icon.png"/>
+
<record model="ir.ui.menu" id="base.menu_administration">
<field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
</record>
diff --git a/openerp/addons/test_exceptions/view.xml b/openerp/addons/test_exceptions/view.xml
index 7b49c726b598afd242bab8540b01970c9da82939..7082765690322fcdcb15c88e73c2a974491b695d 100644
--- a/openerp/addons/test_exceptions/view.xml
+++ b/openerp/addons/test_exceptions/view.xml
@@ -116,8 +116,6 @@
<field name="target">new</field>
</record>
- <menuitem id="base.menu_tests" name="Tests" sequence="1000000" web_icon="test_exceptions,static/description/icon.png"/>
-
<menuitem id="menu_test_exceptions" parent="base.menu_tests" name="Test exceptions"/>
<menuitem id="menu_test_exceptions_leaf"
diff --git a/openerp/addons/test_new_api/views.xml b/openerp/addons/test_new_api/views.xml
index 6903e4158e5af36c2f557c0144b53c2586ca92d0..b8c0f5bfa8b046e0d5db075b48952e9c9f03bfb3 100644
--- a/openerp/addons/test_new_api/views.xml
+++ b/openerp/addons/test_new_api/views.xml
@@ -1,7 +1,5 @@
<odoo>
<data>
- <menuitem id="base.menu_tests" name="Tests" sequence="1000000" web_icon="test_exceptions,static/description/icon.png"/>
-
<menuitem id="menu_main" name="Discussions" sequence="20" parent="base.menu_tests"/>
<menuitem id="menu_sub" name="Discussions" parent="menu_main" sequence="10"/>
diff --git a/openerp/addons/test_workflow/data.xml b/openerp/addons/test_workflow/data.xml
index 11b2521a144ae560c86db52f474301f30d9f2b01..2a1302a4d747afe84613a186f9906f5e31eb39a9 100644
--- a/openerp/addons/test_workflow/data.xml
+++ b/openerp/addons/test_workflow/data.xml
@@ -25,8 +25,6 @@
<field name="view_mode">tree,form</field>
</record>
- <menuitem id="base.menu_tests" name="Tests" sequence="1000000" web_icon="test_exceptions,static/description/icon.png"/>
-
<menuitem id="menu_test_workflow" parent="base.menu_tests" name="Test workflow"/>
<menuitem id="menu_test_workflow_leaf"
diff --git a/openerp/tests/addons/test_translation_import/view.xml b/openerp/tests/addons/test_translation_import/view.xml
index 864ccad16ca44c7b482e34852de0b35c5e878925..52847b74eace760704dcad50d1cb50a5207786bd 100644
--- a/openerp/tests/addons/test_translation_import/view.xml
+++ b/openerp/tests/addons/test_translation_import/view.xml
@@ -11,9 +11,7 @@
<field name="target">current</field>
</record>
- <menuitem id="base.menu_tests" name="Tests" web_icon="test_exceptions,static/description/icon.png"/>
-
- <menuitem id="menu_test_translation" parent="base.menu_tests" name="Test translation"/>
+ <menuitem id="menu_test_translation" parent="menu_tests" name="Test translation"/>
<menuitem id="menu_test_translation_import"
name="Test translation import"