From 6c54232c98d95e454389e0cc555bd5c83a89b698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 18 Oct 2013 15:21:20 +0200
Subject: [PATCH 01/10] [IMP] Stage/State update part 2

- stages: added some fields
-- closed: indicates whether this stage close the working process, for
example task ended, lead lost, applicant hired
-- bar_fold: whether to hide the state in the statusbar; this is different
from fold that is used for kanban views. Viewing a pipe or a specific
record are effectively different things and should use different fields.
-- bar_color: field to customize the stage in the statusbar (still WIP)

- impacted addons: crm, project, project_issue, hr_recruitment
- removed 'closed' addition in project_mrp as this is now in base project
module

bzr revid: tde@openerp.com-20131018132120-h0pv01q2bagtp99x
---
 addons/crm/crm.py                             | 13 ++++++++--
 addons/crm/crm_lead_data.xml                  |  3 +++
 addons/crm/crm_lead_view.xml                  |  4 ---
 addons/crm/crm_view.xml                       | 25 +++++++++++++------
 addons/hr_recruitment/hr_recruitment.py       | 15 ++++++++---
 addons/hr_recruitment/hr_recruitment_data.xml |  3 +++
 addons/hr_recruitment/hr_recruitment_view.xml |  7 +++++-
 addons/project/project.py                     | 24 +++++++++++++-----
 addons/project/project_data.xml               |  3 +++
 addons/project/project_view.xml               | 14 ++++++++---
 addons/project_issue/project_issue.py         |  7 +++++-
 addons/project_issue/project_issue_view.xml   |  7 +++---
 addons/project_mrp/project_mrp.py             | 16 ------------
 13 files changed, 93 insertions(+), 48 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index dc7ebf3ca95..9331fd2ff9e 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -68,8 +68,17 @@ class crm_case_stage(osv.osv):
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
         'case_default': fields.boolean('Default to New Sales Team',
                         help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."),
-        'fold': fields.boolean('Fold by Default',
-                        help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
+        'fold': fields.boolean('Folded in Kanban View',
+                               help='This stage is folded in the kanban view when'
+                               'there are no records in that stage to display.'),
+        'bar_fold': fields.boolean('Folded in Status Bar',
+                                   help='This stage is folded in the form view when'
+                                   'using the statusbar widget.'),
+        'bar_color': fields.integer('Status Bar Color'),
+        'closed': fields.boolean('Closing Stage',
+                                 help='Indicates whether this field is the end of'
+                                 'the maangement process. This is for example a'
+                                 'stage considering the lead as won or lost.'),
         'type': fields.selection([('lead', 'Lead'),
                                     ('opportunity', 'Opportunity'),
                                     ('both', 'Both')],
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 3c299fef704..33f2c4a7e65 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -18,6 +18,7 @@
             <field name="on_change">1</field>
             <field name="sequence">30</field>
             <field name="type">lead</field>
+            <field name="closed" eval="True"/>
         </record>
         <record model="crm.case.stage" id="stage_lead3">
             <field name="name">Qualification</field>
@@ -48,6 +49,7 @@
             <field name="on_change">1</field>
             <field name="sequence">70</field>
             <field name="type">opportunity</field>
+            <field name="closed" eval="True"/>
         </record>
         <record model="crm.case.stage" id="stage_lead7">
             <field name="name">Lost</field>
@@ -57,6 +59,7 @@
             <field name="on_change">1</field>
             <field name="sequence">80</field>
             <field name="type">opportunity</field>
+            <field name="closed" eval="True"/>
         </record>
         
         <record model="crm.case.section" id="section_sales_department">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c0eefcc8d4c..1c958f03ed5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -379,10 +379,6 @@
             <field name="arch" type="xml">
                 <form string="Opportunities" version="7.0">
                     <header>
-                        <button name="case_mark_won" string="Mark Won" type="object" class="oe_highlight"
-                                attrs="{'invisible': [('probability', '=', 100)]}"/>
-                        <button name="case_mark_lost" string="Mark Lost" type="object" class="oe_highlight"
-                                attrs="{'invisible': ['|', ('probability', '=', 0), ('probability', '=', 100)]}"/>
                         <field name="stage_id" widget="statusbar" clickable="True"
                                 domain="['&amp;', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
                     </header>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index d0dcc07fcb0..16debe19eeb 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -93,14 +93,23 @@
             <field name="priority" eval="1"/>
             <field name="arch" type="xml">
                 <form string="Stage" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="probability"/>
-                        <field name="type"/>
-                        <field name="on_change"/>
-                        <field name="sequence"/>
-                        <field name="case_default" groups="base.group_multi_salesteams"/>
-                        <field name="fold"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="sequence"/>
+                            <field name="type"/>
+                            <field name="probability"/>
+                            <field name="closed"/>
+                            <field name="case_default"/>
+                        </group>
+                        <group>
+                            <field name="fold"/>
+                            <field name="bar_fold"/>
+                            <field name="bar_color"/>
+                            <field name="on_change"/>
+                            <field name="case_default" groups="base.group_multi_salesteams"/>
+                        </group>
+
                     </group>
                     <separator string="Requirements"/>
                     <field name="requirements" nolabel="1"/>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 8664a2c1166..0af35850311 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -52,12 +52,21 @@ class hr_recruitment_stage(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
         'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."),
-        'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
         'requirements': fields.text('Requirements'),
+        'fold': fields.boolean('Folded in Kanban View',
+                               help='This stage is folded in the kanban view when'
+                               'there are no records in that stage to display.'),
+        'bar_fold': fields.boolean('Folded in Status Bar',
+                                   help='This stage is folded in the form view when'
+                                   'using the statusbar widget.'),
+        'bar_color': fields.integer('Status Bar Color'),
+        'closed': fields.boolean('Closing Stage',
+                                 help='Indicates whether this field is the end of'
+                                 'the maangement process. This is for example a'
+                                 'stage considering the applicant as hired or refused.'),
     }
     _defaults = {
         'sequence': 1,
-        'fold': False,
     }
 
 class hr_recruitment_degree(osv.osv):
@@ -225,7 +234,7 @@ class hr_applicant(osv.Model):
         'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),
         'color': 0,
-        'date_last_stage_update': fields.datetime.now(),
+        'date_last_stage_update': fields.datetime.now,
     }
 
     _group_by_full = {
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 854dea0548f..6279d88cba4 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -71,12 +71,15 @@
     <record model="hr.recruitment.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
         <field name="sequence">5</field>
+        <field name="closed" eval="True"/>
     </record>
     <record model="hr.recruitment.stage" id="stage_job6">
         <field name="name">Refused</field>
         <field name="sequence">6</field>
         <field name="fold" eval="True"/>
+        <field name="closed" eval="True"/>
     </record>
+
     <record id="survey_job_0" model="survey">
         <field name="title">Job Survey</field>
         <field name="max_response_limit">20</field>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3bf09d21a17..66ff4b98887 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -342,6 +342,8 @@
                 <field name="sequence" invisible="1"/>
                 <field name="name"/>
                 <field name="department_id"/>
+                <field name="fold"/>
+                <field name="bar_fold"/>
             </tree>
         </field>
     </record>
@@ -357,10 +359,13 @@
                     <group>
                         <field name="name"/>
                         <field name="department_id"/>
+                        <field name="sequence"/>
+                        <field name="closed"/>
                     </group>
                     <group>
-                        <field name="sequence"/>
                         <field name="fold"/>
+                        <field name="bar_fold"/>
+                        <field name="bar_color"/>
                     </group>
                 </group>
                 <separator string="Requirements"/>
diff --git a/addons/project/project.py b/addons/project/project.py
index d153a849dc7..8a5774ebb58 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -41,14 +41,21 @@ class project_task_type(osv.osv):
         'case_default': fields.boolean('Default for New Projects',
                         help="If you check this field, this stage will be proposed by default on each new project. It will not assign this stage to existing projects."),
         'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
-        'fold': fields.boolean('Folded by Default',
-                        help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
+        'fold': fields.boolean('Folded in Kanban View',
+                               help='This stage is folded in the kanban view when'
+                               'there are no records in that stage to display.'),
+        'bar_fold': fields.boolean('Folded in Status Bar',
+                                   help='This stage is folded in the form view when'
+                                   'using the statusbar widget.'),
+        'bar_color': fields.integer('Status Bar Color'),
+        'closed': fields.boolean('Closing Stage',
+                                 help='Indicates whether this field is the end of'
+                                 'the maangement process. This is for example a'
+                                 'stage considering the record as done or canceled.'),
     }
 
     _defaults = {
         'sequence': 1,
-        'fold': False,
-        'case_default': False,
         'project_ids': lambda self, cr, uid, ctx=None: self.pool['project.task']._get_default_project_id(cr, uid, context=ctx),
     }
     _order = 'sequence'
@@ -189,6 +196,8 @@ class project(osv.osv):
         return res
 
     def _task_count(self, cr, uid, ids, field_name, arg, context=None):
+        """ :deprecated: this method will be removed with OpenERP v8. Use task_ids
+                         fields instead. """
         if context is None:
             context = {}
         res = dict.fromkeys(ids, 0)
@@ -263,7 +272,10 @@ class project(osv.osv):
             }),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'task_count': fields.function(_task_count, type='integer', string="Open Tasks"),
+        'task_count': fields.function(_task_count, type='integer', string="Open Tasks",
+                                      deprecated="This field will be removed in OpenERP v8. Use task_ids one2many field instead."),
+        'task_ids': fields.one2many('project.task', 'project_id',
+                                    domain=[('stage_id.closed', '=', False)]),
         'color': fields.integer('Color Index'),
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
                                     help="Internal email associated with this project. Incoming emails are automatically synchronized"
@@ -804,7 +816,7 @@ class task(osv.osv):
     _defaults = {
         'stage_id': _get_default_stage_id,
         'project_id': _get_default_project_id,
-        'date_last_stage_update': lambda *a: fields.datetime.now(),
+        'date_last_stage_update': fields.datetime.now,
         'kanban_state': 'normal',
         'priority': '2',
         'progress': 0,
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 0f48dfe9a2b..78cccb6008c 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -63,12 +63,15 @@
             <field name="name">Done</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
+            <field name="closed" eval="True"/>
         </record>
         <record id="project_tt_cancel" model="project.task.type">
             <field name="sequence">30</field>
             <field name="name">Cancelled</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
+            <field name="bar_fold" eval="True"/>
+            <field name="closed" eval="True"/>
         </record>
 
         <!-- Task-related subtypes for messaging / Chatter -->
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4d025d15cb4..4db5c3c9445 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -240,6 +240,7 @@
                     <field name="date"/>
                     <field name="color"/>
                     <field name="task_count"/>
+                    <field name="task_ids"/>
                     <field name="alias_id"/>
                     <field name="doc_count"/>
                     <templates>
@@ -259,9 +260,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">
@@ -684,11 +686,14 @@
                     <group>
                         <group>
                             <field name="name"/>
+                            <field name="sequence"/>
+                            <field name="closed"/>
                             <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="sequence"/>
                             <field name="fold"/>
+                            <field name="bar_fold"/>
+                            <field name="bar_color"/>
                         </group>
                     </group>
                     <field name="description" placeholder="Add a description..."/>
@@ -704,6 +709,7 @@
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="fold"/>
+                    <field name="bar_fold"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 351b55fdcfc..1cbecbac93c 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -570,6 +570,8 @@ class project(osv.Model):
         return [('project.task', "Tasks"), ("project.issue", "Issues")]
 
     def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
+        """ :deprecated: this method will be removed with OpenERP v8. Use issue_ids
+                         fields instead. """
         res = dict.fromkeys(ids, 0)
         issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
         for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context):
@@ -581,7 +583,10 @@ class project(osv.Model):
         'project_escalation_id': fields.many2one('project.project', 'Project Escalation',
             help='If any issue is escalated from the current Project, it will be listed under the project selected here.',
             states={'close': [('readonly', True)], 'cancelled': [('readonly', True)]}),
-        'issue_count': fields.function(_issue_count, type='integer', string="Unclosed Issues"),
+        'issue_count': fields.function(_issue_count, type='integer', string="Unclosed Issues",
+                                       deprecated="This field will be removed in OpenERP v8. Use issue_ids one2many field instead."),
+        'issue_ids': fields.one2many('project.issue', 'project_id',
+                                     domain=[('stage_id.closed', '=', False)])
     }
 
     def _check_escalation(self, cr, uid, ids, context=None):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 3e90a2a43d6..02db9114bdb 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -325,13 +325,14 @@
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
                     <field name="use_issues"/>
-                    <field name="issue_count" invisible="1"/>
+                    <field name="issue_ids" invisible="1"/>
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_issues.raw_value" style="margin-right: 10px"
                         name="%(act_project_project_2_project_issue_all)d" type="action">
-                        <span t-if="record.issue_count.raw_value gt 1"><field name="issue_count"/> Issues</span>
-                        <span t-if="record.issue_count.raw_value lt 2"><field name="issue_count"/> Issue</span>
+                        <t t-raw="record.issue_ids.raw_value.length"/>
+                        <span t-if="record.issue_ids.raw_value.length == 1">Issue</span>
+                        <span t-if="record.issue_ids.raw_value.length > 1">Issues</span>
                     </a>
                 </xpath>
             </field>
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index d7880ba90cd..fbbba711b4c 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -23,22 +23,6 @@ from openerp.osv import fields, osv
 from openerp import netsvc
 
 
-class ProjectTaskStageMrp(osv.Model):
-    """ Override project.task.type model to add a 'closed' boolean field allowing
-        to know that tasks in this stage are considered as closed. Indeed since
-        OpenERP 8.0 status is not present on tasks anymore, only stage_id. """
-    _name = 'project.task.type'
-    _inherit = 'project.task.type'
-
-    _columns = {
-        'closed': fields.boolean('Close', help="Tasks in this stage are considered as closed."),
-    }
-
-    _defaults = {
-        'closed': False,
-    }
-
-
 class project_task(osv.osv):
     _name = "project.task"
     _inherit = "project.task"

From 2cb3b0f382e25c77358ae705872ff92c99f0c6b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 18 Oct 2013 16:44:48 +0200
Subject: [PATCH 02/10] [FIX] sale_crm: fixed view inheritance

TODO: re-add the button in invisible

bzr revid: tde@openerp.com-20131018144448-hpbds5oobcqpr1uv
---
 addons/crm/crm_lead.py            | 8 ++++++--
 addons/sale_crm/sale_crm_view.xml | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 046d4419809..e2af3739fe0 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -387,7 +387,9 @@ class crm_lead(format_address, osv.osv):
         return False
 
     def case_mark_lost(self, cr, uid, ids, context=None):
-        """ Mark the case as lost: state=cancel and probability=0 """
+        """ Mark the case as lost: state=cancel and probability=0
+            :deprecated: this method will be removed in OpenERP v8.
+        """
         for lead in self.browse(cr, uid, ids):
             stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 0.0), ('on_change', '=', True), ('sequence', '>', 1)], context=context)
             if stage_id:
@@ -399,7 +401,9 @@ class crm_lead(format_address, osv.osv):
                         'Create a specific stage or edit an existing one by editing columns of your opportunity pipe.'))
 
     def case_mark_won(self, cr, uid, ids, context=None):
-        """ Mark the case as won: state=done and probability=100 """
+        """ Mark the case as won: state=done and probability=100
+            :deprecated: this method will be removed in OpenERP v8.
+        """
         for lead in self.browse(cr, uid, ids):
             stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 100.0), ('on_change', '=', True), ('sequence', '>', 1)], context=context)
             if stage_id:
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 34f32e0b58b..8c008339903 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/header/button[@name='case_mark_lost']" position="after">
+                    <xpath expr="//field[@name='stage_id']" position="before">
                         <button attrs="{'invisible': [('probability', '&lt;', 100)]}" string="Create Quotation" name="%(action_crm_make_sale)d" type="action"/>
                         <button attrs="{'invisible': [('probability', '=', 100)]}" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
                     </xpath>

From 878ceca988b58d32a4df0663d51157c2c775d16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 21 Oct 2013 12:49:12 +0200
Subject: [PATCH 03/10] [REV] stages: removed bar_fold and bar_color fields.

After some experiments, having colors does not seem to give an
usable result on statusbar widget. Indeed we need to have the
current stage highlited, and maybe something to tell that some
stages have a special meaning and/or are the end of the pipe.
The closed field already gives that meaning.

Moreover the issue with the statusbar widget is that it indicates
state and action. Having both dimensions with colors / icons
is quite difficult to understand. We therefore stand on a simpler
version of the widget, only with stages and the current stage
highlighted.

bzr revid: tde@openerp.com-20131021104912-8ybhw0svdoghheh3
---
 addons/crm/crm.py                             | 4 ----
 addons/crm/crm_view.xml                       | 5 +----
 addons/hr_recruitment/hr_recruitment.py       | 4 ----
 addons/hr_recruitment/hr_recruitment_view.xml | 5 +----
 addons/project/project.py                     | 4 ----
 addons/project/project_data.xml               | 1 -
 addons/project/project_view.xml               | 5 +----
 7 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 9331fd2ff9e..7c2c2694c39 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -71,10 +71,6 @@ class crm_case_stage(osv.osv):
         'fold': fields.boolean('Folded in Kanban View',
                                help='This stage is folded in the kanban view when'
                                'there are no records in that stage to display.'),
-        'bar_fold': fields.boolean('Folded in Status Bar',
-                                   help='This stage is folded in the form view when'
-                                   'using the statusbar widget.'),
-        'bar_color': fields.integer('Status Bar Color'),
         'closed': fields.boolean('Closing Stage',
                                  help='Indicates whether this field is the end of'
                                  'the maangement process. This is for example a'
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 16debe19eeb..87059b2d4be 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -99,13 +99,10 @@
                             <field name="sequence"/>
                             <field name="type"/>
                             <field name="probability"/>
-                            <field name="closed"/>
-                            <field name="case_default"/>
                         </group>
                         <group>
                             <field name="fold"/>
-                            <field name="bar_fold"/>
-                            <field name="bar_color"/>
+                            <field name="closed"/>
                             <field name="on_change"/>
                             <field name="case_default" groups="base.group_multi_salesteams"/>
                         </group>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 0af35850311..2e22a765934 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -56,10 +56,6 @@ class hr_recruitment_stage(osv.osv):
         'fold': fields.boolean('Folded in Kanban View',
                                help='This stage is folded in the kanban view when'
                                'there are no records in that stage to display.'),
-        'bar_fold': fields.boolean('Folded in Status Bar',
-                                   help='This stage is folded in the form view when'
-                                   'using the statusbar widget.'),
-        'bar_color': fields.integer('Status Bar Color'),
         'closed': fields.boolean('Closing Stage',
                                  help='Indicates whether this field is the end of'
                                  'the maangement process. This is for example a'
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 66ff4b98887..912419a1874 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -343,7 +343,6 @@
                 <field name="name"/>
                 <field name="department_id"/>
                 <field name="fold"/>
-                <field name="bar_fold"/>
             </tree>
         </field>
     </record>
@@ -360,12 +359,10 @@
                         <field name="name"/>
                         <field name="department_id"/>
                         <field name="sequence"/>
-                        <field name="closed"/>
                     </group>
                     <group>
                         <field name="fold"/>
-                        <field name="bar_fold"/>
-                        <field name="bar_color"/>
+                        <field name="closed"/>
                     </group>
                 </group>
                 <separator string="Requirements"/>
diff --git a/addons/project/project.py b/addons/project/project.py
index 8a5774ebb58..79f9c712b04 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -44,10 +44,6 @@ class project_task_type(osv.osv):
         'fold': fields.boolean('Folded in Kanban View',
                                help='This stage is folded in the kanban view when'
                                'there are no records in that stage to display.'),
-        'bar_fold': fields.boolean('Folded in Status Bar',
-                                   help='This stage is folded in the form view when'
-                                   'using the statusbar widget.'),
-        'bar_color': fields.integer('Status Bar Color'),
         'closed': fields.boolean('Closing Stage',
                                  help='Indicates whether this field is the end of'
                                  'the maangement process. This is for example a'
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 78cccb6008c..1f49451a377 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -70,7 +70,6 @@
             <field name="name">Cancelled</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
-            <field name="bar_fold" eval="True"/>
             <field name="closed" eval="True"/>
         </record>
 
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4db5c3c9445..eef2701105b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -687,13 +687,11 @@
                         <group>
                             <field name="name"/>
                             <field name="sequence"/>
-                            <field name="closed"/>
                             <field name="case_default"/>
                         </group>
                         <group>
                             <field name="fold"/>
-                            <field name="bar_fold"/>
-                            <field name="bar_color"/>
+                            <field name="closed"/>
                         </group>
                     </group>
                     <field name="description" placeholder="Add a description..."/>
@@ -709,7 +707,6 @@
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="fold"/>
-                    <field name="bar_fold"/>
                 </tree>
             </field>
         </record>

From 48d424511a1bb2086c3ff8952667b3ac7a776aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 21 Oct 2013 13:34:33 +0200
Subject: [PATCH 04/10] [REV] crm_lead_view: mark won/lost buttons are back,
 but invisible, to be able to be removed without breaking inheriting views

bzr revid: tde@openerp.com-20131021113433-hzdwid0h429xywac
---
 addons/crm/crm_lead_view.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 1c958f03ed5..f4fc29da539 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -379,6 +379,12 @@
             <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"/>
                         <field name="stage_id" widget="statusbar" clickable="True"
                                 domain="['&amp;', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
                     </header>

From 1322839430acd535e02b2f327ecef1de9e1ee36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 21 Oct 2013 13:34:52 +0200
Subject: [PATCH 05/10] [IMP] crm: boards: improved domains according to the
 new closed attribute on stages

bzr revid: tde@openerp.com-20131021113452-qs0ri511hcxhetmw
---
 addons/crm/board_crm_view.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 6bbd450ca38..d69465cb3a2 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -20,10 +20,7 @@
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_stage_graph"/>
             <!-- avoid done / cancelled -->
-            <field name="domain">['|',
-                                    '!', '&amp;', ('probability', '=', 100), ('stage_id.on_change', '=', 1),
-                                    '!', '&amp;', ('probability', '=', 0), ('stage_id.sequence', '!=', 1),
-                                ('type', '=', 'opportunity')]</field>
+            <field name="domain">['&amp;', ('stage_id.closed', '=', False), ('type', '=', 'opportunity')]</field>
             <field name="context">{'search_default_Stage':1}</field>
         </record>
 
@@ -48,7 +45,7 @@
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
             <!-- avoid cancelled -->
-            <field name="domain">['!', '&amp;', ('probability', '=', 0), ('stage_id.sequence', '!=', 1)]</field>
+            <field name="domain">['|', ('stage_id.closed', '=', False), ('stage_id.probability', '=', 100)]</field>
             <field name="context">{'search_default_user': 1, 'search_default_Stage': 1}</field>
         </record>
 

From 8ce54029cf8f774b851ae234c6b0e330b45fee92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 23 Oct 2013 12:04:29 +0200
Subject: [PATCH 06/10] [REV] crm: reverted most changes about stages for this
 branch.

We keep fold, because it has a meaning in kanban view, and is kind of
'drop' stage, for won / lost / cancel / dead.

New stage is now the stage with the lower sequence, not necessarily the
stage with sequence 1. Note that this could break the _track because it
checks for stages with sequence <= 1; however with OpenERP values it
works fine. In some specific stage configuration, some subtypes could
not be tracked precisely.

bzr revid: tde@openerp.com-20131023100429-a3vfxi5zkn18v6qq
---
 addons/crm/board_crm_view.xml |  4 ++--
 addons/crm/crm.py             |  4 ----
 addons/crm/crm_lead.py        | 21 +++++++++++----------
 addons/crm/crm_lead_data.xml  |  4 +---
 addons/crm/crm_lead_view.xml  |  8 +++-----
 addons/crm/crm_view.xml       |  1 -
 6 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index d69465cb3a2..8bbbece18cb 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -20,7 +20,7 @@
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_stage_graph"/>
             <!-- avoid done / cancelled -->
-            <field name="domain">['&amp;', ('stage_id.closed', '=', False), ('type', '=', 'opportunity')]</field>
+            <field name="domain">['&amp;', ('stage_id.fold', '=', False), ('type', '=', 'opportunity')]</field>
             <field name="context">{'search_default_Stage':1}</field>
         </record>
 
@@ -45,7 +45,7 @@
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
             <!-- avoid cancelled -->
-            <field name="domain">['|', ('stage_id.closed', '=', False), ('stage_id.probability', '=', 100)]</field>
+            <field name="domain">['|', ('stage_id.fold', '=', False), ('stage_id.probability', '=', 100)]</field>
             <field name="context">{'search_default_user': 1, 'search_default_Stage': 1}</field>
         </record>
 
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 7c2c2694c39..433b4c8f758 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -71,10 +71,6 @@ class crm_case_stage(osv.osv):
         'fold': fields.boolean('Folded in Kanban View',
                                help='This stage is folded in the kanban view when'
                                'there are no records in that stage to display.'),
-        'closed': fields.boolean('Closing Stage',
-                                 help='Indicates whether this field is the end of'
-                                 'the maangement process. This is for example a'
-                                 'stage considering the lead as won or lost.'),
         'type': fields.selection([('lead', 'Lead'),
                                     ('opportunity', 'Opportunity'),
                                     ('both', 'Both')],
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index e2af3739fe0..cbe1005f3e4 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -71,10 +71,11 @@ class crm_lead(format_address, osv.osv):
 
     _track = {
         'stage_id': {
-            'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj.probability == 0 and obj.stage_id and obj.stage_id.sequence == 1,
-            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: (obj.stage_id and obj.stage_id.sequence != 1) and obj.probability < 100,
+            # this is only an heuristics; depending on your particular stage configuration it may not match all 'new' stages
+            'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj.probability == 0 and obj.stage_id and obj.stage_id.sequence <= 1,
+            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: (obj.stage_id and obj.stage_id.sequence > 1) and obj.probability < 100,
             'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj.probability == 100 and obj.stage_id and obj.stage_id.on_change,
-            'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj.probability == 0 and obj.stage_id and obj.stage_id.sequence != 1,
+            'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj.probability == 0 and obj.stage_id and obj.stage_id.sequence > 1,
         },
     }
 
@@ -92,7 +93,7 @@ class crm_lead(format_address, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         section_id = self._get_default_section_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], section_id, [('sequence', '=', '1')], context=context)
+        return self.stage_find(cr, uid, [], section_id, [('fold', '=', False)], context=context)
 
     def _resolve_section_id_from_context(self, cr, uid, context=None):
         """ Returns ID of section based on the value of 'section_id'
@@ -381,7 +382,7 @@ class crm_lead(format_address, osv.osv):
         # AND with the domain in parameter
         search_domain += list(domain)
         # perform search, return the first found
-        stage_ids = self.pool.get('crm.case.stage').search(cr, uid, search_domain, order=order, context=context)
+        stage_ids = self.pool.get('crm.case.stage').search(cr, uid, search_domain, order=order, limit=1, context=context)
         if stage_ids:
             return stage_ids[0]
         return False
@@ -391,7 +392,7 @@ class crm_lead(format_address, osv.osv):
             :deprecated: this method will be removed in OpenERP v8.
         """
         for lead in self.browse(cr, uid, ids):
-            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 0.0), ('on_change', '=', True), ('sequence', '>', 1)], context=context)
+            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 0.0), ('fold', '=', True), ('sequence', '>', 1)], context=context)
             if stage_id:
                 return self.write(cr, uid, [lead.id], {'stage_id': stage_id}, context=context)
             else:
@@ -405,7 +406,7 @@ class crm_lead(format_address, osv.osv):
             :deprecated: this method will be removed in OpenERP v8.
         """
         for lead in self.browse(cr, uid, ids):
-            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 100.0), ('on_change', '=', True), ('sequence', '>', 1)], context=context)
+            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 100.0), ('fold', '=', True), ('sequence', '>', 1)], context=context)
             if stage_id:
                 return self.write(cr, uid, [lead.id], {'stage_id': stage_id}, context=context)
             else:
@@ -620,7 +621,7 @@ class crm_lead(format_address, osv.osv):
         # An Opportunity always has higher confidence level than a lead, unless its stage probability is 0.0
         for opportunity in opportunities:
             sequence = -1
-            if opportunity.stage_id and (opportunity.stage_id.probability != 0 or opportunity.stage_id.sequence == 1):
+            if opportunity.stage_id and not opportunity.stage_id.fold:
                 sequence = opportunity.stage_id.sequence
             sequenced_opps.append(((int(sequence != -1 and opportunity.type == 'opportunity'), sequence, -opportunity.id), opportunity))
 
@@ -681,7 +682,7 @@ class crm_lead(format_address, osv.osv):
             'phone': customer and customer.phone or lead.phone,
         }
         if not lead.stage_id or lead.stage_id.type=='lead':
-            val['stage_id'] = self.stage_find(cr, uid, [lead], section_id, [('sequence', '=', '1'), ('type', 'in', ('opportunity','both'))], context=context)
+            val['stage_id'] = self.stage_find(cr, uid, [lead], section_id, [('type', 'in', ('opportunity', 'both'))], context=context)
         return val
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
@@ -691,7 +692,7 @@ class crm_lead(format_address, osv.osv):
             customer = partner.browse(cr, uid, partner_id, context=context)
         for lead in self.browse(cr, uid, ids, context=context):
             # TDE: was if lead.state in ('done', 'cancel'):
-            if (lead.probability == '100') or (lead.probability == '0' and lead.stage_id.sequence != '1'):
+            if lead.probability == 100 or (lead.probability == 0 and lead.stage_id.fold):
                 continue
             vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
             self.write(cr, uid, [lead.id], vals, context=context)
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 33f2c4a7e65..1cd3d51be90 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -18,7 +18,6 @@
             <field name="on_change">1</field>
             <field name="sequence">30</field>
             <field name="type">lead</field>
-            <field name="closed" eval="True"/>
         </record>
         <record model="crm.case.stage" id="stage_lead3">
             <field name="name">Qualification</field>
@@ -45,11 +44,11 @@
         <record model="crm.case.stage" id="stage_lead6">
             <field name="name">Won</field>
             <field name="case_default">1</field>
+            <field name="fold">1</field>
             <field name="probability">100</field>
             <field name="on_change">1</field>
             <field name="sequence">70</field>
             <field name="type">opportunity</field>
-            <field name="closed" eval="True"/>
         </record>
         <record model="crm.case.stage" id="stage_lead7">
             <field name="name">Lost</field>
@@ -59,7 +58,6 @@
             <field name="on_change">1</field>
             <field name="sequence">80</field>
             <field name="type">opportunity</field>
-            <field name="closed" eval="True"/>
         </record>
         
         <record model="crm.case.section" id="section_sales_department">
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f4fc29da539..5a3a0aa34fe 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -341,7 +341,7 @@
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                             help="Leads that are assigned to any sales teams I am member of"/>
                     <filter string="Dead" name="dead"
-                            domain="[('probability', '=', '0'), ('stage_id.sequence', '!=', 1)]"/>
+                            domain="[('probability', '=', '0'), ('stage_id.fold', '=', True)]"/>
                     <separator />
                     <filter string="Available for mass mailing"
                             name='not_opt_out' domain="[('opt_out', '=', False)]"
@@ -552,12 +552,10 @@
                     <field name="stage_id" domain="[]"/>
                     <field name="probability"/>
                     <separator/>
-                    <filter string="New" name="new"
-                            domain="[('probability', '=', 0), ('stage_id.sequence', '=', 1)]"/>
                     <filter string="Won" name="won"
-                            domain="[('probability', '=', 100), ('stage_id.on_change', '=', 1)]"/>
+                            domain="[('probability', '=', 100), ('stage_id.fold', '=', True)]"/>
                     <filter string="Lost" name="lost"
-                            domain="[('probability', '=', 0), ('stage_id.sequence', '!=', 1)]"/>
+                            domain="[('probability', '=', 0), ('stage_id.fold', '=', True)]"/>
                     <filter string="Unassigned" name="unassigned"
                             domain="[('user_id','=', False)]" help="No salesperson"/>
                     <filter string="My Opportunities" name="assigned_to_me"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 87059b2d4be..8cc4b03cb41 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -102,7 +102,6 @@
                         </group>
                         <group>
                             <field name="fold"/>
-                            <field name="closed"/>
                             <field name="on_change"/>
                             <field name="case_default" groups="base.group_multi_salesteams"/>
                         </group>

From d56d97ec62fc0c69e4b3eb7875c282fc4b22067d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 23 Oct 2013 13:37:16 +0200
Subject: [PATCH 07/10] [REV] project: like before for CRM (see previous
 commit) reverted most changes about stages.

Override in project_mrp is back therefore.

bzr revid: tde@openerp.com-20131023113716-jw8jh1jvn4dgpcyr
---
 addons/project/project.py                | 15 ++++++---------
 addons/project/project_view.xml          |  5 ++---
 addons/project/report/project_report.py  |  6 +++---
 addons/project/report/project_report.xml |  1 -
 addons/project_issue/project_issue.py    |  2 +-
 addons/project_mrp/project_mrp.py        | 16 ++++++++++++++++
 6 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 79f9c712b04..9173318366e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -44,10 +44,6 @@ class project_task_type(osv.osv):
         'fold': fields.boolean('Folded in Kanban View',
                                help='This stage is folded in the kanban view when'
                                'there are no records in that stage to display.'),
-        'closed': fields.boolean('Closing Stage',
-                                 help='Indicates whether this field is the end of'
-                                 'the maangement process. This is for example a'
-                                 'stage considering the record as done or canceled.'),
     }
 
     _defaults = {
@@ -271,7 +267,7 @@ class project(osv.osv):
         'task_count': fields.function(_task_count, type='integer', string="Open Tasks",
                                       deprecated="This field will be removed in OpenERP v8. Use task_ids one2many field instead."),
         'task_ids': fields.one2many('project.task', 'project_id',
-                                    domain=[('stage_id.closed', '=', False)]),
+                                    domain=[('stage_id.fold', '=', False)]),
         'color': fields.integer('Color Index'),
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
                                     help="Internal email associated with this project. Incoming emails are automatically synchronized"
@@ -563,8 +559,9 @@ class task(osv.osv):
     _mail_post_access = 'read'
     _track = {
         'stage_id': {
-            'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
-            'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id.sequence != 1,
+            # this is only an heuristics; depending on your particular stage configuration it may not match all 'new' stages
+            'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence <= 1,
+            'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id.sequence > 1,
         },
         'user_id': {
             'project.mt_task_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id and obj.user_id.id,
@@ -589,7 +586,7 @@ class task(osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         project_id = self._get_default_project_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], project_id, [('sequence', '=', '1')], context=context)
+        return self.stage_find(cr, uid, [], project_id, [('fold', '=', False)], context=context)
 
     def _resolve_project_id_from_context(self, cr, uid, context=None):
         """ Returns ID of project based on the value of 'default_project_id'
@@ -1001,7 +998,7 @@ class task(osv.osv):
 
     def set_remaining_time(self, cr, uid, ids, remaining_time=1.0, context=None):
         for task in self.browse(cr, uid, ids, context=context):
-            if (task.stage_id and task.stage_id.sequence == 1) or (task.planned_hours == 0.0):
+            if (task.stage_id and task.stage_id.sequence <= 1) or (task.planned_hours == 0.0):
                 self.write(cr, uid, [task.id], {'planned_hours': remaining_time}, context=context)
         self.write(cr, uid, ids, {'remaining_hours': remaining_time}, context=context)
         return True
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index eef2701105b..d5e6a216149 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', '&lt;=', 1)]"/>
                     <separator/>
                     <filter string="My Tasks" domain="[('user_id','=',uid)]"/>
                     <separator/>
@@ -687,11 +687,10 @@
                         <group>
                             <field name="name"/>
                             <field name="sequence"/>
-                            <field name="case_default"/>
                         </group>
                         <group>
+                            <field name="case_default"/>
                             <field name="fold"/>
-                            <field name="closed"/>
                         </group>
                     </group>
                     <field name="description" placeholder="Add a description..."/>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 15b26507ff3..62dea81ac56 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -75,7 +75,7 @@ class report_project_task_user(osv.osv):
                     date_trunc('day',t.date_last_stage_update) as date_last_stage_update,
                     to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline,
 --                    sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
-                    abs((extract('epoch' from (t.date_end-t.date_start)))/(3600*24))  as no_of_days,
+                    abs((extract('epoch' from (t.write_date-t.date_start)))/(3600*24))  as no_of_days,
                     t.user_id,
                     progress as progress,
                     t.project_id,
@@ -89,9 +89,9 @@ class report_project_task_user(osv.osv):
                     total_hours as total_hours,
                     t.delay_hours as hours_delay,
                     planned_hours as hours_planned,
-                    (extract('epoch' from (t.date_end-t.create_date)))/(3600*24)  as closing_days,
+                    (extract('epoch' from (t.write_date-t.create_date)))/(3600*24)  as closing_days,
                     (extract('epoch' from (t.date_start-t.create_date)))/(3600*24)  as opening_days,
-                    abs((extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24))  as delay_endings_days
+                    abs((extract('epoch' from (t.date_deadline-t.write_date)))/(3600*24))  as delay_endings_days
               FROM project_task t
                 WHERE t.active = 'true'
                 GROUP BY
diff --git a/addons/project/report/project_report.xml b/addons/project/report/project_report.xml
index 59d0fd28220..4ff7e852620 100644
--- a/addons/project/report/project_report.xml
+++ b/addons/project/report/project_report.xml
@@ -17,7 +17,6 @@
         <tasks>
             <task type="zoom" name="tasks">
                 <task_name type="field" name="name"/>
-                <task_status type="field" name="state" />
                 <task_descritpion type="field" name="description"/>
                 <task_sequence type="field" name="sequence"/>
                 <task_priority type="field" name="priority"/>
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 1cbecbac93c..25bd35ccdb7 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -586,7 +586,7 @@ class project(osv.Model):
         'issue_count': fields.function(_issue_count, type='integer', string="Unclosed Issues",
                                        deprecated="This field will be removed in OpenERP v8. Use issue_ids one2many field instead."),
         'issue_ids': fields.one2many('project.issue', 'project_id',
-                                     domain=[('stage_id.closed', '=', False)])
+                                     domain=[('stage_id.fold', '=', False)])
     }
 
     def _check_escalation(self, cr, uid, ids, context=None):
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index fbbba711b4c..d7880ba90cd 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -23,6 +23,22 @@ from openerp.osv import fields, osv
 from openerp import netsvc
 
 
+class ProjectTaskStageMrp(osv.Model):
+    """ Override project.task.type model to add a 'closed' boolean field allowing
+        to know that tasks in this stage are considered as closed. Indeed since
+        OpenERP 8.0 status is not present on tasks anymore, only stage_id. """
+    _name = 'project.task.type'
+    _inherit = 'project.task.type'
+
+    _columns = {
+        'closed': fields.boolean('Close', help="Tasks in this stage are considered as closed."),
+    }
+
+    _defaults = {
+        'closed': False,
+    }
+
+
 class project_task(osv.osv):
     _name = "project.task"
     _inherit = "project.task"

From 374f3c9c22ff73306df7ab0f37f1de18b36ba35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 23 Oct 2013 13:55:05 +0200
Subject: [PATCH 08/10] [REV] hr_recruitment: continuing reverting most
 changes, reparing analysis views.

bzr revid: tde@openerp.com-20131023115505-k4eqt1jo5w0ruo4o
---
 addons/hr_recruitment/hr_recruitment.py             | 13 +++++--------
 addons/hr_recruitment/hr_recruitment_data.xml       |  3 +--
 addons/hr_recruitment/hr_recruitment_view.xml       |  3 +--
 .../hr_recruitment/report/hr_recruitment_report.py  |  3 ++-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 2e22a765934..780c4390a09 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -56,10 +56,6 @@ class hr_recruitment_stage(osv.osv):
         'fold': fields.boolean('Folded in Kanban View',
                                help='This stage is folded in the kanban view when'
                                'there are no records in that stage to display.'),
-        'closed': fields.boolean('Closing Stage',
-                                 help='Indicates whether this field is the end of'
-                                 'the maangement process. This is for example a'
-                                 'stage considering the applicant as hired or refused.'),
     }
     _defaults = {
         'sequence': 1,
@@ -87,8 +83,9 @@ class hr_applicant(osv.Model):
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _track = {
         'stage_id': {
-            'hr_recruitment.mt_applicant_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
-            'hr_recruitment.mt_applicant_stage_changed': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence != 1,
+            # this is only an heuristics; depending on your particular stage configuration it may not match all 'new' stages
+            'hr_recruitment.mt_applicant_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence <= 1,
+            'hr_recruitment.mt_applicant_stage_changed': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence > 1,
         },
     }
 
@@ -99,7 +96,7 @@ class hr_applicant(osv.Model):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         department_id = self._get_default_department_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], department_id, [('sequence', '=', '1')], context=context)
+        return self.stage_find(cr, uid, [], department_id, [('fold', '=', False)], context=context)
 
     def _resolve_department_id_from_context(self, cr, uid, context=None):
         """ Returns ID of department based on the value of 'default_department_id'
@@ -246,7 +243,7 @@ class hr_applicant(osv.Model):
 
     def onchange_department_id(self, cr, uid, ids, department_id=False, stage_id=False, context=None):
         if not stage_id:
-            stage_id = self.stage_find(cr, uid, [], department_id, [('sequence', '=', '1')], context=context)
+            stage_id = self.stage_find(cr, uid, [], department_id, [('fold', '=', False)], context=context)
         return {'value': {'stage_id': stage_id}}
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 6279d88cba4..219f36405b5 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -71,13 +71,12 @@
     <record model="hr.recruitment.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
         <field name="sequence">5</field>
-        <field name="closed" eval="True"/>
+        <field name="fold" eval="True"/>
     </record>
     <record model="hr.recruitment.stage" id="stage_job6">
         <field name="name">Refused</field>
         <field name="sequence">6</field>
         <field name="fold" eval="True"/>
-        <field name="closed" eval="True"/>
     </record>
 
     <record id="survey_job_0" model="survey">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 912419a1874..7553a24ff3c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -358,11 +358,10 @@
                     <group>
                         <field name="name"/>
                         <field name="department_id"/>
-                        <field name="sequence"/>
                     </group>
                     <group>
+                        <field name="sequence"/>
                         <field name="fold"/>
-                        <field name="closed"/>
                     </group>
                 </group>
                 <separator string="Requirements"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 0292875a2c7..908b701d928 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -90,7 +90,7 @@ class hr_recruitment_report(osv.Model):
                      (sum(salary_proposed)/count(*)) as salary_prop_avg,
                      sum(salary_expected) as salary_exp,
                      (sum(salary_expected)/count(*)) as salary_exp_avg,
-                     extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as delay_close,
+                     extract('epoch' from (s.write_date-s.create_date))/(3600*24) as delay_close,
                      count(*) as nbr
                  from hr_applicant s
                  group by
@@ -101,6 +101,7 @@ class hr_recruitment_report(osv.Model):
                      date_trunc('day',s.date_closed),
                      s.date_open,
                      s.create_date,
+                     s.write_date,
                      s.date_closed,
                      s.date_last_stage_update,
                      s.partner_id,

From 3a8b57ddc5f49a9de4f7d489cd211587078ae194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 23 Oct 2013 13:55:25 +0200
Subject: [PATCH 09/10] [FIX] project: seems weird to be able to work on
 write_date without using it

bzr revid: tde@openerp.com-20131023115525-1wu68w3fcljj37cs
---
 addons/project/report/project_report.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 62dea81ac56..ed086b4318d 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -106,6 +106,7 @@ class report_project_task_user(osv.osv):
                     month,
                     day,
                     create_date,
+                    write_date,
                     date_start,
                     date_end,
                     date_deadline,

From 61c97c56de593a017959bd8c8970ef5a58643b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 4 Nov 2013 12:57:35 +0100
Subject: [PATCH 10/10] [FIX] crm_lead: cleaned and uniformized won/lost stage
 conditions.

bzr revid: tde@openerp.com-20131104115735-4bsv2l2n1c6q8jte
---
 addons/crm/crm_lead.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index cbe1005f3e4..5f52980c8b0 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -74,8 +74,8 @@ class crm_lead(format_address, osv.osv):
             # this is only an heuristics; depending on your particular stage configuration it may not match all 'new' stages
             'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj.probability == 0 and obj.stage_id and obj.stage_id.sequence <= 1,
             'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: (obj.stage_id and obj.stage_id.sequence > 1) and obj.probability < 100,
-            'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj.probability == 100 and obj.stage_id and obj.stage_id.on_change,
-            'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj.probability == 0 and obj.stage_id and obj.stage_id.sequence > 1,
+            'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj.probability == 100 and obj.stage_id and obj.stage_id.fold,
+            'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj.probability == 0 and obj.stage_id and obj.stage_id.fold and obj.stage_id.sequence > 1,
         },
     }
 
@@ -406,7 +406,7 @@ class crm_lead(format_address, osv.osv):
             :deprecated: this method will be removed in OpenERP v8.
         """
         for lead in self.browse(cr, uid, ids):
-            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 100.0), ('fold', '=', True), ('sequence', '>', 1)], context=context)
+            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 100.0), ('fold', '=', True)], context=context)
             if stage_id:
                 return self.write(cr, uid, [lead.id], {'stage_id': stage_id}, context=context)
             else: