diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-03-28 15:07:42 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-03-28 15:07:42 +0530 |
| commit | aeb4e50fe630928a4fdf5156910303eb16ff47d5 (patch) | |
| tree | 1f1ae0f00449cd60cea399ac0c3857fef7d1f777 /addons/project/project_view.xml | |
| parent | 4dc00e8ccf75cb1046660d033be2ff6a62210ce7 (diff) | |
| parent | df11d7174a58c9a8bc343dc3fba8d19cefcb767c (diff) | |
[MERGE]improve and merge
bzr revid: sgo@tinyerp.com-20120328093742-yqfl03g0fwzn91vi
Diffstat (limited to 'addons/project/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index f4237945866..44c902ff20c 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -171,6 +171,7 @@ <field name="effective_hours"/> <field name="total_hours"/> <field name="date"/> + <field name="members"/> <field name="task"/> <field name="user_id"/> @@ -192,12 +193,15 @@ </div> <div class="oe_module_desc"> <h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4> - <div class="progress invoiced"> - <br/> - <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs - <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress> - <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs - </div> + <table border="0" width="350px"> + <tr> + <td align="left" valign="bottom" class="buttons"> + <t t-if="record.task.raw_value"> + <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks_icon.png" width="50" height="50" align="center"/></button> + </t> + </td> + </tr> + </table> </div> <table border="0" width="350px"> <tr> @@ -206,10 +210,13 @@ <a type="edit"><img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/></a> </t> </td> - <td align="right" valign="bottom" class="buttons"> - <t t-if="record.task.raw_value"> - <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="20" height="20" align="top"/></button> - </t> + <td align="right" valign="bottom"> + <div class="progress invoiced"> + <br/> + <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs + <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress> + <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs + </div> </td> </tr> </table> |