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

[IMP] 

bzr revid: apa@tinyerp.com-20120330110214-gy1g9fwt03dydcoh
This commit is contained in:
Amit Patel (OpenERP) 2012-03-30 16:32:14 +05:30
parent 67255539f9
commit da2e47979e
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
addons/project/project_view.xml
View File

@ -188,9 +188,15 @@
<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/> <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> <div class="manager"><field name="user_id"/></div>
</div> </div>
<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>
<td class="td_name"> <td class="td_name">
<div class="oe_project_border"> <div>
<h4 class="oe_project_font1"> <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,28)"/><t t-if="record.name.value.length > 28">...</t></div></a>
</h4> </h4>
@ -213,12 +219,12 @@
</div> </div>
</td> </td>
<td class="td_deadline"> <td class="td_deadline">
<t t-if="record.date.raw_value"> <!--<t t-if="record.date.raw_value">-->
<div class="sequence"> <!-- <div class="sequence">-->
<kbd class="user">Deadline</kbd> <!-- <kbd class="user">Deadline</kbd>-->
<div class="manager"><b><field name="date"/></b></div> <!-- <div class="manager"><b><field name="date"/></b></div>-->
</div> <!-- </div>-->
</t> <!--</t>-->
</td> </td>
</tr> </tr>
</table> </table>

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

@ -36,6 +36,7 @@
text-align: center; text-align: center;
} }
.project_icon{ .project_icon{
width: 30px; width: 30px;
display: block; display: block;

12
addons/project_timesheet/project_timesheet_view.xml
View File

@ -46,20 +46,18 @@
<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> <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> </t>
</xpath> </xpath>
<xpath expr="//td[@class='td_image']" position="inside">
<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>
<xpath expr="//td[@class='td_deadline']" position="inside"> <xpath expr="//td[@class='td_deadline']" position="inside">
<div class="sequence"> <div class="sequence">
<kbd class="user">To invoice</kbd> <kbd class="user">To invoice</kbd>
<div class="manager"><b><field name="amount_invoiced"/> <field name="currency_id"/></b></div> <div class="manager"><b><field name="amount_invoiced"/> <field name="currency_id"/></b></div>
</div> </div>
<div class="sequence"> <div class="sequence">
<button name="open_timesheets" class="oe_to_invoice_buttons" type="object" context="{'invoice':1}">Invoice</button> <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> </div>
<!-- <div class="sequence">-->
<!-- <button name="open_timesheets" class="oe_to_invoice_buttons" type="object" context="{'invoice':1}">Invoice</button>-->
<!-- </div>-->
</xpath> </xpath>
</field> </field>
</record> </record>