diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml index ac2e904b2e5..256af22af5e 100644 --- a/addons/account/views/account_menuitem.xml +++ b/addons/account/views/account_menuitem.xml @@ -24,7 +24,7 @@ - + diff --git a/addons/association/views/association_views.xml b/addons/association/views/association_views.xml index 6e875a21447..48210e76e97 100644 --- a/addons/association/views/association_views.xml +++ b/addons/association/views/association_views.xml @@ -2,8 +2,8 @@ - + diff --git a/addons/base_setup/views/res_config_views.xml b/addons/base_setup/views/res_config_views.xml index 10c55e76b90..80f70b36f5e 100644 --- a/addons/base_setup/views/res_config_views.xml +++ b/addons/base_setup/views/res_config_views.xml @@ -163,7 +163,7 @@ diff --git a/addons/crm/report/crm_opportunity_report_views.xml b/addons/crm/report/crm_opportunity_report_views.xml index 9e2e40cbde3..27b96538cd5 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. + parent="sales_team.menu_sale_report" action="crm_opportunity_report_action" sequence="5"/> Pipeline Analysis @@ -200,7 +200,7 @@ with the the sales teams. diff --git a/addons/crm/views/calendar_views.xml b/addons/crm/views/calendar_views.xml index 0186955335a..925f0e198ca 100644 --- a/addons/crm/views/calendar_views.xml +++ b/addons/crm/views/calendar_views.xml @@ -2,7 +2,7 @@ diff --git a/addons/crm/views/crm_activity_views.xml b/addons/crm/views/crm_activity_views.xml index f42580d1ba2..0950ccec890 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"/> diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index efbf61de851..6565ec972f5 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 @@ diff --git a/addons/crm/views/crm_stage_views.xml b/addons/crm/views/crm_stage_views.xml index c4d9d98c6ce..6f177b8dbdc 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"/> diff --git a/addons/crm/views/crm_views.xml b/addons/crm/views/crm_views.xml index d8c43da67e8..3bdc8be6895 100644 --- a/addons/crm/views/crm_views.xml +++ b/addons/crm/views/crm_views.xml @@ -14,26 +14,19 @@ sequence="6"/> - - diff --git a/addons/crm/views/res_config_views.xml b/addons/crm/views/res_config_views.xml index f4939b40566..c78f5be281b 100644 --- a/addons/crm/views/res_config_views.xml +++ b/addons/crm/views/res_config_views.xml @@ -46,19 +46,4 @@ - - - - diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index bf90d5031fc..a3a9d7cd210 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -5,30 +5,30 @@ 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. - + Officer the user will be able to approve document created by employees. - + Manager the user will have an access to the human resources configuration as well as statistic reports. - + - + Attendances - + diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv index 121e0f23f25..74e19969a2a 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 4fa877c7d8b..d03507597e8 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 0d74d1e4c81..a22368abb43 100644 --- a/addons/hr/views/hr_views.xml +++ b/addons/hr/views/hr_views.xml @@ -6,7 +6,7 @@ @@ -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"/> @@ -37,7 +37,7 @@
-
+
- + @@ -74,12 +74,12 @@ - + - - + + @@ -96,7 +96,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -586,7 +586,7 @@ id="menu_hr_department_tree" parent="menu_hr_root" sequence="90" - groups="base.group_hr_user"/> + groups="group_hr_user"/> diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py index 88b5db50ee8..2aaffad9693 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 f9bffadc61b..6d7c9d4eb12 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 d033786fd5e..742722d2fa2 100644 --- a/addons/hr_attendance/security/hr_attendance_security.xml +++ b/addons/hr_attendance/security/hr_attendance_security.xml @@ -1,20 +1,20 @@ - - + + - - + + - + Manual Attendances The user will gain access to the human resources attendance menu, enabling him to manage his own attendance. - + Enable PIN use The user will have to enter his PIN to check in and out manually at the company screen. @@ -26,7 +26,7 @@ attendance officer: full access [(1,'=',1)] - + diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv index 9f9d88c44a5..080245b84fb 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 81ea12da883..6d79f801435 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 1c8b9b4ce66..65395c6da96 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 e708c678fa8..744695f4a5e 100644 --- a/addons/hr_attendance/views/hr_attendance_view.xml +++ b/addons/hr_attendance/views/hr_attendance_view.xml @@ -128,17 +128,17 @@ - + - + - + - + - + - + - + diff --git a/addons/hr_attendance/views/hr_employee_view.xml b/addons/hr_attendance/views/hr_employee_view.xml index fd709ddcee6..fcf7eb295d1 100644 --- a/addons/hr_attendance/views/hr_employee_view.xml +++ b/addons/hr_attendance/views/hr_employee_view.xml @@ -13,9 +13,9 @@
- - - + + + diff --git a/addons/hr_attendance/views/res_config_view.xml b/addons/hr_attendance/views/res_config_view.xml index 66224e5d4aa..5ec645ad584 100644 --- a/addons/hr_attendance/views/res_config_view.xml +++ b/addons/hr_attendance/views/res_config_view.xml @@ -26,5 +26,5 @@ + sequence="99" action="action_hr_attendance_settings" groups="hr.group_hr_manager"/> \ 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 820935111f0..41f553b9cee 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 4174c9f2219..28ca3af545d 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"> @@ -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"/> diff --git a/addons/hr_expense/data/hr_expense_demo.xml b/addons/hr_expense/data/hr_expense_demo.xml index 1128b8ceffb..6c5b47c12b3 100644 --- a/addons/hr_expense/data/hr_expense_demo.xml +++ b/addons/hr_expense/data/hr_expense_demo.xml @@ -6,7 +6,7 @@ - + Pieter Parter's Farm 1 @@ -17,7 +17,7 @@ - + diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv index 0e60e20c017..6ded19e6c78 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 6d13ad5d62c..01492f7d00a 100644 --- a/addons/hr_expense/security/ir_rule.xml +++ b/addons/hr_expense/security/ir_rule.xml @@ -6,7 +6,7 @@ Manager Expense [(1, '=', 1)] - + Employee Expense diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml index bd30fdf6458..08f21f8ec9a 100644 --- a/addons/hr_expense/views/hr_expense_views.xml +++ b/addons/hr_expense/views/hr_expense_views.xml @@ -166,7 +166,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -406,11 +406,11 @@
-
@@ -549,7 +549,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -748,23 +748,23 @@ - + - + - + + action="action_hr_expense_sheet_all_all" groups="hr.group_hr_manager"/> + action="hr_expense_product" groups="hr.group_hr_manager" sequence="10"/> diff --git a/addons/hr_gamification/security/gamification_security.xml b/addons/hr_gamification/security/gamification_security.xml index 86671336c63..f1de6b6d1e7 100644 --- a/addons/hr_gamification/security/gamification_security.xml +++ b/addons/hr_gamification/security/gamification_security.xml @@ -3,7 +3,7 @@ - + diff --git a/addons/hr_gamification/security/ir.model.access.csv b/addons/hr_gamification/security/ir.model.access.csv index b89db7cd104..3cbe77aa6fa 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 6dd61094c55..e819b83e124 100644 --- a/addons/hr_gamification/views/gamification_views.xml +++ b/addons/hr_gamification/views/gamification_views.xml @@ -66,7 +66,7 @@ - - + + diff --git a/addons/hr_holidays/models/hr.py b/addons/hr_holidays/models/hr.py index 3ea382744e0..9f79e35cc2a 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 80d57ae62a8..24b0b875d8f 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 5598774fcd3..fb6041db7fe 100644 --- a/addons/hr_holidays/security/hr_holidays_security.xml +++ b/addons/hr_holidays/security/hr_holidays_security.xml @@ -22,14 +22,14 @@ Holidays Officer [(1,'=',1)] - + Leaves Officer [(1,'=',1)] - + diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv index 0b8f5329842..cf7e7b24bed 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 8134675266a..40ec4e850b3 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 7d3cf301a9a..4bd0cba4722 100644 --- a/addons/hr_holidays/views/hr_holidays_views.xml +++ b/addons/hr_holidays/views/hr_holidays_views.xml @@ -29,9 +29,9 @@ - + - + @@ -83,9 +83,9 @@
-
@@ -190,7 +190,7 @@ + sequence="11" groups="hr.group_hr_user"/> hr.department.kanban.inherit 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 7ca0834449b..dcebadc2209 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 0f8ceb6046d..0f76c4eb198 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" /> 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 c4655e65a2f..3f52d40269e 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" /> diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml index fcd11421927..daaabf92657 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 @@ }"/> - + diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml index b6efbf967ac..2ae03360d14 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 8788384fa4f..f066a807a55 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 313548b8a17..cf564b0c859 100644 --- a/addons/maintenance/security/maintenance.xml +++ b/addons/maintenance/security/maintenance.xml @@ -1,7 +1,7 @@ - + Equipment Manager @@ -27,14 +27,14 @@ Administrator of maintenance requests [(1, '=', 1)] - + Equipments administrator [(1, '=', 1)] - + diff --git a/addons/maintenance/tests/test_maintenance.py b/addons/maintenance/tests/test_maintenance.py index 11aae3d6986..a9c55d95ffc 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 26071d62091..109cd016aff 100644 --- a/addons/maintenance/views/maintenance_views.xml +++ b/addons/maintenance/views/maintenance_views.xml @@ -65,7 +65,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -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"/> {"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} - - + diff --git a/addons/membership/views/product_views.xml b/addons/membership/views/product_views.xml index 18aaad1842b..9651e2aa381 100644 --- a/addons/membership/views/product_views.xml +++ b/addons/membership/views/product_views.xml @@ -101,8 +101,8 @@ - - + + diff --git a/addons/mrp/data/mrp_demo.xml b/addons/mrp/data/mrp_demo.xml index f5aba0ea2d9..70da69628f8 100644 --- a/addons/mrp/data/mrp_demo.xml +++ b/addons/mrp/data/mrp_demo.xml @@ -11,7 +11,7 @@ - + 0.1 diff --git a/addons/mrp/views/mrp_config_settings_views.xml b/addons/mrp/views/mrp_config_settings_views.xml index 148a99cbd48..c5d960500e0 100644 --- a/addons/mrp/views/mrp_config_settings_views.xml +++ b/addons/mrp/views/mrp_config_settings_views.xml @@ -36,7 +36,7 @@ inline - diff --git a/addons/mrp/views/mrp_views_menus.xml b/addons/mrp/views/mrp_views_menus.xml index 7595bedf0cb..066c1f6aab1 100644 --- a/addons/mrp/views/mrp_views_menus.xml +++ b/addons/mrp/views/mrp_views_menus.xml @@ -2,7 +2,7 @@ - diff --git a/addons/mrp/views/mrp_workcenter_views.xml b/addons/mrp/views/mrp_workcenter_views.xml index cccd5e5816d..3947ea11dde 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 7fd6c218ab4..31e83f23cde 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 @@ - + Beverages - - + + Soft Drinks 1 - - + + Milkshakes 3 - - + + Hot Drinks 2 - - + + Beers 4 - - + + Import Drinks 6 - - + + Wine 5 - - + + Cocktails 7 - + True 2.20 Coca-Cola - + - + True 2.20 Fanta - + - + True 2.20 Ice Tea - + - + True 2.20 Minute Maid - + - + True 2.60 RedBull - + - + True 2.20 Schweppes - + - + True 2.20 Sprite - + - + True 2.20 Water - + - + True 3.60 Milkshake Banana - + - + True 3.60 Milkshake Cherry - + - + True 3.60 Milkshake Chocolate - + - + True 3.60 Milkshake Strawberry - + - + True 3.60 Milkshake Vanilla - + - + True 4.70 Yellow Tea - + - + True 4.70 Nescafe - + - + True 4.70 Irish Coffee - + - + True 4.70 Green Tea - + - + True 4.70 Capuccino - + - + True 4.70 Coffee - + - + True 4.70 Espresso - + - + True 3.50 Red Wine - + - + True 3.50 White Wine - + - + True 3.50 Rose Wine - + - + True 5.50 Bacardi - + - + True 5.50 Baileys - + - + True 5.50 Captain Morgan - + - + True 5.50 Disaronno - + - + True 5.50 Gordon - + - + True 5.50 Jack Daniel's - + - + True 5.50 Jim Beam - + - + True 5.50 Malibu - + - + True 5.50 Martini - + - + True 5.50 Red Label - + - + True 5.50 Safari - + - + True 5.50 Smirnoff - + - + True 5.50 Tequila - + - + True 3.40 Tuborg - + - + True 3.40 Stella Artois - + - + True 3.40 Miller - + - + True 3.40 Guinness - + - + True 3.40 Foster's - + - + True 3.40 Efes - + - + True 3.40 Corona - + - + True 3.40 Carlsberg - + - + True 3.40 Budweiser - + - + True 7.50 Bloody Mary - + - + True 7.50 Caipirinha - + - + True 7.50 Cosmopolitan - + - + True 7.50 Cuba Libre - + - + True 7.50 Daiquiri - + - + True 7.50 Manhattan - + - + True 7.50 Margarita - + - + True 7.50 Martini - + - + True 7.50 Mojito - + - + True 7.50 Pina Colada - + - + True 7.50 White Russian - + diff --git a/addons/project/data/web_planner_data.xml b/addons/project/data/web_planner_data.xml index 10716495060..ce1b1be2077 100644 --- a/addons/project/data/web_planner_data.xml +++ b/addons/project/data/web_planner_data.xml @@ -1076,7 +1076,7 @@ Project Management planner - + 7 planner_project manage your projects? It starts here.'), position: 'bottom', }, { diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index dc8013c4e15..0ed16dcaf4b 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -3,17 +3,17 @@ - @@ -680,9 +680,9 @@ action = model.activate_sample_project() - + - + @@ -724,9 +724,9 @@ action = model.activate_sample_project() - + parent="menu_main_pm" sequence="99"/> diff --git a/addons/project/views/res_config_views.xml b/addons/project/views/res_config_views.xml index 3a7abe453e1..265a08ce932 100644 --- a/addons/project/views/res_config_views.xml +++ b/addons/project/views/res_config_views.xml @@ -43,6 +43,6 @@ inline - diff --git a/addons/project/views/tour_views.xml b/addons/project/views/tour_views.xml index 541c4e0f251..3a572ab85cc 100644 --- a/addons/project/views/tour_views.xml +++ b/addons/project/views/tour_views.xml @@ -1,7 +1,7 @@ - + diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 68217744ca8..5f2d2260fdb 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 @@ + parent="project.menu_project_report"/> diff --git a/addons/purchase/report/purchase_report_views.xml b/addons/purchase/report/purchase_report_views.xml index f47a36e0a15..ae673cc5b79 100644 --- a/addons/purchase/report/purchase_report_views.xml +++ b/addons/purchase/report/purchase_report_views.xml @@ -91,7 +91,7 @@ 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. - diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml index 1cd13f7c3db..2208d7cf237 100644 --- a/addons/purchase/views/purchase_views.xml +++ b/addons/purchase/views/purchase_views.xml @@ -3,20 +3,20 @@ + parent="menu_purchase_root" sequence="1" /> - + - + - + diff --git a/addons/sale/report/sale_report_views.xml b/addons/sale/report/sale_report_views.xml index af00b04801a..3e5c8192270 100644 --- a/addons/sale/report/sale_report_views.xml +++ b/addons/sale/report/sale_report_views.xml @@ -94,6 +94,6 @@ 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. - + diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml index 500aa9bc191..0b64cccde22 100644 --- a/addons/sale/views/sale_config_settings_views.xml +++ b/addons/sale/views/sale_config_settings_views.xml @@ -61,9 +61,4 @@ - - - diff --git a/addons/sale/views/sale_layout_category_view.xml b/addons/sale/views/sale_layout_category_view.xml index 9104798247e..ecb0bbebb74 100644 --- a/addons/sale/views/sale_layout_category_view.xml +++ b/addons/sale/views/sale_layout_category_view.xml @@ -53,7 +53,7 @@ - diff --git a/addons/sale_stock/views/stock_views.xml b/addons/sale_stock/views/stock_views.xml index 5ca76285232..fdd641ccd90 100644 --- a/addons/sale_stock/views/stock_views.xml +++ b/addons/sale_stock/views/stock_views.xml @@ -7,10 +7,10 @@ - - + stock.location.route.form diff --git a/addons/sales_team/__openerp__.py b/addons/sales_team/__openerp__.py index b29ce7ca17b..9d515d5ce94 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 c460851f1d8..4ecca9ff36f 100644 --- a/addons/sales_team/data/sales_team_data.xml +++ b/addons/sales_team/data/sales_team_data.xml @@ -5,6 +5,10 @@ Direct Sales + + + Website Sales + diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml index a55b85e8f9b..50365a22e07 100644 --- a/addons/sales_team/views/crm_team_views.xml +++ b/addons/sales_team/views/crm_team_views.xml @@ -1,15 +1,19 @@ - - - + + + + + + @@ -17,10 +21,11 @@ - + - - + + + @@ -165,7 +170,7 @@ - + Sales Teams @@ -186,7 +191,7 @@ diff --git a/addons/survey/data/survey_demo_user.xml b/addons/survey/data/survey_demo_user.xml index f1baaed445f..0daa9eb465e 100644 --- a/addons/survey/data/survey_demo_user.xml +++ b/addons/survey/data/survey_demo_user.xml @@ -3,7 +3,7 @@ - + diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv index e49c976ea1f..09b5ae48178 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 65b9bcc3ff4..357e939525e 100644 --- a/addons/survey/security/survey_security.xml +++ b/addons/survey/security/survey_security.xml @@ -2,21 +2,21 @@ - + User - + Manager - + - + @@ -24,7 +24,7 @@ Access to survey for regular users [('stage_id.closed', '=', False)] - + @@ -35,7 +35,7 @@ Survey Manager access rights [(1, '=', 1)] - + @@ -57,7 +57,7 @@ Access to user_input for regular users ['|', ('create_uid', '=', user.id), ('partner_id', '=', user.partner_id.id)] - + @@ -68,7 +68,7 @@ Survey Manager access rights [(1, '=', 1)] - + diff --git a/addons/survey/tests/test_survey.py b/addons/survey/tests/test_survey.py index 81f55a95eef..322289d4e33 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 c49110b80b0..4a1f4caed6c 100644 --- a/addons/survey/views/survey_templates.xml +++ b/addons/survey/views/survey_templates.xml @@ -63,7 +63,7 @@ diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml index 0a4279ba053..07655717df5 100644 --- a/addons/survey/views/survey_views.xml +++ b/addons/survey/views/survey_views.xml @@ -115,7 +115,7 @@ -
+