diff options
| author | Amit Patel <apa@tinyerp.com> | 2012-09-13 10:50:46 +0530 |
|---|---|---|
| committer | Amit Patel <apa@tinyerp.com> | 2012-09-13 10:50:46 +0530 |
| commit | d4e50ffbd6b94ef4049c0e1cae13bf1cd2018ccc (patch) | |
| tree | 506e48c33431a19fa10016775539f76e661a0ff2 /addons/project/project_view.xml | |
| parent | 94c20235482dc887be076c9f2f0ce06bf30aebda (diff) | |
| parent | 74df8d0147b79a61fcf961231be8b82a5f86ef99 (diff) | |
[MERGE]:trunk
bzr revid: apa@tinyerp.com-20120912124210-cn5y3gcbxhew53h1
bzr revid: apa@tinyerp.com-20120913052046-r2lxb209eau3xnvo
Diffstat (limited to 'addons/project/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 49 |
1 files changed, 12 insertions, 37 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 4f2fe7d54f1..ff8ac943a67 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -136,6 +136,7 @@ <field name="resource_calendar_id"/> </group> <group string="Miscellaneous" name="misc"> + <field name="date"/> <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/> <field name="priority"/> <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/> @@ -249,47 +250,21 @@ <div class="oe_kanban_project_list"> <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 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"> - <th>Progress</th> - <td><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></td> - </tr> - </table> + <div class="oe_kanban_footer_left"> + <span> + <span class="oe_e">R</span> + <t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/> + </span> + <span t-if="record.date.raw_value"> + <span class="oe_e">N</span> + <field name="date"/> + </span> + </div> <div class="oe_kanban_project_avatars"> <t t-foreach="record.members.raw_value" t-as="member"> <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/> </t> </div> - - <!--<h3 class="oe_kanban_ellipsis"><field name="name"/></h3>--> - - <!--<div class="oe_kanban_project_list">--> - <!--<a t-if="record.use_tasks.raw_value"--> - <!--name="%(act_project_project_2_project_task_all)d" type="action">--> - <!--Tasks(<field name="task_count"/>)</a>--> - <!--</div>--> - - <!--<div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">--> - <!--<div>Deadline</div>--> - <!--<div><field name="date"/></div>--> - <!--</div>--> - <!--<div class="oe_kanban_project_fields oe_kanban_project_progress">--> - <!--<div>Progress</div>--> - <!--<div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>--> - <!--</div>--> - <!--<div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">--> - <!--<a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>--> - <!--</div>--> - <!--<div class="oe_kanban_project_avatars">--> - <!--<t t-foreach="record.members.raw_value" t-as="member">--> - <!--<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>--> - <!--</t>--> - <!--</div>--> - </div> </div> </t> @@ -779,7 +754,7 @@ <field name="case_default"/> </group> <group> - <field name="state" string="Related State"/> + <field name="state"/> <field name="sequence"/> <field name="fold"/> </group> |