diff options
| author | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
| commit | bb1e256f5b24bb4fc4b64e1fa973f86a30e4bace (patch) | |
| tree | 95f1de1c67b507b0d10786d04aa0f98bcd22243a /addons/project/project_view.xml | |
| parent | f148061b9455e39d3b3e6f316a5c7d586e1aad88 (diff) | |
| parent | 7baee2822180db919e6754f04c0fa9bc8aaafe92 (diff) | |
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
Diffstat (limited to 'addons/project/project_view.xml')
| -rw-r--r-- | addons/project/project_view.xml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 5015d80e01f..0f507c604f2 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -19,7 +19,7 @@ <field name="name" string="Tasks"/> <field name="categ_ids"/> <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/> - <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/> + <filter string="New" name="draft" domain="[('stage_id.sequence', '<=', 1)]"/> <separator/> <filter string="My Tasks" domain="[('user_id','=',uid)]"/> <separator/> @@ -239,6 +239,7 @@ <field name="date"/> <field name="color"/> <field name="task_count"/> + <field name="task_ids"/> <field name="alias_id"/> <field name="doc_count"/> <templates> @@ -258,9 +259,10 @@ <span class="oe_e oe_e_alias">%%</span><small><field name="alias_id"/></small> </div> <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" style="margin-right: 10px"> - <span t-if="record.task_count.raw_value gt 1"><field name="task_count"/> Tasks</span> - <span t-if="record.task_count.raw_value lt 2"><field name="task_count"/> Task</span> + <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> + <t t-raw="record.task_ids.raw_value.length"/> + <span t-if="record.task_ids.raw_value.length == 1">Task</span> + <span t-if="record.task_ids.raw_value.length > 1">Tasks</span> </a> </div> <div class="oe_kanban_project_list"> @@ -683,10 +685,10 @@ <group> <group> <field name="name"/> - <field name="case_default"/> + <field name="sequence"/> </group> <group> - <field name="sequence"/> + <field name="case_default"/> <field name="fold"/> </group> </group> |