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

[IMP] 

bzr revid: apa@tinyerp.com-20120330111440-fcrsgemdp53e8ocs
This commit is contained in:
Amit Patel (OpenERP) 2012-03-30 16:44:40 +05:30
parent da2e47979e
commit 45a71c9c35
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/project/project_view.xml
View File

@ -198,7 +198,7 @@
<td class="td_name">
<div>
<h4 class="oe_project_font1">
<a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,28)"/><t t-if="record.name.value.length > 28">...</t></div></a>
<a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,35)"/><t t-if="record.name.value.length > 35">...</t></div></a>
</h4>
<table >
<tr class ="task">
@ -218,14 +218,14 @@
</table>
</div>
</td>
<td class="td_deadline">
<!--<td class="td_deadline">-->
<!--<t t-if="record.date.raw_value">-->
<!-- <div class="sequence">-->
<!-- <kbd class="user">Deadline</kbd>-->
<!-- <div class="manager"><b><field name="date"/></b></div>-->
<!-- </div>-->
<!--</t>-->
</td>
<!--</td>-->
</tr>
</table>
<table class="project_table">

27
addons/project_timesheet/project_timesheet_view.xml
View File

@ -41,20 +41,29 @@
</ul>
</t>
</xpath>
<xpath expr="//h4[@class='oe_project_font1']" position="replace">
<h4 class="oe_project_font1">
<a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,28)"/><t t-if="record.name.value.length > 28">...</t></div></a>
</h4>
</xpath>
<xpath expr="//td[@class='buttons']" position="inside">
<t t-if="record.timesheets.raw_value">
<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="//td[@class='td_deadline']" position="inside">
<div class="sequence">
<kbd class="user">To invoice</kbd>
<div class="manager"><b><field name="amount_invoiced"/> <field name="currency_id"/></b></div>
</div>
<div class="sequence">
<kbd class="user">Remaining Hours</kbd>
<div class="manager"><b><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</b></div>
</div>
<xpath expr="//td[@class='td_name']" position="after">
<td class="td_deadline">
<div class="sequence">
<kbd class="user">To invoice</kbd>
<div class="manager"><b><field name="amount_invoiced"/> <field name="currency_id"/></b></div>
</div>
<div class="sequence">
<kbd class="user">Remaining Hours</kbd>
<div class="manager"><b><t t-esc="Math.round(record.total_hours.raw_value-record.effective_hours.raw_value)"/> h</b></div>
</div>
</td>
<!-- <div class="sequence">-->
<!-- <button name="open_timesheets" class="oe_to_invoice_buttons" type="object" context="{'invoice':1}">Invoice</button>-->
<!-- </div>-->