X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fhr_holidays%2Fhr_holidays_view.xml;h=c9626a82e1e5dfe18c33f774c081e69af2aaf65e;hb=b5164698f255633e68e6c3b75f30eae8492326dc;hp=6cbf52c89d700bf9f1fadc1c238576e997b4e4c8;hpb=69297dbf8164b8456dfcb7ae7f9835b90974b938;p=odoo%2Fodoo.git

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 6cbf52c..c9626a8 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -33,8 +33,6 @@
                     <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"/>
-                    <separator/>
                     <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)]"/>
@@ -158,7 +156,7 @@
                     <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="set_payslip_status" field_name="payslip_status" type="object"
+                    <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"/>
@@ -202,7 +200,7 @@
                     <field name="date_to"/>
                     <field name="holiday_status_id"/>
                     <field name="state"/>
-                    <button name="set_payslip_status" field_name="payslip_status" type="object"
+                    <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"/>
@@ -225,7 +223,7 @@
                     <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
                     <field name="state"/>
                     <field name="payslip_status" invisible="1"/>
-                    <button name="set_payslip_status" field_name="payslip_status" type="object"
+                    <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)"/>
@@ -624,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>