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

[IMP] hr(_fleet,_timesheet): Improve the UX of employee form view

Browse Source 
Purpose of the task is to the ui of HR Settings tab, on the employee
form have to be reorganized to be more clear

So in this task, split the status details under the two new groups
'Payroll' and 'Application Settings'.

Related PR: https://github.com/odoo/enterprise/pull/14089

closes odoo/odoo#59984

Taskid: 2351762
Related: odoo/enterprise#14089
Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
Krina Oza
2020-10-15 12:28:33 +00:00
committed by Barad Mahendra
parent 039650f824
commit 5cf0f5e209
3 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr/views/hr_employee_views.xml
+4 -1
View File
@@ -178,7 +178,6 @@
<group>
<group string='Status' name="active_group">
<field name="user_id" string="Related User" domain="[('share', '=', False)]"/>
<field name="job_id"/>
</group>
<group string="Attendance" name="identification_group">
<field name="pin" string="PIN Code"/>
@@ -189,6 +188,10 @@
<button name="%(hr_employee_print_badge)d" string="Print Badge" class="btn btn-link" type="action" attrs="{'invisible': [('barcode', '=', False)]}"/>
</div>
</group>
<group string='Payroll' name="payroll_group">
<field name="job_id"/>
</group>
<group name="application_group"/>
</group>
</page>
</notebook>
addons/hr_fleet/views/employee_views.xml
+6 -5
View File
@@ -19,11 +19,12 @@
<field name="employee_cars_count" widget="statinfo" />
</button>
</div>
<xpath expr="//group[@name='identification_group']" position="after">
<group string="Fleet">
<field name="mobility_card"/>
</group>
</xpath>
<group name="application_group" position="attributes">
<attribute name="string">Application Settings</attribute>
</group>
<group name="application_group" position="inside">
<field name="mobility_card" string="Fleet Mobility Card"/>
</group>
</field>
</record>
addons/hr_timesheet/views/hr_views.xml
+10 -11
View File
@@ -32,17 +32,16 @@
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<xpath expr="//page[@name='hr_settings']" position="inside">
<group>
<group string="Timesheets" name="timesheet" groups="hr_timesheet.group_timesheet_manager">
<label for="timesheet_cost"/>
<div>
<field name="timesheet_cost" class="oe_inline"/> per hour
<field name="currency_id" invisible="1"/>
</div>
</group>
</group>
</xpath>
<group name="application_group" position="attributes">
<attribute name="string">Application Settings</attribute>
</group>
<group name="application_group" position="inside">
<label for="timesheet_cost" groups="hr_timesheet.group_timesheet_manager"/>
<div name="timesheet" groups="hr_timesheet.group_timesheet_manager">
<field name="timesheet_cost" class="oe_inline"/> per hour
<field name="currency_id" invisible="1"/>
</div>
</group>
<div name="button_box" position="inside">
<button class="oe_stat_button" type="action" name="%(timesheet_action_from_employee)d" icon="fa-calendar" groups="hr_timesheet.group_hr_timesheet_user">
<div class="o_stat_info">