summaryrefslogtreecommitdiff
path: root/addons/hr_attendance/views
diff options
context:
space:
mode:
authorlbs-odoo <lbs@odoo.com>2019-07-17 10:31:16 +0000
committerYannick Tivisse <yti@odoo.com>2019-08-16 13:35:21 +0000
commit9a0fedfc657a71cd79aad03b562d6bc1b762422d (patch)
tree27440e67b7dba9e7e31d4468652d6abfeebc2f39 /addons/hr_attendance/views
parentbf347e7727b477575c4a2230ac01e25f9d08270e (diff)
[IMP] various: improve searchviews UX
Improve searchviews UX in all the modules TaskID: 2029731 closes odoo/odoo#35700 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/hr_attendance/views')
-rw-r--r--addons/hr_attendance/views/hr_attendance_view.xml9
-rw-r--r--addons/hr_attendance/views/hr_employee_view.xml14
2 files changed, 4 insertions, 19 deletions
diff --git a/addons/hr_attendance/views/hr_attendance_view.xml b/addons/hr_attendance/views/hr_attendance_view.xml
index 0d973f92243..5443b969ce9 100644
--- a/addons/hr_attendance/views/hr_attendance_view.xml
+++ b/addons/hr_attendance/views/hr_attendance_view.xml
@@ -71,13 +71,12 @@
<field name="department_id" operator="child_of"/>
<filter string="My Attendances" name="myattendances" domain="[('employee_id.user_id.id', '=', uid)]" />
<separator/>
- <filter name="check_in_filter" string="Check In Date" date="check_in" default_period="last_month"/>
+ <filter string="Check In" name="check_in_filter" date="check_in" default_period="last_month"/>
<filter string="No Check Out" name="nocheckout" domain="[('check_out', '=', False)]" />
<group expand="0" string="Group By">
- <filter name="employee" string="Employee" context="{'group_by':'employee_id'}"/>
- <separator/>
- <filter name="groupby_name" string="Check In Date" context="{'group_by': 'check_in'}"/>
- <filter name="groupby_check_out" string="Check Out Date" context="{'group_by': 'check_out'}"/>
+ <filter string="Employee" name="employee" context="{'group_by': 'employee_id'}"/>
+ <filter string="Check In" name="groupby_name" context="{'group_by': 'check_in'}"/>
+ <filter string="Check Out" name="groupby_check_out" context="{'group_by': 'check_out'}"/>
</group>
</search>
</field>
diff --git a/addons/hr_attendance/views/hr_employee_view.xml b/addons/hr_attendance/views/hr_employee_view.xml
index 65a68bc63c9..665a8ed0a98 100644
--- a/addons/hr_attendance/views/hr_employee_view.xml
+++ b/addons/hr_attendance/views/hr_employee_view.xml
@@ -110,20 +110,6 @@
</field>
</record>
- <!--Inherit employee search view -->
- <record id="view_employee_filter_inherit_hr_attendance" model="ir.ui.view">
- <field name="name">hr.employee.filter.inherit.attendance</field>
- <field name="model">hr.employee</field>
- <field name="inherit_id" ref="hr.view_employee_filter"/>
- <field name="arch" type="xml">
- <xpath expr="//filter[@name='inactive']" position="before">
- <filter string="Signed In" name="signed_in" domain="[('last_attendance_id.check_out', '=', False)]"/>
- <filter string="Signed Out" name="signed_out" domain="['|', ('last_attendance_id', '=', False), ('last_attendance_id.check_out', '!=', False)]"/>
- <separator/>
- </xpath>
- </field>
- </record>
-
<!-- employee kanban view specifically for hr_attendance (to check in/out) -->
<record id="hr_employees_view_kanban" model="ir.ui.view">
<field name="name">hr.employee.kanban</field>