From a8beece158d27148245c9ee1070dac6b6a624288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 27 Nov 2013 10:53:00 +0100
Subject: [PATCH] [IMP] [REV] crm, addons: still stage/state tweaking - crm:
 Mark Won / Lost buttons are back - crm: now using the new 'fold_field' option
 to fold some stages on the fold field of stages. Back to saas-1 bebavhior. -
 project, project_issue: task and issue also use the fold_field option. -
 project: fixed 'X Tasks' display on the project vignette: now always
 displaying 'X Tasks at plural form to simplify the view.

bzr revid: tde@openerp.com-20131127095300-9onzlt5pl9u82zt6
---
 addons/crm/crm_lead_view.xml                | 12 +++++-------
 addons/project/project_view.xml             |  7 +++----
 addons/project_issue/project_issue_view.xml |  3 ++-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f3e424e3e37..8d9cba60284 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -99,6 +99,7 @@
                             help="Convert to Opportunity" class="oe_highlight"/>
                     <field name="stage_id" widget="statusbar" clickable="True"
                             domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"
+                            options="{'fold_field': 'fold'}"
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
@@ -379,14 +380,11 @@
             <field name="arch" type="xml">
                 <form string="Opportunities" version="7.0">
                     <header>
-                        <!-- :deprecated: this button will be removed from the view with OpenERP v8 -->
-                        <button name="case_mark_won" string="Mark Won" type="object" class="oe_highlight"
-                                invisible="True"/>
-                        <!-- :deprecated: this button will be removed from the view with OpenERP v8 -->
-                        <button name="case_mark_lost" string="Mark Lost" type="object" class="oe_highlight"
-                                invisible="True"/>
+                        <button name="case_mark_won" string="Mark Won" type="object" class="oe_highlight"/>
+                        <button name="case_mark_lost" string="Mark Lost" type="object" class="oe_highlight"/>
                         <field name="stage_id" widget="statusbar" clickable="True"
-                                domain="['&amp;', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
+                            options="{'fold_field': 'fold'}"
+                            domain="['&amp;', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0f507c604f2..38e8fc9fdef 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -260,9 +260,7 @@
                                     </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">
-                                            <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>
+                                            <t t-raw="record.task_ids.raw_value.length"/> Tasks
                                         </a>
                                     </div>
                                     <div class="oe_kanban_project_list">
@@ -370,7 +368,8 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                     <header>
-                        <field name="stage_id" widget="statusbar" clickable="True"/>
+                        <field name="stage_id" widget="statusbar" clickable="True"
+                            options="{'fold_field': 'fold'}"/>
                     </header>
                     <sheet string="Task">
                     <h1>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2e99b75046c..68c6712f530 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -48,7 +48,8 @@
             <field name="arch" type="xml">
                 <form string="Issue" version="7.0">
                 <header>
-                    <field name="stage_id" widget="statusbar" clickable="True"/>
+                    <field name="stage_id" widget="statusbar" clickable="True"
+                        options="{'fold_field': 'fold'}"/>
                 </header>
                 <sheet string="Issue">
                     <label for="name" class="oe_edit_only"/>