odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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:
Raphael Collet 2012-06-12 16:28:08 +02:00
parent 357db69ff8
commit 15e2795879
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr/hr_view.xml
View File

@ -144,8 +144,8 @@
<div class="oe_employee_details"> <div class="oe_employee_details">
<h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4> <h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
<ul> <ul>
<li t-if="record.last_login.raw_value"> <li id="last_login">
<span t-if="record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%"> <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')"/> <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
</span> </span>
</li> </li>

14
addons/hr_holidays/hr_holidays_view.xml
View File

@ -508,14 +508,12 @@
<field name="leave_date_from"/> <field name="leave_date_from"/>
<field name="leave_date_to"/> <field name="leave_date_to"/>
</xpath> </xpath>
<xpath expr="//div[@class='oe_employee_details']/ul/li" position="before"> <xpath expr="//div[@class='oe_employee_details']/ul/li[@id='last_login']" position="inside">
<li t-if="record.current_leave_id.raw_value"> <span t-if="record.current_leave_id.raw_value" style="font-size: 100%%"
<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-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="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"/>
<field name="current_leave_id"/> </span>
</span>
</li>
</xpath> </xpath>
</field> </field>
</record> </record>