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

[IMP] 

bzr revid: apa@tinyerp.com-20120329131030-vjfix4ygwcyrs90w
This commit is contained in:
Amit Patel (OpenERP) 2012-03-29 18:40:30 +05:30
parent acdc33fdb5
commit 60db095a88
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/project/project_view.xml
View File

@ -186,11 +186,7 @@
<td class="td_image">
<button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="avatar"/></button><br/>
<div class="manager"><field name="user_id"/></div>
<t t-if="record.date.raw_value">
<kbd class="user">Deadline</kbd>
<div class="manager"><field name="date"/></div>
</t>
</td>
</td>
<td class="td_name">
<div class="oe_project_border">
<h4 class="oe_project_font1">
@ -207,11 +203,13 @@
</table>
</div>
</td>
<td class="td_deadline">
<div id="sequence">
<!--<kbd class="user">Deadline</kbd>-->
<!--<div class="manager"><field name="date"/></div>-->
<td class="td_deadline" id="sequence">
<t t-if="record.date.raw_value">
<div class="sequence">
<kbd class="user">Deadline</kbd>
<div class="manager"><field name="date"/></div>
</div>
</t>
</td>
</tr>
</table>

3
addons/project/static/src/css/project.css
View File

@ -69,8 +69,7 @@
}
.td_deadline{
width:70px;
vertical-align:top;
text-align:right;
text-align:center;
}
.td_member{
text-align:right;

24
addons/project_timesheet/project_timesheet_view.xml
View File

@ -46,20 +46,20 @@
<button name="open_timesheets" class="oe_project_buttons" type="object" tooltip="timesheets"><img src="/project_timesheet/static/src/img/timesheet_icon.png" class="project_icon"/></button>
</t>
</xpath>
<xpath expr="//div[@id='sequence']" position="inside">
<xpath expr="//td[@id='sequence']" position="inside">
<div class="sequence">
<button name="open_timesheets" class="oe_to_invoice_buttons" type="object">
<small>To invoice</small>
<div class="manager">
<field name="amount_invoiced"/>
</div>
</button>
</div>
<!-- <div class="sequence">-->
<!-- <button name="open_timesheets" class="oe_to_invoice_buttons" type="object">-->
<!-- <small>To invoice</small>-->
<!-- <div class="manager">-->
<!-- <field name="amount_invoiced"/>-->
<!-- </div>-->
<!-- </button>-->
<!-- </div>-->
<div class="sequence">
<kbd class="user">Hours</kbd>
<div class="manager"><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/></div>
</div>
<kbd class="user">Hours</kbd>
<div class="manager"><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</div>
</div>
</xpath>
</field>
</record>