[IMP] Reportings Review

[odoo/odoo.git] / addons / hr_holidays / hr_holidays_view.xml

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 24e656d..c9626a8 100644 (file)
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -33,7 +33,7 @@
                     <separator/>
                     <filter name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
-                    <filter string="My Requests" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leave Requests"/>
+                    <filter string="To Do" name="todo" domain="[('payslip_status', '=', False), ('holiday_status_id.active', '=', True)]"/>
                     <separator/>
                     <filter string="My Department Leaves" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>
@@ -156,14 +156,10 @@
                     <field name="date_to" required="1" on_change="onchange_date_to(date_to, date_from)"/>
                     <field name="number_of_days_temp" string="Allocated Days" sum="Remaining Days"/>
                     <field name="state"/>
+                    <button name="toggle_payslip_status" field_name="payslip_status" type="object"
+                        widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="base.group_hr_manager"/>
                     <field name="report_note" groups="base.group_hr_manager"/>
                     <field name="payslip_status" invisible="1"/>
-                    <button string="To Report in Payslip" name="set_payslip_status"
-                        type="object" class="oe_link oe_right" icon="gtk-normal"
-                        attrs="{'invisible': [('payslip_status', '=', True)]}" groups="base.group_hr_manager"/>
-                    <button string="Reported in last payslips" name="unset_payslip_status"
-                        type="object" class="oe_link oe_right" icon="gtk-yes"
-                        attrs="{'invisible': [('payslip_status', '=', False)]}" groups="base.group_hr_manager"/>
                 </tree>
             </field>
         </record>
@@ -204,14 +200,10 @@
                     <field name="date_to"/>
                     <field name="holiday_status_id"/>
                     <field name="state"/>
+                    <button name="toggle_payslip_status" field_name="payslip_status" type="object"
+                        widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="base.group_hr_manager"/>
                     <field name="report_note"/>
                     <field name="payslip_status" invisible="1"/>
-                    <button string="To Report in Payslip" name="set_payslip_status"
-                        type="object" class="oe_link oe_right"
-                        attrs="{'invisible': [('payslip_status', '=', True)]}" groups="base.group_hr_manager"/>
-                    <button string="Reported in last payslips" name="unset_payslip_status"
-                        type="object" class="oe_link oe_right"
-                        attrs="{'invisible': [('payslip_status', '=', False)]}" groups="base.group_hr_manager"/>
                 </tree>
             </field>
         </record>
@@ -231,12 +223,8 @@
                     <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
                     <field name="state"/>
                     <field name="payslip_status" invisible="1"/>
-                    <button string="To Report in Payslip" name="set_payslip_status"
-                        type="object" class="oe_link oe_right"
-                        attrs="{'invisible': [('payslip_status', '=', True)]}" groups="base.group_hr_manager"/>
-                    <button string="Reported in last payslips" name="unset_payslip_status"
-                        type="object" class="oe_link oe_right"
-                        attrs="{'invisible': [('payslip_status', '=', False)]}" groups="base.group_hr_manager"/>
+                    <button name="toggle_payslip_status" field_name="payslip_status" type="object"
+                        widget="toggle_button" options='{"active": "Reported in last payslips", "inactive": "To Report in Payslip"}' groups="base.group_hr_manager"/>
                     <field name="category_id" invisible="1"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>
                     <field name="manager_id" invisible="1"/>
@@ -430,7 +418,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_employee"/>
-            <field name="context">{'default_type': 'remove', 'search_default_gray': 1, 'search_default_year': 1, 'search_default_group_employee': 1}</field>
+            <field name="context">{'default_type': 'remove', 'search_default_todo': 1}</field>
             <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
@@ -523,7 +511,7 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" groups="base.group_hr_manager"/>
-        <menuitem name="Leaves Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10" groups="base.group_hr_manager"/>
+        <menuitem name="Leave Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration_employees" sequence="4" groups="base.group_hr_manager"/>
 
         <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
@@ -634,10 +622,10 @@
                     <field name="leave_date_from"/>
                     <field name="leave_date_to"/>
                 </xpath>
-                <xpath expr="//div[@class='oe_employee_details']/ul/li[@id='last_login']" position="inside">
+                <xpath expr="//li[@id='last_login']" position="inside">
                     <span t-if="record.current_leave_id.raw_value" style="font-size: 100%%"
                             t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_button oe_kanban_color_3':'oe_kanban_button oe_kanban_color_2'"
-                            t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')">
+                            t-att-title="moment(record.leave_date_from.raw_value).format('ddd do MMM') + ' - ' + moment(record.leave_date_to.raw_value).format('ddd do MMM')">
                         <field name="current_leave_id"/>
                     </span>
                 </xpath>