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

[MERGE] 

bzr revid: sgo@tinyerp.com-20120329092433-zjqai8x6k4ghscws
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-03-29 14:54:33 +05:30
parent 230408269f 5ebf8f6da9
commit db1f664ff7
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/project/project_view.xml
View File

@ -32,9 +32,7 @@
<page string="Administration">
<group col="2" colspan="2" name="kanban">
<separator colspan="2" string="Project Management"/>
<!--<group col="2" colspan="2" name="kanban">-->
<field name="task"/>
<!--</group>-->
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Performance"/>
@ -171,7 +169,7 @@
<field name="effective_hours"/>
<field name="total_hours"/>
<field name="date"/>
<field name="name"/>
<field name="members"/>
<field name="task"/>
<field name="user_id"/>
@ -189,9 +187,11 @@
<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])" height="40px" width="40px" /></button><br/>
<div class="manager"><field name="user_id"/></div>
</td>
<td align="left" valign="middle">
<div class="oe_module_desc oe_project_border">
<h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4>
<td align="left" valign="middle" width="220px">
<div class="oe_project_border">
<h4 class="oe_project_font1">
<a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,26)"/><t t-if="record.name.value.length > 26">...</t></div></a>
</h4>
<table >
<tr>
<td align="left" valign="middle" class="buttons">
@ -203,7 +203,7 @@
</table>
</div>
</td>
<td width="60px" valign="top" align="right">
<td width="70px" valign="top" align="right">
<t t-if="record.date.raw_value">
<div class="sequence">
<kbd class="user">Deadline</kbd>

6
addons/project_timesheet/project_timesheet_view.xml
View File

@ -44,9 +44,11 @@
<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[@class='sequence']" position="inside">
<kbd class="user">Amt to inv.</kbd>
<xpath expr="//div[@class='sequence']" position="after">
<div class="sequence">
<kbd class="user">To invoice</kbd>
<div class="manager"><field name="amount_invoiced"/></div>
</div>
</xpath>
</field>
</record>