[IMP] hr, hr_holiday: put last_login and leave_type together in employee kanban
bzr revid: rco@openerp.com-20120612142808-bkm8hbgnw44cwh15
This commit is contained in:
parent
357db69ff8
commit
15e2795879
|
@ -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 && 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>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue