diff options
| author | Denis Vermylen <dve@odoo.com> | 2017-01-27 17:41:36 +0100 |
|---|---|---|
| committer | Denis Vermylen <dve@odoo.com> | 2017-01-27 18:26:37 +0100 |
| commit | ff40e3661cffd0cea9ce1d63a08ade98c8d56f5c (patch) | |
| tree | cf747309293fce8364d7db1a3bae25e79d93b31f | |
| parent | 51d5592a9d86d2766687d6633d496efac4bab97c (diff) | |
[FIX] google_calendar, hr_attendance: fix base_config_settings action name
When going to the General Settings and clicking a link generating
breadcrumbs, the breadcrumbs would not always read "General Settings".
Not sure why, but Odoo seems to takes the breadcrumb name from the last
ir.actions.act_window with the res_model being "base.config.settings".
In google_calendar: such an action was named API Configuration.
In hr_attendance: the settings wrongly inherits from base.config.settings
without renaming the model.
-> Model is renamed to attendance.config.settings like
in other modules (e.g.: sale) to avoid collision.
| -rw-r--r-- | addons/google_calendar/views/res_config_views.xml | 2 | ||||
| -rw-r--r-- | addons/hr_attendance/models/res_config.py | 3 | ||||
| -rw-r--r-- | addons/hr_attendance/views/res_config_view.xml | 7 |
3 files changed, 6 insertions, 6 deletions
diff --git a/addons/google_calendar/views/res_config_views.xml b/addons/google_calendar/views/res_config_views.xml index 1198d9b8177..6653c9ba3cd 100644 --- a/addons/google_calendar/views/res_config_views.xml +++ b/addons/google_calendar/views/res_config_views.xml @@ -20,7 +20,7 @@ </record> <record id="action_config_settings_google_calendar" model="ir.actions.act_window"> - <field name="name">API Configuration</field> + <field name="name">General Settings</field> <field name="type">ir.actions.act_window</field> <field name="res_model">base.config.settings</field> <field name="view_mode">form</field> diff --git a/addons/hr_attendance/models/res_config.py b/addons/hr_attendance/models/res_config.py index 917a3e25c5f..ca13339cbcf 100644 --- a/addons/hr_attendance/models/res_config.py +++ b/addons/hr_attendance/models/res_config.py @@ -5,7 +5,8 @@ from odoo import fields, models class BaseConfigSettings(models.TransientModel): - _inherit = 'base.config.settings' + _name = 'attendance.config.settings' + _inherit = 'res.config.settings' group_attendance_use_pin = fields.Boolean(string='Employee PIN', implied_group="hr_attendance.group_hr_attendance_use_pin") diff --git a/addons/hr_attendance/views/res_config_view.xml b/addons/hr_attendance/views/res_config_view.xml index fcd5bf31638..b8c11252fbf 100644 --- a/addons/hr_attendance/views/res_config_view.xml +++ b/addons/hr_attendance/views/res_config_view.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <record id="hr_attendance_view_config" model="ir.ui.view"> - <field name="name">base.config.setting.hr.form.attendance</field> - <field name="model">base.config.settings</field> - <field name="priority">99</field> + <field name="name">attendance.config.settings.hr.form.attendance</field> + <field name="model">attendance.config.settings</field> <field name="arch" type="xml"> <form string="Configuration" class= "oe_form_configuration"> <header> @@ -57,7 +56,7 @@ <record id="action_hr_attendance_settings" model="ir.actions.act_window"> <field name="name">Attendance Settings</field> - <field name="res_model">base.config.settings</field> + <field name="res_model">attendance.config.settings</field> <field name="view_mode">form</field> <field name="target">inline</field> <field name="view_id" ref="hr_attendance_view_config"/> |