pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] hr: Improve settings layout

Browse Source 
closes odoo/odoo#51334

Taskid: 2241726
Related: odoo/upgrade#1202
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
Yannick Tivisse
2020-05-26 07:13:59 +00:00
parent 41bf013e04
commit f1e2fde734
2 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr/models/res_config_settings.py
-1
View File
@@ -9,7 +9,6 @@ class ResConfigSettings(models.TransientModel):
resource_calendar_id = fields.Many2one(
'resource.calendar', 'Company Working Hours',
related='company_id.resource_calendar_id', readonly=False)
module_hr_org_chart = fields.Boolean(string="Organizational Chart")
module_hr_presence = fields.Boolean(string="Advanced Presence Control")
module_hr_skills = fields.Boolean(string="Skills Management")
hr_presence_control_login = fields.Boolean(string="Based on user status in system", config_parameter='hr.hr_presence_control_login')
addons/hr/views/res_config_settings_views.xml
+11 -25
View File
@@ -10,17 +10,6 @@
<div class="app_settings_block" data-string="Employees" string="Employees" data-key="hr" groups="hr.group_hr_manager">
<h2>Employees</h2>
<div class="row mt16 o_settings_container" name="employees_setting_container">
<div class="col-12 col-lg-6 o_setting_box" id="enrich_employee_setting">
<div class="o_setting_left_pane">
<field name="module_hr_skills"/>
</div>
<div class="o_setting_right_pane">
<label for="module_hr_skills"/>
<div class="text-muted">
Enrich employee profiles with skills and resumes
</div>
</div>
</div>
<div class="col-12 col-lg-6 o_setting_box" id="presence_control_setting" title="Presence of employees">
<div class="o_setting_right_pane">
@@ -66,6 +55,17 @@
</div>
</div>
</div>
<div class="col-12 col-lg-6 o_setting_box" id="enrich_employee_setting">
<div class="o_setting_left_pane">
<field name="module_hr_skills"/>
</div>
<div class="o_setting_right_pane">
<label for="module_hr_skills"/>
<div class="text-muted">
Enrich employee profiles with skills and resumes
</div>
</div>
</div>
</div>
<h2>Work Organization</h2>
<div class="row mt16 o_settings_container" name="work_organization_setting_container">
@@ -88,20 +88,6 @@
</div>
</div>
</div>
<div class="col-12 col-lg-6 o_setting_box"
id="organizational_chart_setting"
title="Show organizational chart on employee form">
<div class="o_setting_left_pane">
<field name="module_hr_org_chart"/>
</div>
<div class="o_setting_right_pane">
<label for="module_hr_org_chart"/>
<div class="text-muted">
Show organizational chart on employee form
</div>
</div>
</div>
</div>
<h2>Employee Update Rights</h2>
<div class="row mt16 o_settings_container" name="employee_rights_setting_container">