From 15e2795879915cd5c9a0b01d86f0739bd449f1ee Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 12 Jun 2012 16:28:08 +0200
Subject: [PATCH] [IMP] hr, hr_holiday: put last_login and leave_type together
 in employee kanban

bzr revid: rco@openerp.com-20120612142808-bkm8hbgnw44cwh15
---
 addons/hr/hr_view.xml                   |  4 ++--
 addons/hr_holidays/hr_holidays_view.xml | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ca25007968c..8117ec92965 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -144,8 +144,8 @@
                             <div class="oe_employee_details">
                                 <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
                                 <ul>
-                                    <li t-if="record.last_login.raw_value">
-                                        <span t-if="record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
+                                    <li id="last_login">
+                                        <span t-if="record.last_login.raw_value &amp;&amp; record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
                                               <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
                                         </span>
                                     </li>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3cb0d90bf5e..62223922163 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -508,14 +508,12 @@
                     <field name="leave_date_from"/>
                     <field name="leave_date_to"/>
                 </xpath>
-                <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
-                    <li t-if="record.current_leave_id.raw_value">
-                        <span 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')">
-                            <field name="current_leave_id"/>
-                        </span>
-                    </li>
+                <xpath expr="//div[@class='oe_employee_details']/ul/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')">
+                        <field name="current_leave_id"/>
+                    </span>
                 </xpath>
             </field>
         </record>