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

fixed project_timesheet with the new project xml 

bzr revid: mit@openerp.com-20120829154535-z3qr72o9usnt9piv
This commit is contained in:
Minh Tran 2012-08-29 17:45:35 +02:00
parent 3ae5a108ab
commit 3053d26382
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/project/project_view.xml
View File

@ -245,8 +245,8 @@
<a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
</div>
<table>
<tr t-if="record.date.raw_value">
<th class="oe_kanban_project_fields oe_kanban_project_deadline">Deadline</th>
<tr class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
<th>Deadline</th>
<td><field name="date"/></td>
</tr>
<tr class="oe_kanban_project_fields oe_kanban_project_progress">

17
addons/project_timesheet/project_timesheet_view.xml
View File

@ -17,13 +17,16 @@
<a t-if="record.use_timesheets.raw_value"
name="open_timesheets" type="object">Timesheets(<field name="timesheet_count"/>)</a>
</xpath>
<xpath expr="//div[contains(@class, 'oe_kanban_project_deadline')]" position="before">
<div class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
<div>Amount to invoice</div>
<div><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></div>
<div>Time to Invoice</div>
<div><field name="time_to_invoice"/> <field name="company_uom_id"/></div>
</div>
<xpath expr="//tr[contains(@class, 'oe_kanban_project_deadline')]" position="before">
<tr class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
<th>Amount to invoice</th>
<td><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></td>
</tr>
<tr class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
<th>Time to Invoice</th>
<td><field name="time_to_invoice"/> <field name="company_uom_id"/></td>
</tr>
</xpath>
</field>
</record>