Merge lp:~openerp-dev/openobject-addons/trunk-stage-vs-status-aja into lp:openobject-addons

[ajay javiya (OpenERP)]

Hello,
Remove the state field from hr_applicant , crm lead/opportunity and project issue/task.
Thank You.

[lp:~openerp-dev/openobject-addons/trunk-stage-vs-status-aja]

8649. By ajay javiya (OpenERP) on 2013-04-04

[REM]: Related status from task type

8650. By ajay javiya (OpenERP) on 2013-04-04

Merge with trunk

8651. By ajay javiya (OpenERP) on 2013-04-04

[REM]: Related state from crm

8652. By ajay javiya (OpenERP) on 2013-04-04

[IMP]:code in project

8653. By ajay javiya (OpenERP) on 2013-04-05

[ADD]:Project task start and end date on stage change

8654. By ajay javiya (OpenERP) on 2013-04-10

[ADD]: Stage in search view

8655. By ajay javiya (OpenERP) on 2013-04-10

[MERGE]: with trunk

8656. By ajay javiya (OpenERP) on 2013-04-16

[IMP]:Exception message and code, remove traceback

8657. By ajay javiya (OpenERP) on 2013-04-16

[MERGE]: With trunk

8658. By ajay javiya (OpenERP) on 2013-04-16

[IMP]:Test cases

8659. By ajay javiya (OpenERP) on 2013-04-18

[REM]:Unwanted changes

8660. By ajay javiya (OpenERP) on 2013-04-19

[IMP]: Exception message , stage is only visible when button click to related stage in crm and calculate work progress based on remaining hours

8661. By Turkesh Patel (openERP) on 2013-05-03

[MRG] merge with lp:openobject-addons

8662. By ajay javiya (OpenERP) on 2013-05-22

[MRG]: with latest trunk

8663. By ajay javiya (OpenERP) on 2013-06-03

[MERG]:With main trunk

8664. By ajay javiya (OpenERP) on 2013-06-04

[FIX]: fix issue of stage

8665. By ajay javiya (OpenERP) on 2013-06-04

[MERG]: with trunk

8666. By ajay javiya (OpenERP) on 2013-06-04

[IMP]:Go to the team configuration should go to the team kanban view.

8667. By ajay javiya (OpenERP) on 2013-06-05

[MERGE]: with trunk

Unmerged revisions

8667. By ajay javiya (OpenERP) on 2013-06-05

[MERGE]: with trunk

8666. By ajay javiya (OpenERP) on 2013-06-04

[IMP]:Go to the team configuration should go to the team kanban view.

8665. By ajay javiya (OpenERP) on 2013-06-04

[MERG]: with trunk

8664. By ajay javiya (OpenERP) on 2013-06-04

[FIX]: fix issue of stage

8663. By ajay javiya (OpenERP) on 2013-06-03

[MERG]:With main trunk

8662. By ajay javiya (OpenERP) on 2013-05-22

[MRG]: with latest trunk

8661. By Turkesh Patel (openERP) on 2013-05-03

[MRG] merge with lp:openobject-addons

8660. By ajay javiya (OpenERP) on 2013-04-19

[IMP]: Exception message , stage is only visible when button click to related stage in crm and calculate work progress based on remaining hours

8659. By ajay javiya (OpenERP) on 2013-04-18

[REM]:Unwanted changes

8658. By ajay javiya (OpenERP) on 2013-04-16

[IMP]:Test cases

=== modified file 'base_status/base_stage.py'
--- base_status/base_stage.py	2012-12-21 13:48:10 +0000
+++ base_status/base_stage.py	2013-06-05 13:32:29 +0000
@@ -108,7 +108,7 @@
 
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
-        return self.stage_find(cr, uid, [], None, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], None, [], context=context)# get default stage with lower priority
 
     def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
         """ Find stage, with a given (optional) domain on the search,

=== modified file 'crm/board_crm_view.xml'
--- crm/board_crm_view.xml	2012-11-30 17:11:30 +0000
+++ crm/board_crm_view.xml	2013-06-05 13:32:29 +0000
@@ -19,7 +19,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_stage_graph"/>
-            <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
+            <field name="domain">[('stage_sequence', 'not in', (6,7,8)), ('type', '=', 'opportunity')]</field>
             <field name="context">{'search_default_Stage':1}</field>
         </record>
 
@@ -43,7 +43,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
-            <field name="domain">[('state','!=','cancel'),('opening_date','&gt;',context_today().strftime("%Y-%m-%d"))]</field>
+            <field name="domain">[('stage_sequence','not in',[7,8]),('opening_date','&gt;',context_today().strftime("%Y-%m-%d"))]</field>
             <field name="context">{'search_default_Stage':1}</field>
         </record>
 

=== modified file 'crm/crm.py'
--- crm/crm.py	2013-05-31 15:31:00 +0000
+++ crm/crm.py	2013-06-05 13:32:29 +0000
@@ -74,9 +74,6 @@
         'requirements': fields.text('Requirements'),
         'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', string='Sections',
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
-        'state': fields.selection(AVAILABLE_STATES, 'Related Status', required=True,
-            help="The status of your document will automatically change regarding the selected stage. " \
-                "For example, if a stage is related to the status 'Close', when your document reaches this stage, it is automatically closed."),
         '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',
@@ -91,7 +88,6 @@
     _defaults = {
         'sequence': lambda *args: 1,
         'probability': lambda *args: 0.0,
-        'state': 'open',
         'fold': False,
         'type': 'both',
         'case_default': True,

=== modified file 'crm/crm_action_rule_demo.xml'
--- crm/crm_action_rule_demo.xml	2013-03-04 09:49:51 +0000
+++ crm/crm_action_rule_demo.xml	2013-06-05 13:32:29 +0000
@@ -5,7 +5,7 @@
         <record id="filter_draft_lead" model="ir.filters">
             <field name="name">Draft Leads</field>
             <field name="model_id">crm.lead</field>
-            <field name="domain">[('state','=','draft')]</field>
+            <field name="domain">[('stage_sequence','=',1)]</field>
             <field name="user_id" eval="False"/>
         </record>
         <record id="action_email_reminder_lead" model="ir.actions.server">

=== modified file 'crm/crm_case_section_view.xml'
--- crm/crm_case_section_view.xml	2013-06-04 11:51:59 +0000
+++ crm/crm_case_section_view.xml	2013-06-05 13:32:29 +0000
@@ -299,4 +299,4 @@
             parent="base.menu_sales"
             groups="base.group_multi_salesteams"/>
   </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2013-05-22 14:50:42 +0000
+++ crm/crm_lead.py	2013-06-05 13:32:29 +0000
@@ -62,11 +62,6 @@
     'email_from',
     'email_cc',
     'partner_name']
-CRM_LEAD_PENDING_STATES = (
-    crm.AVAILABLE_STATES[2][0], # Cancelled
-    crm.AVAILABLE_STATES[3][0], # Done
-    crm.AVAILABLE_STATES[4][0], # Pending
-)
 
 class crm_lead(base_stage, format_address, osv.osv):
     """ CRM Lead Case """
@@ -76,13 +71,8 @@
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     _track = {
-        'state': {
-            'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'new',
-            'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
-            'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
-        },
         'stage_id': {
-            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'cancel', 'done'],
+            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj['stage_id'] != False,
         },
     }
 
@@ -112,7 +102,7 @@
     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, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], section_id, [], context=context)
 
     def _resolve_section_id_from_context(self, cr, uid, context=None):
         """ Returns ID of section based on the value of 'section_id'
@@ -274,8 +264,7 @@
         'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange',
-                        domain="['&', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"),
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange'),
         'user_id': fields.many2one('res.users', 'Salesperson', select=True, track_visibility='onchange'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
@@ -283,10 +272,7 @@
                                 multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
-        'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
-                help='The Status is set to \'Draft\', when a case is created. If the case is in progress the Status is set to \'Open\'. When the case is over, the Status is set to \'Done\'. If the case needs to be reviewed then the Status is  set to \'Pending\'.'),
-
+        'stage_sequence': fields.related('stage_id','sequence',type='integer', string='Stage Sequence'),
         # Only used for type opportunity
         'probability': fields.float('Success Rate (%)',group_operator="avg"),
         'planned_revenue': fields.float('Expected Revenue', track_visibility='always'),
@@ -374,22 +360,6 @@
                 section_id = section_ids[0]
         return {'value': {'section_id': section_id}}
 
-    def _check(self, cr, uid, ids=False, context=None):
-        """ Override of the base.stage method.
-            Function called by the scheduler to process cases for date actions
-            Only works on not done and cancelled cases
-        """
-        cr.execute('select * from crm_case \
-                where (date_action_last<%s or date_action_last is null) \
-                and (date_action_next<=%s or date_action_next is null) \
-                and state not in (\'cancel\',\'done\')',
-                (time.strftime("%Y-%m-%d %H:%M:%S"),
-                    time.strftime('%Y-%m-%d %H:%M:%S')))
-
-        ids2 = map(lambda x: x[0], cr.fetchall() or [])
-        cases = self.browse(cr, uid, ids2, context=context)
-        return self._action(cr, uid, cases, False, context=context)
-
     def stage_find(self, cr, uid, cases, section_id, domain=None, order='sequence', context=None):
         """ Override of the base.stage method
             Parameter of the stage search taken from the lead:
@@ -431,32 +401,24 @@
             return stage_ids[0]
         return False
 
-    def case_cancel(self, cr, uid, ids, context=None):
-        """ Overrides case_cancel from base_stage to set probability """
-        res = super(crm_lead, self).case_cancel(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'probability' : 0.0}, context=context)
-        return res
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """ Overrides case_reset from base_stage to set probability """
-        res = super(crm_lead, self).case_reset(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'probability': 0.0}, context=context)
-        return res
-
     def case_mark_lost(self, cr, uid, ids, context=None):
         """ Mark the case as lost: state=cancel and probability=0 """
         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)], context=context)
             if stage_id:
                 self.case_set(cr, uid, [lead.id], values_to_update={'probability': 0.0}, new_stage_id=stage_id, context=context)
+            else:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("To relieve your sales pipe and group all Lost opportunities, configure one of your sales stage as follow .\nProbability = 0 percentage (chance to Lost the opportunity) And change probability automatically \n You can create a specific column or edit an existing one from the menu %(menu:crm.menu_crm_case_section_act)s") ,context=context)
         return True
 
     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: probability=100 """
         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)], context=context)
             if stage_id:
                 self.case_set(cr, uid, [lead.id], values_to_update={'probability': 100.0}, new_stage_id=stage_id, context=context)
+            else:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("To relieve your sales pipe and group all won opportunities, configure one of your sales stage as follow .\nProbability = 100 percentage (chance to won the opportunity) And change probability automatically \n You can create a specific column or edit an existing one from the menu %(menu:crm.menu_crm_case_section_act)s") ,context=context)
         return True
 
     def set_priority(self, cr, uid, ids, priority):
@@ -648,7 +610,7 @@
         sequenced_opps = []
         for opportunity in opportunities:
             sequence = -1
-            if opportunity.stage_id and opportunity.stage_id.state != 'cancel':
+            if opportunity.stage_id and opportunity.stage_id.sequence not in (7,8):
                 sequence = opportunity.stage_id.sequence
             sequenced_opps.append(((int(sequence != -1 and opportunity.type == 'opportunity'), sequence, -opportunity.id), opportunity))
 
@@ -703,7 +665,7 @@
             '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, [('state', '=', 'draft'),('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):
@@ -712,7 +674,7 @@
             partner = self.pool.get('res.partner')
             customer = partner.browse(cr, uid, partner_id, context=context)
         for lead in self.browse(cr, uid, ids, context=context):
-            if lead.state in ('done', 'cancel'):
+            if lead.stage_sequence in (6,7,8):
                 continue
             vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
             self.write(cr, uid, [lead.id], vals, context=context)
@@ -931,11 +893,14 @@
         return res
 
     def write(self, cr, uid, ids, vals, context=None):
+        stage_pool=self.pool.get('crm.case.stage')
         if vals.get('stage_id') and not vals.get('probability'):
             # change probability of lead(s) if required by stage
-            stage = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
+            stage = stage_pool.browse(cr, uid, vals['stage_id'], context=context)
             if stage.on_change:
                 vals['probability'] = stage.probability
+        if vals.get('probability') == 100:
+            vals['stage_id'] = stage_pool.search(cr, uid, [('probability','=',100.0)],order='sequence')[0]
         return super(crm_lead, self).write(cr, uid, ids, vals, context=context)
 
     def new_mail_send(self, cr, uid, ids, context=None):

=== modified file 'crm/crm_lead_data.xml'
--- crm/crm_lead_data.xml	2013-04-05 11:10:48 +0000
+++ crm/crm_lead_data.xml	2013-06-05 13:32:29 +0000
@@ -6,75 +6,67 @@
         <record model="crm.case.stage" id="stage_lead1">
             <field name="name">New</field>
             <field eval="1" name="case_default"/>
-            <field name="state">draft</field>
+            <field eval="'1'" name="sequence"/>
             <field eval="0" name="probability"/>
-            <field eval="10" name="sequence"/>
             <field name="type">both</field>
         </record>
         <record model="crm.case.stage" id="stage_lead2">
             <field name="name">Opportunity</field>
             <field eval="1" name="case_default"/>
-            <field name="state">open</field>
             <field eval="20" name="probability"/>
-            <field eval="20" name="sequence"/>
-            <field name="type">lead</field>
-        </record>
-        <record model="crm.case.stage" id="stage_lead7">
-            <field name="name">Dead</field>
-            <field eval="1" name="case_default"/>
-            <field eval="False" name="fold"/>
-            <field name="state">cancel</field>
-            <field eval="0" name="probability"/>
-            <field eval="30" name="sequence"/>
+            <field eval="2" name="sequence"/>
             <field name="type">lead</field>
         </record>
         <record model="crm.case.stage" id="stage_lead3">
             <field name="name">Qualification</field>
             <field eval="1" name="case_default"/>
-            <field name="state">open</field>
             <field eval="20" name="probability"/>
-            <field eval="100" name="sequence"/>
+            <field eval="3" name="sequence"/>
             <field name="type">opportunity</field>
         </record>
         <record model="crm.case.stage" id="stage_lead4">
             <field name="name">Proposition</field>
             <field eval="1" name="case_default"/>
-            <field name="state">open</field>
             <field eval="40" name="probability"/>
-            <field eval="110" name="sequence"/>
+            <field eval="4" name="sequence"/>
             <field name="type">opportunity</field>
         </record>
         <record model="crm.case.stage" id="stage_lead5">
             <field name="name">Negotiation</field>
             <field eval="1" name="case_default"/>
-            <field name="state">open</field>
             <field eval="60" name="probability"/>
-            <field eval="120" name="sequence"/>
+            <field eval="5" name="sequence"/>
             <field name="type">opportunity</field>
         </record>
         <record model="crm.case.stage" id="stage_lead6">
             <field name="name">Won</field>
             <field eval="True" name="fold"/>
             <field eval="1" name="case_default"/>
-            <field name="state">done</field>
             <field eval="100" name="probability"/>
-            <field eval="130" name="sequence"/>
+            <field eval="6" name="sequence"/>
             <field eval="1" name="on_change"/>
             <field name="type">opportunity</field>
         </record>
+        <record model="crm.case.stage" id="stage_lead7">
+            <field name="name">Dead</field>
+            <field eval="1" name="case_default"/>
+            <field eval="False" name="fold"/>
+            <field eval="'0'" name="probability"/>
+            <field eval="'7'" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
         <record model="crm.case.stage" id="stage_lead8">
             <field name="name">Lost</field>
             <field eval="1" name="case_default"/>
             <field eval="True" name="fold"/>
             <field eval="1" name="on_change"/>
-            <field name="state">cancel</field>
             <field eval="0" name="probability"/>
-            <field eval="140" name="sequence"/>
+            <field eval="8" name="sequence"/>
             <field name="type">opportunity</field>
         </record>
         
         <record model="crm.case.section" id="section_sales_department">
-            <field name="stage_ids" eval="[ (4, ref('stage_lead1')), (4, ref('stage_lead2')),
+            <field name="stage_ids" eval="[ (4, ref('stage_lead1')),
                                             (4, ref('stage_lead3')), (4, ref('stage_lead4')),
                                             (4, ref('stage_lead5')), (4, ref('stage_lead6')),
                                             (4, ref('stage_lead7')), (4, ref('stage_lead8'))]"/>

=== modified file 'crm/crm_lead_demo.xml'
--- crm/crm_lead_demo.xml	2013-04-19 10:36:00 +0000
+++ crm/crm_lead_demo.xml	2013-06-05 13:32:29 +0000
@@ -50,25 +50,6 @@
             <field eval="1" name="active"/>
         </record>
 
-        <record id="crm_case_3" model="crm.lead">
-            <field name="type">lead</field>
-            <field name="name">Need Info about Web Design</field>
-            <field name="contact_name">John Miller</field>
-            <field name="partner_name">The Kompany</field>
-            <field name="email_from">[e-mail]</field>
-            <field name="partner_id" ref=""/>
-            <field name="country_id" ref="base.us"/>
-            <field name="city">New-York</field>
-            <field name="type_id" ref="type_lead5"/>
-            <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
-            <field name="channel_id" ref=""/>
-            <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_1"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="stage_lead2"/>
-            <field eval="1" name="active"/>
-        </record>
-
         <record id="crm_case_4" model="crm.lead">
             <field name="type">lead</field>
             <field name="name">Need a New Website</field>
@@ -244,32 +225,6 @@
             <field eval="1" name="active"/>
         </record>
 
-        <record id="crm_case_12" model="crm.lead">
-            <field name="type">lead</field>
-            <field name="name">Need Quotation for 100 PC and 100 Keyboards</field>
-            <field name="contact_name">Bojing Hú</field>
-            <field name="partner_name">Incom Corporation</field>
-            <field name="email_from">[e-mail]</field>
-            <field name="partner_id" ref="base.res_partner_1"/>
-            <field name="country_id" ref="base.cn"/>
-            <field name="city">Shenzhen</field>
-            <field name="type_id" ref="type_lead3"/>
-            <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
-            <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">2</field>
-            <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="stage_lead2"/>
-            <field eval="1" name="active"/>
-        </record>
-
-        <!-- Call Function to Cancel the leads (set as Dead) -->
-        <function model="crm.lead" name="case_cancel"
-            eval="[ ref('crm_case_12'), ref('crm_case_7'),
-                    ref('crm_case_3'), ref('crm_case_8')],
-                  {'install_mode': True}"
-        />
-
         <!-- Call Function to set the leads as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"
             eval="[ ref('crm_case_1'), ref('crm_case_2'),

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2013-06-04 10:56:48 +0000
+++ crm/crm_lead_view.xml	2013-06-05 13:32:29 +0000
@@ -13,7 +13,6 @@
             <field name="arch" type="xml">
                 <search string="Stage Search">
                     <field name="name" string="Stage Name"/>
-                    <field name="state"/>
                     <field name="type"/>
                 </search>
             </field>
@@ -93,15 +92,9 @@
         <field name="arch" type="xml">
             <form string="Leads Form" version="7.0">
                 <header>
-                    <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
-                            states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
-                    <button name="case_reset" string="Reset" type="object"
-                            states="cancel"/>
-                    <button name="case_cancel" string="Cancel Case" type="object"
-                            states="draft,open,pending"/>
+                    <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action" attrs="{'invisible':[('stage_sequence','in',[6,7,8])]}" 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')]"
-                            on_change="onchange_stage_id(stage_id)"/>
+                            domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
                 </header>
                 <sheet>
                     <div class="oe_right oe_button_box" name="buttons">
@@ -157,9 +150,7 @@
                             <label for="section_id" groups="base.group_multi_salesteams"/>
                             <div groups="base.group_multi_salesteams">
                                 <field name="section_id"/>
-                                <button name="case_escalate" string="Escalate"
-                                        type="object" class="oe_link"
-                                        attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
+                                <button name="case_escalate" string="Escalate" type="object" attrs="{'invisible': ['|', ('section_id','=',False), ('stage_sequence', 'in', [6,7,8])]}" class="oe_link"/>
                             </div>
                             <field name="type" invisible="1"/>
                         </group>
@@ -182,7 +173,7 @@
                                 <field name="company_id"
                                     groups="base.group_multi_company"
                                     widget="selection" colspan="2"/>
-                                <field name="state" groups="base.group_no_one"/>
+                                <field name="stage_sequence" invisible="1"/>
                             </group>
                             <group string="Mailings">
                                 <field name="opt_out"/>
@@ -220,7 +211,7 @@
             <field name="name">Leads</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Leads" fonts="bold:message_unread==True" colors="grey:state in ('cancel', 'done')">
+                <tree string="Leads" fonts="bold:message_unread==True">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date"/>
                     <field name="name"/>
@@ -232,7 +223,6 @@
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="section_id" invisible="context.get('invisible_section', True)" groups="base.group_multi_salesteams"/>
-                    <field name="state" invisible="1"/>
                     <field name="type_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
@@ -262,7 +252,7 @@
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id">
-                    <field name="state" groups="base.group_no_one"/>
+                    <field name="stage_sequence" invisible="1"/>
                     <field name="stage_id"/>
                     <field name="color"/>
                     <field name="priority"/>
@@ -335,8 +325,6 @@
                     <field name="create_date"/>
                     <field name="country_id" context="{'invisible_country': False}"/>
                     <separator/>
-                    <filter string="Open" name="open" domain="[('state','!=','cancel')]" help="Open Leads"/>
-                    <filter string="Dead" name="dead" domain="[('state','=','cancel')]"/>
                     <filter string="Unassigned" name="unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
                     <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
                     <filter string="Assigned to Me"
@@ -383,10 +371,10 @@
                 <form string="Opportunities" version="7.0">
                     <header>
                         <button name="case_mark_won" string="Mark Won" type="object"
-                                states="draft,open,pending" class="oe_highlight"/>
+                                attrs="{'invisible':[('stage_sequence','in',[6,7,8])]}" class="oe_highlight"/>
                         <button name="case_mark_lost" string="Mark Lost" type="object"
-                                states="draft,open" class="oe_highlight"/>
-                        <field name="stage_id" widget="statusbar" clickable="True"/>
+                                attrs="{'invisible':[('stage_sequence','in',[6,7,8])]}" class="oe_highlight"/>
+                        <field name="stage_id" widget="statusbar" clickable="True" domain="['&amp;', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
@@ -434,7 +422,7 @@
                                 <label for="section_id" groups="base.group_multi_salesteams"/>
                                 <div groups="base.group_multi_salesteams">
                                     <field name="section_id" widget="selection"/>
-                                    <button name="case_escalate" string="Escalate" type="object" class="oe_link" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
+                                    <button name="case_escalate" string="Escalate" type="object" class="oe_link" attrs="{'invisible': ['|', ('section_id','=',False), ('stage_sequence', 'in', [6,7,8])]}"/>
                                 </div>
                             </group>
                             <group>
@@ -485,8 +473,8 @@
                                     <field name="day_open" groups="base.group_no_one"/>
                                     <field name="day_close" groups="base.group_no_one"/>
                                     <field name="referred"/>
-                                    <field name="state" invisible="1"/>
                                     <field name="type" invisible="1"/>
+                                    <field name="stage_sequence" invisible="1" />
                                 </group>
                                 <group string="References">
                                     <field name="ref"/>
@@ -515,7 +503,7 @@
             <field name="name">Opportunities Tree</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Opportunities" fonts="bold:message_unread==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+                <tree string="Opportunities" fonts="bold:message_unread==True" colors="red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date"/>
                     <field name="name" string="Opportunity"/>
@@ -533,7 +521,6 @@
                     <field name="referred" invisible="1"/>
                     <field name="priority" invisible="1"/>
                     <field name="message_unread" invisible="1"/>
-                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -549,12 +536,10 @@
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
                     <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
                     <field name="user_id"/>
+
                     <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+                    <field name="stage_id"/>
                     <separator/>
-                    <filter string="New" name="new" domain="[('state','=','draft')]" help="New Opportunities"/>
-                    <filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/>
-                    <filter string="Won" name="won" domain="[('state','=','done')]"/>
-                    <filter string="Lost" name="lost" domain="[('state','=','cancel')]"/>
                     <filter string="Unassigned" name="unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
                     <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
                     <filter string="My Opportunities" name="assigned_to_me"

=== modified file 'crm/crm_view.xml'
--- crm/crm_view.xml	2013-05-22 09:40:33 +0000
+++ crm/crm_view.xml	2013-06-05 13:32:29 +0000
@@ -80,7 +80,6 @@
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="probability"/>
-                    <field name="state"/>
                     <field name="type"/>
                 </tree>
             </field>
@@ -96,7 +95,6 @@
                 <form string="Stage" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="state"/>
                         <field name="probability"/>
                         <field name="type"/>
                         <field name="on_change"/>

=== modified file 'crm/report/crm_lead_report.py'
--- crm/report/crm_lead_report.py	2013-04-15 10:23:49 +0000
+++ crm/report/crm_lead_report.py	2013-06-05 13:32:29 +0000
@@ -23,14 +23,6 @@
 from openerp import tools
 from .. import crm
 
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
-
 MONTHS = [
     ('01', 'January'),
     ('02', 'February'),
@@ -79,12 +71,12 @@
         'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
         'channel_id':fields.many2one('crm.case.channel', 'Channel', readonly=True),
         'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
         'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('section_ids', '=', section_id)]"),
+        'stage_sequence': fields.related('stage_id','sequence',type='integer', string='Stage Sequence'),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
@@ -120,8 +112,6 @@
 
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
-
-                    c.state,
                     c.user_id,
                     c.probability,
                     c.stage_id,

=== modified file 'crm/report/crm_lead_report_view.xml'
--- crm/report/crm_lead_report_view.xml	2013-05-21 14:27:53 +0000
+++ crm/report/crm_lead_report_view.xml	2013-06-05 13:32:29 +0000
@@ -13,8 +13,8 @@
                 <field name="creation_month" invisible="1"/>
                 <field name="creation_day" invisible="1"/>
                 <field name="deadline_month" invisible="1"/>
-                <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
+                <field name="stage_sequence" invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <field name="channel_id" invisible="1"/>
                 <field name="type" invisible="1"/>
@@ -69,10 +69,6 @@
                     <filter icon="terp-personal" name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/>
                     <filter icon="terp-personal+" string="Opportunity" name="opportunity" domain="[('type','=','opportunity')]" help="Show only opportunity"/>
                     <separator/>
-                    <filter icon="terp-check" string="New" domain="[('state','=','draft')]" help="Leads/Opportunities which are in New state"/>
-                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Leads/Opportunities which are in open state"/>
-                    <filter icon="gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Leads/Opportunities which are in pending state"/>
-                    <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]" help="Leads/Opportunities which are in done state"/>
                     <separator/>
                     <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
                             help="Leads/Opportunities that are assigned to one of the sale teams I manage" groups="base.group_multi_salesteams"/>
@@ -131,7 +127,7 @@
             <field name="name">crm.lead.report.tree</field>
             <field name="model">crm.lead.report</field>
             <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('open','pending','done');gray:state == 'cancel' " create="false" string="Opportunities Analysis">
+            <tree create="false" string="Opportunities Analysis">
                 <field name="creation_year" invisible="1"/>
                 <field name="creation_month" invisible="1"/>
                 <field name="creation_day" invisible="1"/>
@@ -141,8 +137,8 @@
                 <field name="user_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
-                <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
+                <field name="stage_sequence" invisible="1"/>
                 <field name="priority"  invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <field name="channel_id" invisible="1"/>

=== modified file 'crm/res_partner.py'
--- crm/res_partner.py	2013-04-15 10:23:49 +0000
+++ crm/res_partner.py	2013-06-05 13:32:29 +0000
@@ -41,7 +41,7 @@
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
-            'Leads and Opportunities', domain=[('state','in', ('draft','open','pending'))]),
+        'Leads and Opportunities', domain=[('stage_sequence','not in', (6,7,8))]),
         'meeting_ids': fields.many2many('crm.meeting', 'crm_meeting_partner_rel','partner_id', 'meeting_id',
             'Meetings'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
@@ -87,7 +87,6 @@
                 'probability' : probability,
                 'partner_id' : partner_id,
                 'categ_ids' : categ_ids and categ_ids[0:1] or [],
-                'state' :'draft',
                 'type': 'opportunity'
             }, context=context)
             opportunity_ids[partner_id] = opportunity_id

=== modified file 'crm/test/crm_lead_cancel.yml'
--- crm/test/crm_lead_cancel.yml	2013-04-19 15:25:55 +0000
+++ crm/test/crm_lead_cancel.yml	2013-06-05 13:32:29 +0000
@@ -4,38 +4,14 @@
   !python {model: crm.lead}: |
     section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("crm.crm_case_section_2")})
     self.write(cr, uid, [ref("crm_case_1")], {'section_id': section_id})
-    self.case_cancel(cr, uid, [ref("crm_case_1")])
 -
   I check cancelled lead.
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_1'))
+    lead = self.browse(cr, uid, ref('crm_case_8'))
     assert lead.stage_id.id == ref('crm.stage_lead7'), "Stage should be 'Dead' and is %s." % (lead.stage_id.name)
-    assert lead.state == 'cancel', "Opportunity is not in 'cancel' state."
     assert lead.probability == 0.0, 'Opportunity is probably wrong and should be 0.0.'
 -
-  I reset cancelled lead into unqualified lead.
--
-  !python {model: crm.lead}: |
-    self.case_reset(cr, uid, [ref("crm_case_1")])
--
-  I check unqualified lead after reset.
--
-  !assert {model: crm.lead, id: crm.crm_case_1, string: Lead is in draft state}:
-    - state == "draft"
--
-  I re-open the lead
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref("crm_case_1")])
--
- I check stage and state of the re-opened lead
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm.crm_case_1'))
-    assert lead.stage_id.id == ref('crm.stage_lead2'), "Opportunity stage should be 'Qualification'."
-    assert lead.state == 'open', "Opportunity should be in 'open' state."
--
   I escalate the lead to parent team.
 -
   !python {model: crm.lead}: |

=== modified file 'crm/test/crm_lead_onchange.yml'
--- crm/test/crm_lead_onchange.yml	2013-03-21 11:26:47 +0000
+++ crm/test/crm_lead_onchange.yml	2013-06-05 13:32:29 +0000
@@ -6,14 +6,14 @@
     partner_id: base.res_partner_2
     type: opportunity
     stage_id: crm.stage_lead1
-    state: draft
+    stage_sequence : 1
 -
   I create a lead record to call a mailing opt-out onchange method.
 -
   !record {model: crm.lead, id: crm_case_18}:
     name: 'Need 20 Days of Consultancy'
     type: opportunity
-    state: draft
+    stage_sequence : 1
     opt_out: True
 -
   I create a phonecall record to call a partner onchange method.

=== modified file 'crm/test/lead2opportunity2win.yml'
--- crm/test/lead2opportunity2win.yml	2013-03-21 11:26:47 +0000
+++ crm/test/lead2opportunity2win.yml	2013-06-05 13:32:29 +0000
@@ -1,15 +1,10 @@
 -
   In order to test the conversion of a lead into a opportunity,
 -
-  I open a lead.
+  I set lead to open stage.
 -
    !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_case_4")])
--
-  I check if the lead state is "Open".
--
-  !assert {model: crm.lead, id: crm.crm_case_4, string: Lead state is Open}:
-     - state == "open"
+    self.write(cr, uid, [ref("crm_case_4")], {'stage_sequence' : 2})
 -
   I convert lead into opportunity for exiting customer.
 -
@@ -59,7 +54,6 @@
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_4'))
     assert lead.stage_id.id == ref('crm.stage_lead6'), "Opportunity stage should be 'Won'."
-    assert lead.state == 'done', "Opportunity is not in 'done' state!"
     assert lead.probability == 100.0, "Revenue probability should be 100.0!"
 -
   I convert mass lead into opportunity customer.
@@ -95,9 +89,8 @@
   I check details of the opportunity after the loose
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_2'))
+    lead = self.browse(cr, uid, ref('crm_case_21'))
     assert lead.stage_id.id == ref('crm.stage_lead8'), "Opportunity stage should be 'Lost'."
-    assert lead.state == 'cancel', "Lost opportunity is not in 'cancel' state!"
     assert lead.probability == 0.0, "Revenue probability should be 0.0!"
 -
   I confirm review needs meeting.

=== modified file 'crm/wizard/crm_lead_to_opportunity.py'
--- crm/wizard/crm_lead_to_opportunity.py	2013-02-08 10:47:13 +0000
+++ crm/wizard/crm_lead_to_opportunity.py	2013-06-05 13:32:29 +0000
@@ -58,11 +58,11 @@
 
             if partner_id:
                 # Search for opportunities that have the same partner and that arent done or cancelled
-                ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('state', '!=', 'done')])
+                ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('stage_sequence', '!=', 6)])
                 for id in ids:
                     tomerge.add(id)
             if email:
-                ids = lead_obj.search(cr, uid, [('email_from', 'ilike', email[0]), ('state', '!=', 'done')])
+                ids = lead_obj.search(cr, uid, [('email_from', 'ilike', email[0]), ('stage_sequence', '!=', 6)])
                 for id in ids:
                     tomerge.add(id)
 
@@ -85,7 +85,7 @@
             context = {}
         lead_obj = self.pool.get('crm.lead')
         for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-            if lead.state in ['done', 'cancel']:
+            if lead.stage_sequence in [6,7,8]:
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled leads cannot be converted into opportunities."))
         return False
 

=== modified file 'crm/wizard/crm_merge_opportunities.py'
--- crm/wizard/crm_merge_opportunities.py	2012-12-17 14:43:06 +0000
+++ crm/wizard/crm_merge_opportunities.py	2013-06-05 13:32:29 +0000
@@ -61,7 +61,7 @@
         """
         Use active_ids from the context to fetch the leads/opps to merge.
         In order to get merged, these leads/opps can't be in 'Done' or
-        'Cancel' state.
+        'Cancel' Stage.
         """
         if context is None:
             context = {}
@@ -72,7 +72,7 @@
             opp_ids = []
             opps = self.pool.get('crm.lead').browse(cr, uid, record_ids, context=context)
             for opp in opps:
-                if opp.state not in ('done', 'cancel'):
+                if opp.stage_sequence not in (6,7,8):
                     opp_ids.append(opp.id)
             if 'opportunity_ids' in fields:
                 res.update({'opportunity_ids': opp_ids})

=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py	2013-03-21 12:56:26 +0000
+++ crm_claim/crm_claim.py	2013-06-05 13:32:29 +0000
@@ -28,11 +28,6 @@
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-CRM_CLAIM_PENDING_STATES = (
-    crm.AVAILABLE_STATES[2][0], # Cancelled
-    crm.AVAILABLE_STATES[3][0], # Done
-    crm.AVAILABLE_STATES[4][0], # Pending
-)
 
 class crm_claim_stage(osv.osv):
     """ Model for claim stages. This models the main stages of a claim
@@ -107,13 +102,7 @@
         'stage_id': fields.many2one ('crm.claim.stage', 'Stage', track_visibility='onchange',
                 domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
         'cause': fields.text('Root Cause'),
-        'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
-                help='The status is set to \'Draft\', when a case is created.\
-                      If the case is in progress the status is set to \'Open\'.\
-                      When the case is over, the status is set to \'Done\'.\
-                      If the case needs to be reviewed then the status is \
-                      set to \'Pending\'.'),
+        'stage_sequence': fields.related('stage_id','sequence',type='integer', string='Stage Sequence'),
     }
 
     _defaults = {
@@ -158,14 +147,6 @@
             return stage_ids[0]
         return False
 
-    def case_refuse(self, cr, uid, ids, context=None):
-        """ Mark the case as refused: state=done and case_refused=True """
-        for lead in self.browse(cr, uid, ids):
-            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, ['&', ('state', '=', 'done'), ('case_refused', '=', True)], context=context)
-            if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={}, new_stage_id=stage_id, context=context)
-        return True
-
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
         """This function returns value of partner address based on partner
            :param part: Partner's id

=== modified file 'crm_claim/crm_claim_data.xml'
--- crm_claim/crm_claim_data.xml	2012-11-29 22:26:45 +0000
+++ crm_claim/crm_claim_data.xml	2013-06-05 13:32:29 +0000
@@ -44,26 +44,22 @@
         
         <record model="crm.claim.stage" id="stage_claim1">
             <field name="name">New</field>
-            <field name="state">draft</field>
-            <field name="sequence">26</field>
+            <field name="sequence">1</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim5">
             <field name="name">In Progress</field>
-            <field name="state">open</field>
-            <field name="sequence">27</field>
+            <field name="sequence">2</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim2">
             <field name="name">Settled</field>
-            <field name="state">done</field>
-            <field name="sequence">28</field>
+            <field name="sequence">3</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim3">
             <field name="name">Rejected</field>
-            <field name="state">cancel</field>
-            <field name="sequence">29</field>
+            <field name="sequence">4</field>
             <field name="case_default" eval="True"/>
             <field name="case_refused" eval="True"/>
             <field name="fold" eval="True"/>

=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml	2013-04-22 15:34:49 +0000
+++ crm_claim/crm_claim_view.xml	2013-06-05 13:32:29 +0000
@@ -80,7 +80,7 @@
             <field name="name">CRM - Claims Tree</field>
             <field name="model">crm.claim</field>
             <field name="arch" type="xml">
-                <tree string="Claims" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('close', 'cancel');red:date_deadline and (date_deadline &lt; current_date)">
+                <tree string="Claims">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
@@ -91,7 +91,6 @@
                     <field name="categ_id" string="Type"/>
                     <field name="date_deadline" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
-                    <field name="state" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
@@ -102,10 +101,6 @@
             <field name="arch" type="xml">
                 <form string="Claim" version="7.0">
                 <header>
-                    <button name="case_close" string="Settle" type="object" class="oe_highlight"
-                            states="draft,open,pending" groups="base.group_user"/>
-                    <button name="case_cancel" string="Reject" type="object" groups="base.group_user"
-                            states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Claims">
@@ -118,7 +113,6 @@
                         <field name="priority"/>
                         <field name="section_id" groups="base.group_multi_salesteams"/>
                         <field name="date_deadline"/>
-                        <field name="state" groups="base.group_no_one"/>
                     </group>
                     <group colspan="4" col="4">
                         <notebook>
@@ -196,10 +190,6 @@
             <field name="arch" type="xml">
                 <search string="Search Claims">
                     <field name="name" string="Claims"/>
-                    <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Claims"/>
-                    <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Claims"/>
-                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
-                    <separator/>
                     <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
                     <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="user_id"/>
@@ -208,7 +198,6 @@
                         <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
                         <filter string="Claim Date" icon="terp-go-month" domain="[]" help="Claim Date" context="{'group_by':'date'}"/>
                         <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <filter string="Closure" icon="terp-go-month" domain="[]" help="Date Closed" context="{'group_by':'date_closed'}"  groups="base.group_no_one"/>

=== modified file 'crm_claim/report/crm_claim_report.py'
--- crm_claim/report/crm_claim_report.py	2013-04-15 10:23:49 +0000
+++ crm_claim/report/crm_claim_report.py	2013-06-05 13:32:29 +0000
@@ -22,14 +22,6 @@
 from openerp.osv import fields,osv
 from openerp import tools
 
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
-
 AVAILABLE_PRIORITIES = [
     ('5', 'Lowest'),
     ('4', 'Low'),
@@ -51,7 +43,6 @@
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -92,7 +83,6 @@
                     to_char(c.date, 'YYYY-MM-DD') as day,
                     to_char(c.date_closed, 'YYYY-MM-DD') as date_closed,
                     to_char(c.date_deadline, 'YYYY-MM-DD') as date_deadline,
-                    c.state,
                     c.user_id,
                     c.stage_id,
                     c.section_id,
@@ -109,7 +99,7 @@
                 from
                     crm_claim c
                 group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\
-                        c.state, c.user_id,c.section_id, c.stage_id,\
+                        c.user_id,c.section_id, c.stage_id,\
                         c.categ_id,c.partner_id,c.company_id,c.create_date,
                         c.priority,c.type_action,c.date_deadline,c.date_closed,c.id
             )""")

=== modified file 'crm_claim/report/crm_claim_report_view.xml'
--- crm_claim/report/crm_claim_report_view.xml	2013-05-21 14:27:53 +0000
+++ crm_claim/report/crm_claim_report_view.xml	2013-06-05 13:32:29 +0000
@@ -21,7 +21,6 @@
                     <field name="email" sum="# Mails"/>
                     <field name="delay_close" avg="Avg Closing Delay"/>
                     <field name="delay_expected"/>
-                    <field name="state" invisible="1"/>
                     <field name="stage_id" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="priority" invisible="1"/>
@@ -37,7 +36,7 @@
             <field name="model">crm.claim.report</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Claims" type="bar">
-                    <field name="state"/>
+                    <field name="stage_id"/>
                     <field name="nbr" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -51,9 +50,6 @@
             <field name="model">crm.claim.report</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
-                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
                     <separator/>
                     <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" groups="base.group_multi_salesteams"/>
                     <separator/>
@@ -73,8 +69,6 @@
                         <field name="create_date" />
                         <field name="date_closed" />
                         <field name="date_deadline" />
-                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
-                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/>
                     </group>
                     <group  expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
@@ -84,7 +78,6 @@
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_action'}" help="Action Type"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of claim"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of claim"/>

=== modified file 'crm_claim/test/process/claim.yml'
--- crm_claim/test/process/claim.yml	2013-04-16 15:18:44 +0000
+++ crm_claim/test/process/claim.yml	2013-06-05 13:32:29 +0000
@@ -15,31 +15,3 @@
     claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <[e-mail]>')])
     assert claim_ids and len(claim_ids), "Claim is not created after getting request"
     claim = self.browse(cr, uid, claim_ids[0], context=context)
-    assert claim.name == tools.ustr("demande derèglement de votre produit."), "Subject does not match"
--
-  I open customer claim.
--
-  !python {model: crm.claim}: |
-    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <[e-mail]>')])
-    self.case_open(cr, uid, claim_ids)
--
-  I check Claim Details after open. 
--
-  !python {model: crm.claim}: |
-    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <[e-mail]>')])
-    claim = self.browse(cr, uid, claim_ids[0])
-    assert claim.state == "open", "Claim is not in Open state"
-    assert claim.stage_id.id == ref("crm.stage_lead2"), "Claim is not in Qualification stage"
--
-  After complete all service from our side, I close this claim.
--
-  !python {model: crm.claim}: |
-    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <[e-mail]>')])
-    self.case_close(cr, uid, claim_ids)
--
-  I check Claim details after closed.
--
-  !python {model: crm.claim}: |
-    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <[e-mail]>')])
-    claim = self.browse(cr, uid, claim_ids[0])
-    assert claim.state == "done", "Claim is not in close state"

=== modified file 'crm_partner_assign/report/crm_lead_report.py'
--- crm_partner_assign/report/crm_lead_report.py	2013-04-15 10:23:49 +0000
+++ crm_partner_assign/report/crm_lead_report.py	2013-06-05 13:32:29 +0000
@@ -23,13 +23,6 @@
 from openerp import tools
 from openerp.addons.crm import crm
 
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
 
 class crm_lead_report_assign(osv.osv):
     """ CRM Lead Report """
@@ -43,7 +36,6 @@
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'country_id':fields.many2one('res.country', 'Country', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -91,7 +83,6 @@
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
-                    c.state,
                     c.date_assign,
                     c.user_id,
                     c.probability,

=== modified file 'crm_partner_assign/report/crm_lead_report_view.xml'
--- crm_partner_assign/report/crm_lead_report_view.xml	2013-03-25 16:51:25 +0000
+++ crm_partner_assign/report/crm_lead_report_view.xml	2013-06-05 13:32:29 +0000
@@ -54,7 +54,7 @@
             <field name="model">crm.lead.report.assign</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Lead Assign" type="bar">
-                    <field name="state"/>
+                    <field name="stage_id"/>
                     <field name="nbr" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -76,7 +76,6 @@
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
                 <field name="day" invisible="1"/>
-                <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
                 <field name="priority"  invisible="1"/>
                 <field name="type" invisible="1"/>

=== modified file 'crm_partner_assign/res_partner_view.xml'
--- crm_partner_assign/res_partner_view.xml	2013-04-03 08:10:09 +0000
+++ crm_partner_assign/res_partner_view.xml	2013-06-05 13:32:29 +0000
@@ -134,37 +134,20 @@
                     <newline/>
 
                     <field name="opportunity_assigned_ids" colspan="4" nolabel="1">
-                         <tree string="Assigned Opportunities"  colors="blue:state=='pending';gray:state=='cancel'">
+                         <tree string="Assigned Opportunities">
                              <field name="create_date"/>
                              <field name="name"/>
                              <field name="type"/>
                              <field name="stage_id"/>
-                             <button name="stage_previous" string="Previous"
-                                    states="open,pending" type="object" icon="gtk-go-back" />
-                             <button name="stage_next" string="Next"
-                                    states="open,pending" type="object"
-                                    icon="gtk-go-forward" />
                              <field name="section_id"
                                     invisible="context.get('invisible_section', True)"
                                     groups="base.group_multi_salesteams"/>
                              <field name="user_id" />
-                             <field name="state" />
-                             <button name="case_cancel" string="Cancel"
-                                    states="draft,open,pending" type="object"
-                                    icon="gtk-cancel" />
-                             <button name="case_open" string="Open"
-                                    states="draft,pending" type="object"
-                                    icon="gtk-go-forward" />
-                             <button name="case_close" string="Close"
-                                    states="open,draft,pending" type="object"
-                                    icon="gtk-close" />
+                             <field name="stage_sequence" invisible="1"/>
                              <button string="Convert to Opportunity"
-                                    name="convert_opportunity"
-                                    states="draft,open,pending" icon="gtk-index"
-                                    type="object" attrs="{'invisible':[('type','=','opportunity')]}" />
-                             <button name="case_escalate" string="Escalate"
-                                    states="open,draft,pending" type="object"
-                                    icon="gtk-go-up" />
+                                 name="convert_opportunity"
+                                 icon="gtk-index"
+                                 type="object" attrs="{'invisible':['|',('type','=','opportunity'),('stage_sequence','in',[6,7,8])]}" />
                          </tree>
                     </field>
                 </page>

=== modified file 'crm_todo/crm_todo_view.xml'
--- crm_todo/crm_todo_view.xml	2013-04-04 11:56:27 +0000
+++ crm_todo/crm_todo_view.xml	2013-06-05 13:32:29 +0000
@@ -14,14 +14,10 @@
                         <tree editable="bottom" string="Tasks">
                             <field name="name"/>
                             <field name="user_id"/>
-
+                            <field name="stage_sequence" invisible="1"/>
                             <field string="Timebox" name="timebox_id"/>
-                            <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open"/>
-                            <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open"/>
-
-                            <field name="state"/>
-                            <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
-                            <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
+                            <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" attrs="{'invisible':[('stage_sequence','in',[6,7,8])]}" />
+                            <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" attrs="{'invisible':[('stage_sequence','in',[6,7,8])]}" />
                         </tree>
                     </field>
                 </page>

=== modified file 'hr_recruitment/board_hr_recruitment_statistical_view.xml'
--- hr_recruitment/board_hr_recruitment_statistical_view.xml	2012-11-29 22:26:45 +0000
+++ hr_recruitment/board_hr_recruitment_statistical_view.xml	2013-06-05 13:32:29 +0000
@@ -22,7 +22,7 @@
         <field name="res_model">hr.applicant</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','in',('draft','open'))]</field>
+        <field name="domain">[('stage_sequence','in',(1,2,3))]</field>
         <field name="view_id" ref="view_applicants_status_tree"/>
     </record>
 

=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py	2013-05-30 10:08:52 +0000
+++ hr_recruitment/hr_recruitment.py	2013-06-05 13:32:29 +0000
@@ -28,13 +28,6 @@
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-AVAILABLE_STATES = [
-    ('draft', 'New'),
-    ('cancel', 'Refused'),
-    ('open', 'In Progress'),
-    ('pending', 'Pending'),
-    ('done', 'Hired')
-]
 
 AVAILABLE_PRIORITIES = [
     ('', ''),
@@ -61,14 +54,12 @@
     _columns = {
         '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."),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change according to the selected stage. Example, a stage is related to the status 'Close', when your document reach this stage, it will be automatically closed."),
+        'job_id':fields.many2one('hr.job', 'Specific to a Job Position', help="Stages of the recruitment process may be different per Job Position. If this stage is common to all Job Position, 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'),
     }
     _defaults = {
         'sequence': 1,
-        'state': 'draft',
         'fold': False,
     }
 
@@ -93,15 +84,12 @@
     _order = "id desc"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _track = {
-        'state': {
-            'hr_recruitment.mt_applicant_hired': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
-            'hr_recruitment.mt_applicant_refused': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
-        },
         'stage_id': {
-            'hr_recruitment.mt_stage_changed': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['done', 'cancel'],
+            'hr_recruitment.mt_stage_changed': lambda self, cr, uid, obj, ctx=None: obj['stage_id'] != False,
         },
     }
 
+
     def _get_default_department_id(self, cr, uid, context=None):
         """ Gives default department by checking if present in the context """
         return (self._resolve_department_id_from_context(cr, uid, context=context) or False)
@@ -109,7 +97,7 @@
     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, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], department_id, [], context=context) #Get stage_id with lower priority as default
 
     def _resolve_department_id_from_context(self, cr, uid, context=None):
         """ Returns ID of department based on the value of 'default_department_id'
@@ -138,11 +126,11 @@
         # - ('id', 'in', 'ids'): add columns that should be present
         # - OR ('department_id', '=', False), ('fold', '=', False): add default columns that are not folded
         # - OR ('department_id', 'in', department_id), ('fold', '=', False) if department_id: add department columns that are not folded
-        department_id = self._resolve_department_id_from_context(cr, uid, context=context)
+        job_id = self._resolve_department_id_from_context(cr, uid, context=context)
         search_domain = []
-        if department_id:
-            search_domain += ['|', ('department_id', '=', department_id)]
-        search_domain += ['|', ('id', 'in', ids), ('department_id', '=', False)]
+        if job_id:
+            search_domain += ['|', ('job_id', '=', job_id)]
+        search_domain += ['|', ('id', 'in', ids), ('job_id', '=', False)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
@@ -195,15 +183,8 @@
         'partner_id': fields.many2one('res.partner', 'Contact'),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
-        'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', track_visibility='onchange',
-                        domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
-        'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=AVAILABLE_STATES, string="Status", readonly=True,
-                help='The status is set to \'Draft\', when a case is created.\
-                      If the case is in progress the status is set to \'Open\'.\
-                      When the case is over, the status is set to \'Done\'.\
-                      If the case needs to be reviewed then the status is \
-                      set to \'Pending\'.'),
+        'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', track_visibility='onchange',),
+        'stage_sequence': fields.related('stage_id','sequence',type='integer', string='Stage Sequence'),
         'categ_ids': fields.many2many('hr.applicant_category', string='Tags'),
         'company_id': fields.many2one('res.company', 'Company'),
         'user_id': fields.many2one('res.users', 'Responsible', track_visibility='onchange'),
@@ -252,20 +233,17 @@
         'stage_id': _read_group_stage_ids
     }
 
-    def onchange_job(self, cr, uid, ids, job, context=None):
+    def onchange_job(self, cr, uid, ids, job_id=False, context=None):
         result = {}
-
-        if job:
+        if job_id:
             job_obj = self.pool.get('hr.job')
-            result['department_id'] = job_obj.browse(cr, uid, job, context=context).department_id.id
-            return {'value': result}
-        return {'value': {'department_id': False}}
-
-    def onchange_department_id(self, cr, uid, ids, department_id=False, context=None):
+            result['department_id'] = job_obj.browse(cr, uid, job_id, context=context).department_id.id
+        else:
+            result['department_id'] = False
         obj_recru_stage = self.pool.get('hr.recruitment.stage')
-        stage_ids = obj_recru_stage.search(cr, uid, ['|',('department_id','=',department_id),('department_id','=',False)], context=context)
-        stage_id = stage_ids and stage_ids[0] or False
-        return {'value': {'stage_id': stage_id}}
+        stage_ids = obj_recru_stage.search(cr, uid, ['|',('job_id','=',job_id),('job_id','=',False)], context=context)
+        result['stage_id'] = stage_ids and stage_ids[0] or False
+        return {'value': result}
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
         data = {'partner_phone': False,
@@ -287,17 +265,17 @@
         if isinstance(cases, (int, long)):
             cases = self.browse(cr, uid, cases, context=context)
         # collect all section_ids
-        department_ids = []
+        job_ids = []
         if section_id:
-            department_ids.append(section_id)
+            job_ids.append(section_id)
         for case in cases:
-            if case.department_id:
-                department_ids.append(case.department_id.id)
+            if case.job_id:
+                job_ids.append(case.job_id.id)
         # OR all section_ids and OR with case_default
         search_domain = []
-        if department_ids:
-            search_domain += ['|', ('department_id', 'in', department_ids)]
-        search_domain.append(('department_id', '=', False))
+        if job_ids:
+            search_domain += ['|', ('job_id', 'in', job_ids)]
+        search_domain.append(('job_id', '=', False))
         # AND with the domain in parameter
         search_domain += list(domain)
         # perform search, return the first found
@@ -419,10 +397,6 @@
             self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
         return res
 
-    def case_close(self, cr, uid, ids, context=None):
-        res = super(hr_applicant, self).case_close(cr, uid, ids, context)
-        return res
-
     def case_close_with_emp(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -442,8 +416,8 @@
                                                      'address_home_id': address_id,
                                                      'department_id': applicant.department_id.id
                                                      })
-                self.write(cr, uid, [applicant.id], {'emp_id': emp_id}, context=context)
-                self.case_close(cr, uid, [applicant.id], context)
+                stage_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_recruitment', 'stage_job5') #get stage_id of Contract Signed(Hired) stage
+                self.write(cr, uid, [applicant.id], {'emp_id': emp_id, 'stage_id': stage_id.id}, context=context)
             else:
                 raise osv.except_osv(_('Warning!'), _('You must define an Applied Job and a Contact Name for this applicant.'))
 
@@ -454,26 +428,6 @@
         dict_act_window['view_mode'] = 'form,tree'
         return dict_act_window
 
-    def case_cancel(self, cr, uid, ids, context=None):
-        """Overrides cancel for crm_case for setting probability
-        """
-        res = super(hr_applicant, self).case_cancel(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability': 0.0})
-        return res
-
-    def case_pending(self, cr, uid, ids, context=None):
-        """Marks case as pending"""
-        res = super(hr_applicant, self).case_pending(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability': 0.0})
-        return res
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """Resets case as draft
-        """
-        res = super(hr_applicant, self).case_reset(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
-        return res
-
     def set_priority(self, cr, uid, ids, priority, *args):
         """Set applicant priority
         """

=== modified file 'hr_recruitment/hr_recruitment_data.xml'
--- hr_recruitment/hr_recruitment_data.xml	2013-02-13 07:35:33 +0000
+++ hr_recruitment/hr_recruitment_data.xml	2013-06-05 13:32:29 +0000
@@ -53,32 +53,26 @@
     </record>
     <record model="hr.recruitment.stage" id="stage_job1">
         <field name="name">Initial Qualification</field>
-        <field name="state">draft</field>
         <field name="sequence">1</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job2">
         <field name="name">First Interview</field>
-        <field name="state">open</field>
         <field name="sequence">2</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job3">
         <field name="name">Second Interview</field>
-        <field name="state">open</field>
         <field name="sequence">3</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job4">
         <field name="name">Contract Proposed</field>
-        <field name="state">pending</field>
         <field name="sequence">4</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
-        <field name="state">done</field>
         <field name="sequence">5</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job6">
         <field name="name">Refused</field>
-        <field name="state">cancel</field>
         <field name="sequence">6</field>
         <field name="fold" eval="True"/>
     </record>

=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2013-05-30 10:08:52 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2013-06-05 13:32:29 +0000
@@ -39,7 +39,7 @@
         <field name="name">Applicants</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
+            <tree string="Applicants" fonts="bold:message_unread==True">
                 <field name="message_unread" invisible="1"/>
                 <field name="create_date"/>
                 <field name="name" string="Subject"/>
@@ -58,7 +58,6 @@
                 <field name="availability" invisible="1"/>
                 <field name="department_id" invisible="context.get('invisible_department', True)"/>
                 <field name="user_id"/>
-                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -71,10 +70,8 @@
             <header>
                 <button name="case_close_with_emp" string="Hire &amp; Create Employee" type="object"
                         class="oe_highlight"
-                        attrs="{'invisible':['|', ('emp_id','!=',False), ('state','=','cancel')]}"/>
-                <button name="case_cancel" string="Refuse" type="object"
-                        states="draft,open,pending" class="oe_highlight"/>
-                <field name="stage_id" widget="statusbar" clickable="True"/>
+                        attrs="{'invisible':['|', ('emp_id','!=',False), ('stage_sequence','=',5)]}"/>
+                <field name="stage_id" widget="statusbar" clickable="True"  domain="['|', ('job_id', '=', job_id), ('job_id', '=', False)]"/>
                 <field name="emp_id" invisible="1"/>
             </header>
             <sheet>
@@ -115,7 +112,7 @@
                             <field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/>
                         </div>
                         <field name="priority"/>
-                        <field name="state" invisible="1"/>
+                        <field name="stage_sequence" invisible="1"/>
                         <field name="source_id"/>
                         <field name="reference"/>
                     </group>
@@ -123,7 +120,7 @@
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
                         <field name="job_id" on_change="onchange_job(job_id)"/>
-                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <field name="department_id"/>
                         <label for="availability"/>
                         <div>
                             <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>
@@ -165,7 +162,7 @@
               <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
                 <field name="job_id"/>
                 <field name="salary_expected" operator="+"/>
-                <field name="state" group="True"/>
+                <field name="stage_id" group="True"/>
             </graph>
         </field>
     </record>
@@ -178,10 +175,6 @@
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
                 <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
-                <filter string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
-                <filter string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
-                <filter string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
-                <separator/>
                 <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments"/>
                 <separator/>
                 <filter string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
@@ -190,6 +183,7 @@
                 <field name="user_id"/>
                 <separator/>
                 <field name="categ_ids"/>
+                <field name="stage_id"/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" domain="[]"  context="{'group_by':'user_id'}"/>
                     <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
@@ -340,8 +334,7 @@
             <tree string="Stages">
                 <field name="sequence" invisible="1"/>
                 <field name="name"/>
-                <field name="department_id"/>
-                <field name="state"/>
+                <field name="job_id"/>
             </tree>
         </field>
     </record>
@@ -356,10 +349,9 @@
                 <group string="Stage Definition">
                     <group>
                         <field name="name"/>
-                        <field name="department_id"/>
+                        <field name="job_id"/>
                     </group>
                     <group>
-                        <field name="state"/>
                         <field name="sequence"/>
                         <field name="fold"/>
                     </group>

=== modified file 'hr_recruitment/report/hr_recruitment_report.py'
--- hr_recruitment/report/hr_recruitment_report.py	2013-04-15 10:23:49 +0000
+++ hr_recruitment/report/hr_recruitment_report.py	2013-06-05 13:32:29 +0000
@@ -24,14 +24,6 @@
 from openerp.addons.decimal_precision import decimal_precision as dp
 
 
-AVAILABLE_STATES = [
-    ('draft','New'),
-    ('open','Open'),
-    ('cancel', 'Refused'),
-    ('done', 'Hired'),
-    ('pending','Pending')
-]
-
 class hr_recruitment_report(osv.osv):
     _name = "hr.recruitment.report"
     _description = "Recruitments Statistics"
@@ -41,7 +33,6 @@
     _columns = {
         'user_id': fields.many2one('res.users', 'User', readonly=True),
         'nbr': fields.integer('# of Applications', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -79,7 +70,6 @@
                      to_char(s.create_date, 'YYYY') as year,
                      to_char(s.create_date, 'MM') as month,
                      to_char(s.create_date, 'YYYY-MM-DD') as day,
-                     s.state,
                      s.partner_id,
                      s.company_id,
                      s.user_id,
@@ -105,7 +95,6 @@
                      s.date_open,
                      s.create_date,
                      s.date_closed,
-                     s.state,
                      s.partner_id,
                      s.company_id,
                      s.user_id,

=== modified file 'hr_recruitment/report/hr_recruitment_report_view.xml'
--- hr_recruitment/report/hr_recruitment_report_view.xml	2012-11-29 22:26:45 +0000
+++ hr_recruitment/report/hr_recruitment_report_view.xml	2013-06-05 13:32:29 +0000
@@ -14,7 +14,6 @@
                 <field name="type_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="company_id" groups="base.group_multi_company" invisible="1"/>
-                <field name="state" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
@@ -46,11 +45,6 @@
         <field name="model">hr.recruitment.report</field>
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
-                <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
-                <filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/>
-                <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/>
-                <filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/>
-                <separator/>
                 <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/>
                 <field name="job_id"/>
                 <field name="department_id"/>

=== modified file 'hr_recruitment/test/recruitment_process.yml'
--- hr_recruitment/test/recruitment_process.yml	2013-04-17 06:40:51 +0000
+++ hr_recruitment/test/recruitment_process.yml	2013-06-05 13:32:29 +0000
@@ -17,34 +17,8 @@
     resume_ids = self.pool.get('ir.attachment').search(cr, uid, [('datas_fname','=','resume.pdf'),('res_model','=',self._name),('res_id','=',applicant.id)])
     assert applicant.name == "Application for the post of Jr.application Programmer.", "Applicant name does not match."
     assert applicant.stage_id.id == ref('hr_recruitment.stage_job1'), "Stage should be 'Initial qualification' and is '%s'." % (applicant.stage_id.name)
-    assert applicant.state == "draft", "Applicant state should be 'draft'."
     assert len(resume_ids), "Resume is not attached."
 -
-  I refuse the applicant (hr_case_programmer)
--
-  !python {model: hr.applicant}: |
-    self.case_cancel(cr, uid, [ref("hr_case_programmer")])
--
-  I check the details of the refused applicant.
--
-  !python {model: hr.applicant}: |
-    applicant = self.browse(cr, uid, ref("hr_case_programmer"), context=context)
-    assert applicant.stage_id.id == ref('hr_recruitment.stage_job6'), "Stage should be 'Refused' and is %s." % (applicant.stage_id.name)
-    assert applicant.state == 'cancel', "Applicant is not in 'cancel' state."
--
-  I reset and re-open the previously refused applicant.
--
-  !python {model: hr.applicant}: |
-    self.case_reset(cr, uid, [ref("hr_case_programmer")])
-    self.case_open(cr, uid, [ref("hr_case_programmer")])
--
-  I check the details of the re-opened applicant.
--
-  !python {model: hr.applicant}: |
-    applicant = self.browse(cr, uid, ref("hr_case_programmer"), context=context)
-    assert applicant.stage_id.id == ref('hr_recruitment.stage_job2'), "Stage should be 'First interview' and is '%s'." % (applicant.stage_id.name)
-    assert applicant.state == "open", "Applicant state should be 'open'."
--
   I assign the Job position to the applicant
 -
   !python {model: hr.applicant}: |
@@ -98,22 +72,21 @@
 -
   I check that applicant is "Hired".
 -
-  !assert {model: hr.applicant, id: hr_case_programmer, string: Applicant state is done}:
-    - state == 'done'
+  !python {model: hr.applicant}: |
+    applicant = self.browse(cr, uid, ref("hr_case_programmer"), context=context)
+    assert applicant.stage_id.id == ref('hr_recruitment.stage_job5'), "Stage should be 'Contract Signed' and is '%s'." % (applicant.stage_id.name)
 -
   I do not give employment to the hired the applicant.
 -
   !python {model: hired.employee}: |
     context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
     emp_id = self.create(cr, uid, {}, context=context)
-    self.case_close(cr, uid, [emp_id], context=context)
 -
   Now I give employment to hired applicant .
 -
   !python {model: hr.applicant}: |
      hired_emp_obj = self.pool.get('hired.employee')
-     self.case_reset(cr, uid, [ref("hr_case_programmer")])
-     self.case_open(cr, uid, [ref("hr_case_programmer")])
+     self.write(cr, uid, [ref("hr_recruitment.hr_case_programmer")], {'stage_sequence' : 3})
      context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
      emp_hr_id = hired_emp_obj.create(cr, uid, {}, context=context)
      hired_emp_obj.case_close_with_emp(cr, uid, [emp_hr_id], context=context)

=== modified file 'pad_project/project_task.xml'
--- pad_project/project_task.xml	2012-11-29 22:26:45 +0000
+++ pad_project/project_task.xml	2013-06-05 13:32:29 +0000
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <field name="description" position="replace">
-                    <field name="description_pad" attrs="{'readonly':[('state','=','done')]}" widget="pad"/>
+                    <field name="description_pad" attrs="{'readonly':[('stage_sequence','=',7)]}" widget="pad"/>
                 </field>
             </field>
         </record>

=== modified file 'portal_project_issue/portal_project_issue_view.xml'
--- portal_project_issue/portal_project_issue_view.xml	2012-11-29 22:26:45 +0000
+++ portal_project_issue/portal_project_issue_view.xml	2013-06-05 13:32:29 +0000
@@ -25,9 +25,6 @@
                                             <field name="version_id"/>                                            
                                         </div>
                                         <div><field name="categ_ids" widget="many2many_tags" class="oe_left"/></div>
-                                        <div class="oe_text_right">
-                                            <h1><field name="state" readonly="1"/></h1>
-                                        </div>
                                     </div>
                                     <div>
                                         <h1><a type="open"><field name="name"/></a></h1>

=== modified file 'project/__openerp__.py'
--- project/__openerp__.py	2013-01-31 18:41:41 +0000
+++ project/__openerp__.py	2013-06-05 13:32:29 +0000
@@ -66,7 +66,6 @@
     'data': [
         'security/project_security.xml',
         'wizard/project_task_delegate_view.xml',
-        'wizard/project_task_reevaluate_view.xml',
         'security/ir.model.access.csv',
         'project_data.xml',
         'project_view.xml',

=== modified file 'project/board_project_view.xml'
--- project/board_project_view.xml	2012-11-29 22:26:45 +0000
+++ project/board_project_view.xml	2013-06-05 13:32:29 +0000
@@ -16,7 +16,6 @@
                     <field name="effective_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -26,7 +25,7 @@
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
+            <field name="domain">[('user_id','=',uid),('stage_sequence','not in', (7,8))]</field>
             <field name="view_id" ref="view_task_tree"/>
         </record>
 

=== modified file 'project/project.py'
--- project/project.py	2013-05-21 13:38:07 +0000
+++ project/project.py	2013-06-05 13:32:29 +0000
@@ -44,9 +44,6 @@
         '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'),
-        'state': fields.selection(_TASK_STATE, 'Related Status', required=True,
-                        help="The status of your document is automatically changed regarding the selected stage. " \
-                            "For example, if a stage is related to the status 'Close', when your document reaches this stage, it is automatically closed."),
         '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."),
     }
@@ -57,7 +54,6 @@
         return proj
     _defaults = {
         'sequence': 1,
-        'state': 'open',
         'fold': False,
         'case_default': False,
         'project_ids': _get_default_project_id
@@ -152,7 +148,7 @@
         cr.execute("""
             SELECT project_id, COALESCE(SUM(planned_hours), 0.0),
                 COALESCE(SUM(total_hours), 0.0), COALESCE(SUM(effective_hours), 0.0)
-            FROM project_task WHERE project_id IN %s AND state <> 'cancelled'
+            FROM project_task WHERE project_id IN %s
             GROUP BY project_id
             """, (tuple(child_parent.keys()),))
         # aggregate results into res
@@ -253,22 +249,22 @@
         'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids'], 20),
             }),
         'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids'], 20),
             }),
         'total_hours': fields.function(_progress_rate, multi="progress", string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids'], 20),
             }),
         'progress_rate': fields.function(_progress_rate, multi="progress", string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids'], 20),
             }),
         '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)]}),
@@ -328,14 +324,12 @@
 
     def set_done(self, cr, uid, ids, context=None):
         task_obj = self.pool.get('project.task')
-        task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', 'not in', ('cancelled', 'done'))])
-        task_obj.case_close(cr, uid, task_ids, context=context)
+        task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('stage_sequence', 'not in', (7,8))])
         return self.write(cr, uid, ids, {'state':'close'}, context=context)
 
     def set_cancel(self, cr, uid, ids, context=None):
         task_obj = self.pool.get('project.task')
-        task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', '!=', 'done')])
-        task_obj.case_cancel(cr, uid, task_ids, context=context)
+        task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('stage_sequence', '!=', 7)])
         return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
 
     def set_pending(self, cr, uid, ids, context=None):
@@ -461,7 +455,7 @@
             if project.user_id and (project.user_id.id not in u_ids):
                 u_ids.append(project.user_id.id)
             for task in project.tasks:
-                if task.state in ('done','cancelled'):
+                if task.stage_sequence in (7,8):
                     continue
                 if task.user_id and (task.user_id.id not in u_ids):
                     u_ids.append(task.user_id.id)
@@ -527,7 +521,7 @@
         for project in projects:
             project_gantt = getattr(projects_gantt, 'Project_%d' % (project.id,))
             for task in project.tasks:
-                if task.state in ('done','cancelled'):
+                if task.stage_sequence in (7,8):
                     continue
 
                 p = getattr(project_gantt, 'Task_%d' % (task.id,))
@@ -580,13 +574,8 @@
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     _track = {
-        'state': {
-            'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'new',
-            'project.mt_task_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
-            'project.mt_task_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
-        },
         'stage_id': {
-            'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'done', 'open'],
+            'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj['stage_id'] != False,
         },
         'kanban_state': {  # kanban state: tracked, but only block subtype
             'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
@@ -600,7 +589,7 @@
     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, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], project_id, [], context=context)  #Get stage_id with lower priority as default
 
     def _resolve_project_id_from_context(self, cr, uid, context=None):
         """ Returns ID of project based on the value of 'default_project_id'
@@ -676,7 +665,7 @@
             res[task.id]['progress'] = 0.0
             if (task.remaining_hours + hours.get(task.id, 0.0)):
                 res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
-            if task.state in ('done','cancelled'):
+            if task.stage_sequence in (7,8) or task.remaining_hours <= 0.0:
                 res[task.id]['progress'] = 100.0
         return res
 
@@ -697,6 +686,9 @@
             return {'value':{'partner_id':partner_id.id}}
         return {}
 
+    def onchange_user_assigned(self, cr, uid, ids, user_id):
+        return {'value':{'date_start': fields.datetime.now(),'date_end':False}}
+
     def duplicate_task(self, cr, uid, map_ids, context=None):
         for new in map_ids.values():
             task = self.browse(cr, uid, new, context)
@@ -752,15 +744,9 @@
         'description': fields.text('Description'),
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
-        'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange',
-                        domain="[('project_ids', '=', project_id)]"),
-        'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=_TASK_STATE, string="Status", readonly=True,
-                help='The status is set to \'Draft\', when a case is created.\
-                      If the case is in progress the status is set to \'Open\'.\
-                      When the case is over, the status is set to \'Done\'.\
-                      If the case needs to be reviewed then the status is \
-                      set to \'Pending\'.'),
+        'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange'),
+        'stage_sequence': fields.related('stage_id', 'sequence', type="integer", string=
+"Stage Sequence"),
         'categ_ids': fields.many2many('project.category', string='Tags'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State',
                                          track_visibility='onchange',
@@ -789,9 +775,9 @@
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
-        'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
+        'progress': fields.function(_hours_get, string='Working Time Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
             store = {
-                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
+                'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
         'delay_hours': fields.function(_hours_get, string='Delay Hours', multi='hours', help="Computed as difference between planned hours by the project manager and the total hours of the task.",
@@ -955,82 +941,10 @@
         for task in tasks:
             if task.child_ids:
                 for child in task.child_ids:
-                    if child.state in ['draft', 'open', 'pending']:
+                    if child.stage_sequence not in [7,8]:
                         raise osv.except_osv(_("Warning !"), _("Child task still open.\nPlease cancel or complete child task first."))
         return True
 
-    def action_close(self, cr, uid, ids, context=None):
-        """ This action closes the task
-        """
-        task_id = len(ids) and ids[0] or False
-        self._check_child_task(cr, uid, ids, context=context)
-        if not task_id: return False
-        return self.do_close(cr, uid, [task_id], context=context)
-
-    def do_close(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_close. """
-        return self.case_close(cr, uid, ids, context=context)
-
-    def case_close(self, cr, uid, ids, context=None):
-        """ Closes Task """
-        if not isinstance(ids, list): ids = [ids]
-        for task in self.browse(cr, uid, ids, context=context):
-            vals = {}
-            project = task.project_id
-            for parent_id in task.parent_ids:
-                if parent_id.state in ('pending','draft'):
-                    reopen = True
-                    for child in parent_id.child_ids:
-                        if child.id != task.id and child.state not in ('done','cancelled'):
-                            reopen = False
-                    if reopen:
-                        self.do_reopen(cr, uid, [parent_id.id], context=context)
-            # close task
-            vals['remaining_hours'] = 0.0
-            if not task.date_end:
-                vals['date_end'] = fields.datetime.now()
-            self.case_set(cr, uid, [task.id], 'done', vals, context=context)
-        return True
-
-    def do_reopen(self, cr, uid, ids, context=None):
-        for task in self.browse(cr, uid, ids, context=context):
-            project = task.project_id
-            self.case_set(cr, uid, [task.id], 'open', {}, context=context)
-        return True
-
-    def do_cancel(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_cancel. """
-        return self.case_cancel(cr, uid, ids, context=context)
-
-    def case_cancel(self, cr, uid, ids, context=None):
-        tasks = self.browse(cr, uid, ids, context=context)
-        self._check_child_task(cr, uid, ids, context=context)
-        for task in tasks:
-            self.case_set(cr, uid, [task.id], 'cancelled', {'remaining_hours': 0.0}, context=context)
-        return True
-
-    def do_open(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_open. """
-        return self.case_open(cr, uid, ids, context=context)
-
-    def case_open(self, cr, uid, ids, context=None):
-        if not isinstance(ids,list): ids = [ids]
-        return self.case_set(cr, uid, ids, 'open', {'date_start': fields.datetime.now()}, context=context)
-
-    def do_draft(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_draft. """
-        return self.case_draft(cr, uid, ids, context=context)
-
-    def case_draft(self, cr, uid, ids, context=None):
-        return self.case_set(cr, uid, ids, 'draft', {}, context=context)
-
-    def do_pending(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_pending. """
-        return self.case_pending(cr, uid, ids, context=context)
-
-    def case_pending(self, cr, uid, ids, context=None):
-        return self.case_set(cr, uid, ids, 'pending', {}, context=context)
-
     def _delegate_task_attachments(self, cr, uid, task_id, delegated_task_id, context=None):
         attachment = self.pool.get('ir.attachment')
         attachment_ids = attachment.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', task_id)], context=context)
@@ -1065,16 +979,12 @@
                 'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0),
                 'name': newname,
             }, context=context)
-            if delegate_data['state'] == 'pending':
-                self.do_pending(cr, uid, [task.id], context=context)
-            elif delegate_data['state'] == 'done':
-                self.do_close(cr, uid, [task.id], context=context)
             delegated_tasks[task.id] = delegated_task_id
         return delegated_tasks
 
     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.state=='draft') or (task.planned_hours==0.0):
+            if (task.stage_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
@@ -1109,7 +1019,6 @@
                 'planned_hours': task.planned_hours,
                 'kanban_state': task.kanban_state,
                 'type_id': task.stage_id.id,
-                'state': task.state,
                 'user_id': task.user_id.id
 
             }, context=context)
@@ -1132,6 +1041,8 @@
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
+        if vals.get('stage_id'):
+            vals.update({'date_end': fields.datetime.now()})
         if vals.get('project_id'):
             project_id = self.pool.get('project.project').browse(cr, uid, vals.get('project_id'), context=context)
             if project_id:
@@ -1150,7 +1061,7 @@
             result = True
         else:
             result = super(task, self).write(cr, uid, ids, vals, context=context)
-        if ('stage_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('state' in vals) or ('kanban_state' in vals):
+        if ('stage_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('kanban_state' in vals):
             self._store_history(cr, uid, ids, context=context)
         return result
 
@@ -1166,7 +1077,7 @@
         result = ""
         ident = ' '*ident
         for task in tasks:
-            if task.state in ('done','cancelled'):
+            if task.stage_sequence in (7,8):
                 continue
             result += '''
 %sdef Task_%s():
@@ -1225,24 +1136,10 @@
                         update_vals[field] = float(res.group(2).lower())
                     except (ValueError, TypeError):
                         pass
-                elif match.lower() == 'state' \
-                        and res.group(2).lower() in ['cancel','close','draft','open','pending']:
-                    act = 'do_%s' % res.group(2).lower()
         if act:
             getattr(self,act)(cr, uid, ids, context=context)
         return super(task,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
-    def project_task_reevaluate(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').has_group(cr, uid, 'project.group_time_work_estimation_tasks'):
-            return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'project.task.reevaluate',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-            }
-        return self.do_reopen(cr, uid, ids, context=context)
-
 class project_work(osv.osv):
     _name = "project.task.work"
     _description = "Project Task Work"

=== modified file 'project/project_data.xml'
--- project/project_data.xml	2013-03-21 16:29:39 +0000
+++ project/project_data.xml	2013-06-05 13:32:29 +0000
@@ -30,51 +30,43 @@
         <record id="project_tt_analysis" model="project.task.type">
             <field name="sequence">1</field>
             <field name="name">Analysis</field>
-            <field name="state">draft</field>
             <field name="case_default" eval="False"/>
         </record>
         <record id="project_tt_specification" model="project.task.type">
             <field name="sequence">2</field>
             <field name="name">Specification</field>
-            <field name="state">pending</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_design" model="project.task.type">
-            <field name="sequence">2</field>
+            <field name="sequence">3</field>
             <field name="name">Design</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_development" model="project.task.type">
-            <field name="sequence">3</field>
+            <field name="sequence">4</field>
             <field name="name">Development</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_testing" model="project.task.type">
-            <field name="sequence">4</field>
+            <field name="sequence">5</field>
             <field name="name">Testing</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_merge" model="project.task.type">
-            <field name="sequence">5</field>
+            <field name="sequence">6</field>
             <field name="name">Merge</field>
-            <field name="state">open</field>
             <field name="case_default" eval="False"/>
             <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_deployment" model="project.task.type">
-            <field name="sequence">100</field>
+            <field name="sequence">7</field>
             <field name="name">Done</field>
-            <field name="state">done</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_cancel" model="project.task.type">
-            <field name="sequence">200</field>
+            <field name="sequence">8</field>
             <field name="name">Cancelled</field>
-            <field name="state">cancelled</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>

=== modified file 'project/project_demo.xml'
--- project/project_demo.xml	2013-04-16 14:11:45 +0000
+++ project/project_demo.xml	2013-06-05 13:32:29 +0000
@@ -221,7 +221,6 @@
                     ref('project.project_category_04')])]"/>
             <field name="stage_id" ref="project_tt_merge"/>
         </record>
-        <function model="project.task" name="do_close" eval="[ref('project_task_11')], {'install_mode': True}"/>
 
         <record id="project_task_12" model="project.task">
             <field name="planned_hours" eval="40.0"/>
@@ -233,7 +232,6 @@
             <field name="stage_id" ref="project_tt_merge"/>
             <field name="color">6</field>
         </record>
-        <function model="project.task" name="do_close" eval="[ref('project_task_12')], {'install_mode': True}"/>
 
         <record id="project_task_13" model="project.task">
             <field name="planned_hours" eval="12.0"/>
@@ -244,7 +242,6 @@
             <field name="name">Design Use Cases</field>
             <field name="stage_id" ref="project_tt_analysis"/>
         </record>
-        <function model="project.task" name="do_pending" eval="[ref('project_task_13')], {'install_mode': True}"/>
 
         <record id="project_task_14" model="project.task">
             <field name="planned_hours" eval="12.0"/>
@@ -278,7 +275,6 @@
             <field name="name">Set target for all deparments</field>
              <field name="stage_id" ref="project_tt_development"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_16')], {'install_mode': True}"/>
 
         <record id="project_task_17" model="project.task">
             <field name="planned_hours" eval="34.0"/>
@@ -289,7 +285,6 @@
             <field name="name">Integration of core components</field>
             <field name="stage_id" ref="project_tt_testing"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_17')], {'install_mode': True}"/>
 
         <record id="project_task_18" model="project.task">
             <field name="planned_hours" eval="16.0"/>
@@ -311,7 +306,6 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_03')])]"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_19')], {'install_mode': True}"/>
 
         <record id="project_task_20" model="project.task">
             <field name="planned_hours">42.0</field>
@@ -321,7 +315,6 @@
             <field name="project_id" ref="project.project_project_4"/>
             <field name="name">Create new components</field>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_20')], {'install_mode': True}"/>
 
         <record id="project_task_21" model="project.task">
             <field name="planned_hours">14.0</field>
@@ -333,7 +326,6 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_04')])]"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_21')], {'install_mode': True}"/>
 
         <record id="project_task_22" model="project.task">
             <field name="planned_hours">12.0</field>
@@ -367,7 +359,6 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_01')])]"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_24')], {'install_mode': True}"/>
 
         <record id="project_task_25" model="project.task">
             <field name="sequence">20</field>
@@ -378,7 +369,6 @@
             <field name="name">Data importation + Doc</field>
             <field name="stage_id" ref="project_tt_development"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_25')], {'install_mode': True}"/>
 
         <record id="project_task_26" model="project.task">
             <field name="sequence">20</field>

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2013-05-30 09:22:04 +0000
+++ project/project_view.xml	2013-06-05 13:32:29 +0000
@@ -21,10 +21,6 @@
                     <separator/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
-                    <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
-                    <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
-                    <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                    <separator/>
                     <filter name="My project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
                     <separator/>
                     <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal"/>
@@ -34,6 +30,7 @@
                         help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
+                    <field name="stage_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
@@ -68,7 +65,7 @@
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
             <field name="name">project.project.form</field>
-            <field name="model">project.project</field>
+            <field name="model">project.project</field> 
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
@@ -365,24 +362,13 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                     <header>
-                        <!--
-                        <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending" class="oe_highlight"/>
-                        <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done"/>
-                        -->
-                        <button name="project_task_reevaluate" string="Reactivate" type="object"
-                                states="cancelled,done" context="{'button_reactivate':True}" groups="base.group_user"/>
-                        <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending" groups="base.group_user"/>
-                        <button name="do_cancel" string="Cancel Task" type="object"
-                                states="draft,open,pending" groups="base.group_user"/>
-                        <field name="stage_id" widget="statusbar" clickable="True"/>
+                        <field name="stage_id" widget="statusbar" clickable="True" domain="[('project_ids', '=', project_id)]"/>
                     </header>
                     <sheet string="Task">
                     <h1>
                         <field name="name" placeholder="Task summary..." class="oe_inline"/>
                         <field name="kanban_state" invisible='1'/>
+                        <field name="stage_sequence" invisible="1"/>
                         <button name="set_kanban_state_done" help="In Progress" attrs="{'invisible': [('kanban_state', 'in', ['done','blocked'])]}" type="object" icon="gtk-normal" class="oe_link oe_right"/>
                         <button name="set_kanban_state_blocked" help="Ready for Next Stage" attrs="{'invisible': [('kanban_state', 'in', ['normal','blocked'])]}" type="object" icon="gtk-yes" class="oe_link oe_right"/>
                         <button name="set_kanban_state_normal" help="Blocked" attrs="{'invisible': [('kanban_state', 'in', ['done','normal'])]}" type="object" icon="gtk-no" class="oe_link oe_right"/>
@@ -391,7 +377,8 @@
                         <group>
                             <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
                             <field name="user_id" 
-                                attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" 
+                                attrs="{'readonly':[('stage_sequence','in',[7,8])]}" 
+                                on_change="onchange_user_assigned(user_id)"
                                 options='{"no_open": True}'
                                 context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/>
                             <field name="planned_hours" widget="float_time"
@@ -399,15 +386,15 @@
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
                         </group>
                         <group>
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="date_deadline" attrs="{'readonly':[('stage_sequence','in',[7,8])]}"/>
                             <field name="categ_ids" widget="many2many_tags"/>
                             <field name="progress" widget="progressbar"
-                                groups="project.group_time_work_estimation_tasks" attrs="{'invisible':[('state','=','cancelled')]}"/>
+                                groups="project.group_time_work_estimation_tasks" attrs="{'invisible':[('stage_sequence','=',8)]}"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..."/>
+                            <field name="description" attrs="{'readonly':[('stage_sequence','=',7)]}" placeholder="Add a Description..."/>
                             <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name"/>
@@ -421,7 +408,7 @@
                                 <field name="effective_hours" widget="float_time"/>
                                 <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                 <div>
-                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','in',('done','cancelled'))]}" groups="project.group_time_work_estimation_tasks"/>
+                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('stage_sequence','in',(7,8))]}" groups="project.group_time_work_estimation_tasks"/>
                                 </div>
                                 <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
                              </group>
@@ -430,7 +417,7 @@
                         </page>
                         <page string="Delegation" groups="project.group_delegate_task">
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                                    states="pending,open,draft" groups="project.group_delegate_task"/>
+                                    attrs="{'invisible': [('stage_sequence', 'in', [7,8])]}" groups="project.group_delegate_task"/>
                             <separator string="Parent Tasks"/>
                             <field name="parent_ids"/>
                             <separator string="Delegated tasks"/>
@@ -439,7 +426,7 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="stage_id"/>
-                                    <field name="state" invisible="1"/>
+                                    <field name="stage_sequence" invisible="1"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="progress" widget="progressbar"/>
                                     <field name="remaining_hours" widget="float_time"/>
@@ -447,12 +434,11 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
+                        <page string="Extra Info" attrs="{'readonly':[('stage_sequence','=',7)]}">
                             <group col="4">
                                 <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
-                                <field name="state" invisible="1"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
                             <group>
@@ -487,12 +473,12 @@
                     <field name="user_email"/>
                     <field name="description"/>
                     <field name="sequence"/>
-                    <field name="state" groups="base.group_no_one"/>
                     <field name="kanban_state"/>
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
                     <field name="message_summary"/>
                     <field name="categ_ids"/>
+                    <field name="stage_sequence" invisible="1"/>
                     <templates>
                     <t t-name="kanban-box">
                         <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
@@ -507,7 +493,7 @@
                                         <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
                                         <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
                                         <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li>
-                                        <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
+                                        <li><a name="do_open" attrs="{'invisible': [('stage_sequence', '!=', 1)]}" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
                                       </ul>
                                     </li>
                                     <br/>
@@ -556,7 +542,7 @@
             <field name="model">project.task</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree fonts="bold:message_unread==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                <tree fonts="bold:message_unread==True" string="Tasks">
                     <field name="message_unread" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
@@ -569,7 +555,6 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="1"/>
                     <field name="date_start" groups="base.group_no_one"/>
                     <field name="date_end" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -655,7 +640,7 @@
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,kanban</field>
-            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')),('state','in',('draft','pending','open'))]</field>
+            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')),('stage_sequence','not in',(7,8))]</field>
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
@@ -700,7 +685,6 @@
                             <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="state"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
@@ -717,7 +701,6 @@
                 <tree string="Task Stage">
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
-                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -761,7 +744,7 @@
         </record>
 
         <!-- User Form -->
-        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('stage_sequence', '&lt;&gt;', 7),('stage_sequence', '&lt;&gt;', 8)]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
 
         <!-- Tags -->
         <record model="ir.ui.view" id="project_category_search_view">

=== modified file 'project/report/project_report.py'
--- project/report/project_report.py	2013-04-15 10:23:49 +0000
+++ project/report/project_report.py	2013-06-05 13:32:29 +0000
@@ -51,7 +51,6 @@
         'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'),
 ('0','Very urgent')], 'Priority', readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
-        'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
     }
@@ -75,7 +74,6 @@
                     t.user_id,
                     progress as progress,
                     t.project_id,
-                    t.state,
                     t.effective_hours as hours_effective,
                     t.priority,
                     t.name as name,
@@ -108,7 +106,6 @@
                     date_deadline,
                     t.user_id,
                     t.project_id,
-                    t.state,
                     t.priority,
                     name,
                     t.company_id,

=== modified file 'project/report/project_report_view.xml'
--- project/report/project_report_view.xml	2013-04-20 02:26:42 +0000
+++ project/report/project_report_view.xml	2013-06-05 13:32:29 +0000
@@ -15,7 +15,6 @@
                     <field name="project_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="date_start" invisible="1"/>
                     <field name="date_end" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
@@ -44,7 +43,6 @@
             <field name="arch" type="xml">
                 <graph string="Tasks Analysis" type="bar">
                      <field name="name"/>
-                     <field name="state" group="True"/>
                      <field name="no_of_days" operator="+"/>
                  </graph>
              </field>
@@ -58,11 +56,6 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="date_deadline"/>
-                    <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "New tasks"/>
-                    <filter string="In progress" icon="terp-check" domain="[('state', '=' ,'open')]" help = "In progress tasks"/>
-                    <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending tasks"/>
-                    <filter string="Done" icon="terp-dialog-close" name="done" domain="[('state','=','done')]"/>
-                    <separator/>
                     <filter icon="terp-folder-violet" string="My Projects" help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Task" help = "My tasks" domain="[('user_id','=',uid)]" />

=== modified file 'project/res_partner_view.xml'
--- project/res_partner_view.xml	2012-11-29 22:26:45 +0000
+++ project/res_partner_view.xml	2013-06-05 13:32:29 +0000
@@ -18,9 +18,6 @@
                                 <field name="name"/>
                                 <field name="user_id"/>
                                 <field name="date_deadline"/>
-                                <field name="state" invisible="1"/>
-                                <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                                <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                             </tree>
                         </field>
                       </group>

=== modified file 'project/test/task_process.yml'
--- project/test/task_process.yml	2012-11-29 22:26:45 +0000
+++ project/test/task_process.yml	2013-06-05 13:32:29 +0000
@@ -2,14 +2,9 @@
   I put task in pending due to specification is not clear.
 -
   !python {model: project.task}: |
-    self.do_pending(cr, uid, [ref("project_task_1")])
+    self.write(cr, uid, [ref("project_task_1")],{'stage_sequence' : 2})
     context.update({"active_id": ref("project_task_1")})
 -
-  I check state  of task after put in pending.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be in pending state}:
-    - state == "pending"
--
   !record {model: project.task.delegate, id: delegate_id}:
     user_id: base.user_demo
     planned_hours: 12.0
@@ -20,57 +15,12 @@
   !python {model: project.task.delegate}: |
     self.delegate(cr, uid, [ref("delegate_id")], {"active_id": ref("project_task_1")})
 -
-  I check delegated task details.
--
-  !python {model: project.task}: |
-    task = self.browse(cr, uid, ref("project_task_1"), context=context)
-    assert task.planned_hours == 2.0, "Planning hours is not correct after delegated."
-    assert task.state == "pending", "Task should be in Pending after delegated."
--
   I re-open the task.
 -
   !python {model: project.task}: |
-    self.do_reopen(cr, uid, [ref("project_task_1")])
--
-  I check reopened task details.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}:
-    - state == "open"
+    self.write(cr, uid, [ref("project_task_1")],{'stage_sequence' : 3})
 -
   I change the stage of task to next stage.
 -
   !python {model: project.task}: |
     self.stage_next(cr, uid, [ref("project_task_1")])
--
-  !record {model: project.task.reevaluate, id: reevaluate_id}:
-    remaining_hours : 120
--
-  I reevaluate task with remaining hours.
--
-  !python {model: project.task.reevaluate}: |
-    self.compute_hours(cr, uid, [ref("reevaluate_id")], {"active_id": ref("project_task_1")})
--
-  I check remaining hours after reevaluated task.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}:
-    - remaining_hours == 120.0
--
-  I close the task.
--
-  !python {model: project.task}: |
-    self.action_close(cr, uid, [ref("project_task_1")])
--
-  I check state after closed.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task is in open state}:
-    - state == "done"
--
-  I change the stage of task to previous stage.
--
-  !python {model: project.task}: |
-    self.stage_previous(cr, uid, [ref("project_task_1")])
--
-  I cancel Task.
--
-  !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_2")])

=== modified file 'project/wizard/__init__.py'
--- project/wizard/__init__.py	2012-06-15 12:59:18 +0000
+++ project/wizard/__init__.py	2013-06-05 13:32:29 +0000
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import project_task_delegate
-import project_task_reevaluate
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== removed file 'project/wizard/project_task_reevaluate.py'
--- project/wizard/project_task_reevaluate.py	2013-04-15 10:23:49 +0000
+++ project/wizard/project_task_reevaluate.py	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from lxml import etree
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-class project_task_reevaluate(osv.osv_memory):
-    _name = 'project.task.reevaluate'
-
-    def _get_remaining(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        active_id = context.get('active_id', False)
-        res = False
-        if active_id:
-            res = self.pool.get('project.task').browse(cr, uid, active_id, context=context).remaining_hours
-        return res
-
-    _columns = {
-        'remaining_hours' : fields.float('Remaining Hours', digits=(16,2), help="Put here the remaining hours required to close the task."),
-    }
-
-    _defaults = {
-        'remaining_hours': _get_remaining,
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(project_task_reevaluate, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
-        users_pool = self.pool.get('res.users')
-        time_mode = users_pool.browse(cr, uid, uid, context).company_id.project_time_mode_id
-        time_mode_name = time_mode and time_mode.name or 'Hours'
-        if time_mode_name in ['Hours','Hour']:
-            return res
-
-        eview = etree.fromstring(res['arch'])
-
-        def _check_rec(eview):
-            if eview.attrib.get('widget','') == 'float_time':
-                eview.set('widget','float')
-            for child in eview:
-                _check_rec(child)
-            return True
-
-        _check_rec(eview)
-
-        res['arch'] = etree.tostring(eview)
-
-        for field in res['fields']:
-            if 'Hours' in res['fields'][field]['string']:
-                res['fields'][field]['string'] = res['fields'][field]['string'].replace('Hours',time_mode_name)
-        return res
-
-    def compute_hours(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        data = self.browse(cr, uid, ids, context=context)[0]
-        task_id = context.get('active_id')
-        if task_id:
-            task_pool = self.pool.get('project.task')
-            task_pool.write(cr, uid, task_id, {'remaining_hours': data.remaining_hours})
-            if context.get('button_reactivate'):
-                task_pool.do_reopen(cr, uid, [task_id], context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== removed file 'project/wizard/project_task_reevaluate_view.xml'
--- project/wizard/project_task_reevaluate_view.xml	2012-11-29 22:26:45 +0000
+++ project/wizard/project_task_reevaluate_view.xml	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    <record id="view_project_task_reevaluate" model="ir.ui.view">
-            <field name="name">Re-evaluate Task</field>
-            <field name="model">project.task.reevaluate</field>
-            <field name="arch" type="xml">
-                <form string="Reevaluate Task" version="7.0">
-                    <separator string="Reevaluation Task"/>
-                    <group>
-                        <field name="remaining_hours" widget="float_time"/>
-                    </group>
-                    <footer>
-                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_project_task_reevaluate" model="ir.actions.act_window">
-            <field name="name">Re-evaluate Task</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">project.task.reevaluate</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
- </data>
-</openerp>

=== modified file 'project_gtd/project_gtd_view.xml'
--- project_gtd/project_gtd_view.xml	2013-04-25 14:38:07 +0000
+++ project_gtd/project_gtd_view.xml	2013-06-05 13:32:29 +0000
@@ -79,7 +79,6 @@
             <field name="remaining_hours" position="after">
                 <field string="Timeframe" name="timebox_id" invisible=" not context.get('gtd', False)"/>
                 <field name="context_id" invisible="not context.get('context_show', False)" widget="selection"/>
-                <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/>
             </field>
         </field>
     </record>
@@ -103,9 +102,6 @@
         <field name="arch" type="xml">
            <search string="My Tasks">
                 <field name="name" string="My Tasks"/>
-                <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
-                <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                <separator/>
                 <filter name="message_unread" string="Unread Messages" domain="[('message_unread','=',True)]"/>
                 <separator/>
                 <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>

=== modified file 'project_gtd/wizard/project_gtd_empty.py'
--- project_gtd/wizard/project_gtd_empty.py	2013-04-15 10:23:49 +0000
+++ project_gtd/wizard/project_gtd_empty.py	2013-06-05 13:32:29 +0000
@@ -52,7 +52,7 @@
             raise osv.except_osv(_('Error!'), _('No timebox child of this one !'))
         tids = obj_task.search(cr, uid, [('timebox_id', '=', context['active_id'])])
         for task in obj_task.browse(cr, uid, tids, context):
-            if (task.state in ('cancel','done')) or (task.user_id.id <> uid):
+            if (task.stage_sequence in (7,8)) or (task.user_id.id <> uid):
                 close.append(task.id)
             else:
                 up.append(task.id)

=== modified file 'project_issue/__openerp__.py'
--- project_issue/__openerp__.py	2012-11-29 22:26:45 +0000
+++ project_issue/__openerp__.py	2013-06-05 13:32:29 +0000
@@ -55,7 +55,6 @@
     'test': [
         'test/subscribe_issue.yml',
         'test/issue_process.yml',
-        'test/cancel_issue.yml',
         'test/issue_demo.yml'
     ],
     'installable': True,

=== modified file 'project_issue/board_project_issue_view.xml'
--- project_issue/board_project_issue_view.xml	2012-11-29 22:26:45 +0000
+++ project_issue/board_project_issue_view.xml	2013-06-05 13:32:29 +0000
@@ -6,7 +6,7 @@
             <field name="name">Project Issue Board Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                <tree string="Issue Tracker Tree">
                     <field name="id"/>
                     <field name="create_date"/>
                     <field name="name"/>
@@ -16,7 +16,6 @@
                     <field name="version_id" widget="selection"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -28,7 +27,7 @@
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field>
+            <field name="domain">[('stage_sequence','not in',(7,8)),('user_id','=',uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
 

=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2013-05-21 13:38:07 +0000
+++ project_issue/project_issue.py	2013-06-05 13:32:29 +0000
@@ -48,13 +48,8 @@
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     _track = {
-        'state': {
-            'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'new',
-            'project_issue.mt_issue_closed': lambda self, cr, uid, obj, ctx=None:  obj['state'] == 'done',
-            'project_issue.mt_issue_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
-        },
         'stage_id': {
-            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'done', 'open'],
+            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj['stage_id'] != False,
         },
         'kanban_state': {
             'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
@@ -78,7 +73,7 @@
     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, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], project_id, [], 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'
@@ -244,13 +239,6 @@
         'partner_id': fields.many2one('res.partner', 'Contact', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Private Note'),
-        'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=_TASK_STATE, string="Status", readonly=True,
-                help='The status is set to \'Draft\', when a case is created.\
-                      If the case is in progress the status is set to \'Open\'.\
-                      When the case is over, the status is set to \'Done\'.\
-                      If the case needs to be reviewed then the status is \
-                      set to \'Pending\'.'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State',
                                          track_visibility='onchange',
                                          help="A Issue's kanban state indicates special situations affecting it:\n"
@@ -269,8 +257,9 @@
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
-                        track_visibility='onchange',
-                        domain="[('project_ids', '=', project_id)]"),
+                        track_visibility='onchange',),
+        'stage_sequence': fields.related('stage_id', 'sequence', type="integer", string=
+"Stage Sequence"),
         'project_id':fields.many2one('project.project', 'Project', track_visibility='onchange'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -391,13 +380,13 @@
         #Update last action date every time the user changes the stage
         if 'stage_id' in vals:
             vals['date_action_last'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
-            state = self.pool.get('project.task.type').browse(cr, uid, vals['stage_id'], context=context).state
+            sequence = self.pool.get('project.task.type').browse(cr, uid, vals['stage_id'], context=context).sequence
             for issue in self.browse(cr, uid, ids, context=context):
                 # Change from draft to not draft EXCEPT cancelled: The issue has been opened -> set the opening date
-                if issue.state == 'draft' and state not in ('draft', 'cancelled'):
+                if issue.stage_sequence == 1 and sequence not in (1,8):
                     vals['date_open'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
                 # Change from not done to done: The issue has been closed -> set the closing date
-                if issue.state != 'done' and state == 'done':
+                if issue.stage_sequence not in (7,8) and sequence == 7:
                     vals['date_closed'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
 
         return super(project_issue, self).write(cr, uid, ids, vals, context)
@@ -579,7 +568,7 @@
         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):
-            if issue.state not in ('done', 'cancelled'):
+            if issue.stage_sequence not in (7,8):
                 res[issue.project_id.id] += 1
         return res
 

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2013-04-22 15:34:49 +0000
+++ project_issue/project_issue_view.xml	2013-06-05 13:32:29 +0000
@@ -48,13 +48,7 @@
             <field name="arch" type="xml">
                 <form string="Issue" version="7.0">
                 <header>
-                    <button name="case_close" string="Done" type="object"
-                            states="open" groups="base.group_user"/>
-                    <button name="case_close" string="Done" type="object"
-                            states="draft,pending" groups="base.group_user"/>
-                    <button name="case_cancel" string="Cancel Issue" type="object"
-                            states="draft,open,pending" groups="base.group_user"/>
-                    <field name="stage_id" widget="statusbar" clickable="True"/>
+                    <field name="stage_id" widget="statusbar" clickable="True" domain="[('project_ids', '=', project_id)]"/>
                 </header>
                 <sheet string="Issue">
                     <label for="name" class="oe_edit_only"/>
@@ -76,7 +70,7 @@
                             <label for="project_id" groups="base.group_user"/>
                             <div groups="base.group_user">
                                 <field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
-                                <button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link"/>
+                                <button name="case_escalate" string="⇒ Escalate" type="object" attrs="{'invisible': [('stage_sequence', 'in', [7,8])]}" class="oe_link"/>
                             </div>
                         </group>
                         <group>
@@ -105,7 +99,7 @@
                             </group>
                             <group string="Status" groups="base.group_no_one">
                                 <field name="active"/>
-                                <field name="state" string="Status"/>
+                                <field name="stage_sequence" invisible="1"/>
                             </group>
                         </page>
                     </notebook>
@@ -122,7 +116,7 @@
             <field name="name">Project Issue Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree" fonts="bold:message_unread==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                <tree string="Issue Tracker Tree" fonts="bold:message_unread==True">
                     <field name="message_unread" invisible="1"/>
                     <field name="id"/>
                     <field name="name"/>
@@ -134,7 +128,6 @@
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -150,15 +143,13 @@
                     <field name="id"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
-                    <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
-                    <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
-                    <separator/>
                     <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-"/>
                     <separator/>
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <field name="categ_ids"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <field name="stage_id"/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -268,7 +259,7 @@
             <field name="name">Project Issue- Feature Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Feature Tracker Tree" fonts="bold:message_unread==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <tree string="Feature Tracker Tree" fonts="bold:message_unread==True">
                     <field name="id"/>
                     <field name="message_unread" invisible="1"/>
                     <field name="name" string="Feature description"/>
@@ -277,7 +268,6 @@
                     <field name="version_id"/>
                     <field name="user_id"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
@@ -289,9 +279,6 @@
                 <search string="Feature Tracker Search">
                     <field name="name" string="Feature description"/>
                     <field name="date"/>
-                    <field name="state" groups="base.group_no_one"/>
-                    <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
-                    <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
                     <field name="user_id"/>
                     <field name="project_id" string="Project"/>
                 </search>

=== modified file 'project_issue/report/project_issue_report.py'
--- project_issue/report/project_issue_report.py	2013-04-15 10:23:49 +0000
+++ project_issue/report/project_issue_report.py	2013-06-05 13:32:29 +0000
@@ -24,13 +24,6 @@
 from openerp import tools
 from openerp.addons.crm import crm
 
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
 class project_issue_report(osv.osv):
     _name = "project.issue.report"
     _auto = False
@@ -38,7 +31,6 @@
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -51,6 +43,7 @@
         'creation_date': fields.date('Creation Date', readonly=True),
         'date_closed': fields.date('Date of Closing', readonly=True),
         'stage_id': fields.many2one('project.task.type', 'Stage'),
+        'stage_sequence': fields.related('stage_id','sequence',type='integer', string='Stage Sequence'),
         'nbr': fields.integer('# of Issues', readonly=True),
         'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True, group_operator="avg"),
         'working_hours_close': fields.float('Avg. Working Hours to Close', readonly=True, group_operator="avg"),
@@ -80,7 +73,6 @@
                     to_char(c.create_date, 'YYYY-MM-DD') as day,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
-                    c.state,
                     c.user_id,
                     c.working_hours_open,
                     c.working_hours_close,

=== modified file 'project_issue/report/project_issue_report_view.xml'
--- project_issue/report/project_issue_report_view.xml	2013-04-22 15:34:49 +0000
+++ project_issue/report/project_issue_report_view.xml	2013-06-05 13:32:29 +0000
@@ -20,7 +20,7 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
-                    <field name="state" invisible="1"/>
+                    <field name="stage_sequence" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="nbr" string="#Project Issues" sum="#Number of Project Issues"/>
                     <field name="delay_open" avg="Avg Opening Delay"/>
@@ -36,7 +36,6 @@
             <field name="model">project.issue.report</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Project Issue" type="bar">
-                    <field name="state"/>
                     <field name="nbr" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -49,10 +48,6 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="creation_date"/>
-                    <filter  icon="terp-camera_test" string="New" domain="[('state','=','draft')]"/>
-                    <filter  icon="terp-check" string="To Do" domain="[('state','=','open')]"/>
-                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
-                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>

=== removed file 'project_issue/test/cancel_issue.yml'
--- project_issue/test/cancel_issue.yml	2012-12-21 12:17:53 +0000
+++ project_issue/test/cancel_issue.yml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
--
-  In order to test process of issue tracking in OpenERP, I cancel the unqualified Issue.
--
-  !python {model: project.issue}: |
-    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the issue is in cancel state.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
-    - state == 'cancelled' 
--
-  I re-open the Issue.
--
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the state of issue after open it. 
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in open state}:
-    - state == 'open' 
--
-  I put the issue in pending state.
--
-  !python {model: project.issue}: |
-    self.case_pending(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check the state of issue after put it in pending state.
--  
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
-    - state == 'pending'
--
-  I cancel the issue is in pending state.
--
-  !python {model: project.issue}: |
-    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the issue is in cancel state.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
-    - state == 'cancelled'
--
-  I close Issue.
--
-  !python {model: project.issue}: |
-    self.case_close(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--  
-  I check state of Issue after close.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in done state}:
-    - state == 'done'
--
-  I cancel the issue is in done state.
--
-  !python {model: project.issue}: |
-    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the issue is in cancel state.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
-    - state == 'cancelled'

=== modified file 'project_issue/test/issue_process.yml'
--- project_issue/test/issue_process.yml	2012-11-29 22:26:45 +0000
+++ project_issue/test/issue_process.yml	2013-06-05 13:32:29 +0000
@@ -1,24 +1,4 @@
 -
-  In order to test process of issue tracking in OpenERP, I Open the Issue.
--
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check state of Issue after opened it.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
-    - state == 'open'       
-- 
-  Now I put Issue in pending due to need more information.
-- 
-  !python {model: project.issue}: |
-    self.case_pending(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check state after put in pending.
--  
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
-    - state == 'pending'
--
   I send mail to get more details. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic).
 -
   !python {model: mail.mail }: |
@@ -30,28 +10,3 @@
         self.send_mail(cr, uid, [new_id], context=ctx)
     except Exception, e:
         pass  
--
-  After getting sufficient details, I re-open Issue from pending state.
--
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check state of Issue after re-opened.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
-    - state == 'open'   
--
-  I create Task for Issue.
--
-  !python {model: project.issue}: |
-    self.convert_issue_task(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I close Issue after resolving it
--
-  !python {model: project.issue}: |
-    self.case_close(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--  
-  I Check state of Issue after closed.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in done state}:
-    - state == 'done'

=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml	2013-02-25 13:38:04 +0000
+++ project_long_term/project_long_term_view.xml	2013-06-05 13:32:29 +0000
@@ -199,7 +199,6 @@
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
                                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-                                    <field name="state"/>
                                   </tree>
                              </field>
                         </page>

=== modified file 'project_long_term/test/phase_process.yml'
--- project_long_term/test/phase_process.yml	2012-11-29 22:26:45 +0000
+++ project_long_term/test/phase_process.yml	2013-06-05 13:32:29 +0000
@@ -32,48 +32,3 @@
         if not phase.previous_phase_ids and phase.constraint_date_start:
             assert  _convert(phase.date_start) >= _convert(phase.constraint_date_start), "Phase does not start in proper date."
             _check(phase, _convert, _check)
--
-  I open phase.
--
-  !python {model: project.phase}: |
-    self.set_open(cr, uid, [ref("project_phase_1")])
--
-  I check state of phase after opened.
--
-  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in open state}:
-    - state == "open"
--
-  I put phase in pending state.
--
-  !python {model: project.phase}: |
-    self.set_pending(cr, uid, [ref("project_phase_1")])
--
-  I check state of phase after put in pending.
--
-  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in pending state}:
-    - state == "pending"
--
-  I make Phase in cancel state.
--
-  !python {model: project.phase}: |
-    self.set_cancel(cr, uid, [ref("project_phase_1")])
--
-  I check state of phase after cancelled.
--
-  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in cancel state}:
-    - state == "cancelled"
--
-  I put again in draft phase.
--
-  !python {model: project.phase}: |
-    self.set_draft(cr, uid, [ref("project_phase_1")])
--
-  I close phase.
--
-  !python {model: project.phase}: |
-    self.set_done(cr, uid, [ref("project_phase_1")])
--
-  I check state of phase after closed.
--
-  !assert {model: project.phase, id: project_phase_1, severity: error, string: Phase should be in done state}:
-    - state == "done"

=== modified file 'project_long_term/test/task_process.yml'
--- project_long_term/test/task_process.yml	2012-11-29 22:26:45 +0000
+++ project_long_term/test/task_process.yml	2013-06-05 13:32:29 +0000
@@ -14,6 +14,6 @@
   !python {model: project.project}: |
     prj = self.browse(cr, uid, [ref("project.project_project_1")])[0]
     for task in prj.tasks:
-        if task.state in ('done','cancelled'):
+        if task.stage_sequence in (7,8):
             continue
         assert task.user_id and task.date_start and task.date_end, "Project tasks not scheduled"

=== modified file 'project_mrp/project_mrp.py'
--- project_mrp/project_mrp.py	2013-04-15 10:23:49 +0000
+++ project_mrp/project_mrp.py	2013-06-05 13:32:29 +0000
@@ -30,21 +30,7 @@
         'sale_line_id': fields.related('procurement_id', 'sale_line_id', type='many2one', relation='sale.order.line', store=True, string='Sales Order Line'),
     }
 
-    def _validate_subflows(self, cr, uid, ids):
-        wf_service = netsvc.LocalService("workflow")
-        for task in self.browse(cr, uid, ids):
-            if task.procurement_id:
-                wf_service.trg_write(uid, 'procurement.order', task.procurement_id.id, cr)
-
-    def do_close(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_task, self).do_close(cr, uid, ids, *args, **kwargs)
-        self._validate_subflows(cr, uid, ids)
-        return res
-
-    def do_cancel(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_task, self).do_cancel(cr, uid, ids, *args, **kwargs)
-        self._validate_subflows(cr, uid, ids)
-        return res
+project_task()
 
 class product_product(osv.osv):
     _inherit = "product.product"
@@ -66,11 +52,11 @@
             return {}
         res_sale = {}
         res = super(sale_order, self)._picked_rate(cr, uid, ids, name, arg, context=context)
-        cr.execute('''select sol.order_id as sale_id, t.state as task_state ,
+        cr.execute('''select sol.order_id as sale_id ,
                     t.id as task_id, sum(sol.product_uom_qty) as total
                     from project_task as t
                     left join sale_order_line as sol on sol.id = t.sale_line_id
-                    where sol.order_id in %s group by sol.order_id,t.state,t.id ''',(tuple(ids),))
+                    where sol.order_id in %s group by sol.order_id,t.id ''',(tuple(ids),))
         sale_task_data = cr.dictfetchall()
 
         if not sale_task_data:

=== modified file 'project_mrp/project_mrp_view.xml'
--- project_mrp/project_mrp_view.xml	2012-12-21 16:48:08 +0000
+++ project_mrp/project_mrp_view.xml	2013-06-05 13:32:29 +0000
@@ -26,7 +26,7 @@
             <field name="model">project.task</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <field name="state" position="after">
+                <field name="partner_id" position="after">
                     <field name="sale_line_id" string="Order Line"/>
                 </field>
             </field>

=== modified file 'project_mrp/project_procurement.py'
--- project_mrp/project_procurement.py	2013-04-15 10:23:49 +0000
+++ project_mrp/project_procurement.py	2013-06-05 13:32:29 +0000
@@ -39,7 +39,7 @@
         @return: True or False.
         """
         for p in self.browse(cr, uid, ids, context=context):
-            if (p.product_id.type=='service') and (p.procure_method=='make_to_order') and p.task_id and (p.task_id.state not in ('done', 'cancelled')):
+            if (p.product_id.type=='service') and (p.procure_method=='make_to_order') and p.task_id and (p.task_id.stage_sequence not in (7,8)):
                 return False
         return True
 

=== modified file 'project_mrp/test/project_task_procurement.yml'
--- project_mrp/test/project_task_procurement.yml	2013-03-26 19:54:00 +0000
+++ project_mrp/test/project_task_procurement.yml	2013-06-05 13:32:29 +0000
@@ -30,18 +30,3 @@
     assert datetime.strptime(task.date_deadline, '%Y-%m-%d') == datetime.strptime(procurement.date_planned[:10], '%Y-%m-%d'), 'Deadline does not correspond.'
     if procurement.product_id.product_manager:
         assert task.user_id.id == procurement.product_id.product_manager.id, 'Allocated Person does not correspond with Service Product Manager.'
--
-  I close that task.
--
-  !python {model: project.task}: |
-    task_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
-    assert task_ids, "Task is not generated for Service Order Line."
-    self.do_close(cr, uid, task_ids, context=context)
--
-  I check procurement of Service Order Line after closed task.
--
-  !python {model: procurement.order}: |
-    procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
-    assert procurement_ids, "Procurement is not generated for Service Order Line."
-    procurement = self.browse(cr, uid, procurement_ids[0], context=context)
-    assert procurement.state == 'done' , "Procurement should be closed."

=== modified file 'project_timesheet/test/worktask_entry_to_timesheetline_entry.yml'
--- project_timesheet/test/worktask_entry_to_timesheetline_entry.yml	2013-05-31 08:20:03 +0000
+++ project_timesheet/test/worktask_entry_to_timesheetline_entry.yml	2013-06-05 13:32:29 +0000
@@ -66,17 +66,8 @@
     planned_hours: 20.0
     project_id: project_project_timesheetmanagement0
     remaining_hours: 20.0
-    state: draft
     user_id: res_users_hrmanager0
 -
-  Open the task
--
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_getalltimesheetrecords0")], {"lang":
-      "en_US", "active_ids": [ref("project_project_timesheetmanagement0")], "tz":
-      False, "active_model": "project.project", "department_id": False, "project_id":
-      False, "active_id": ref("project_project_timesheetmanagement0"), })
--
   Make a work task entry 'Get work calendar of all employees' of 10 hours done by HR manager
 -
   !record {model: project.task, id: project_task_getalltimesheetrecords0}:

=== modified file 'sale_crm/sale_crm_view.xml'
--- sale_crm/sale_crm_view.xml	2013-06-04 13:44:14 +0000
+++ sale_crm/sale_crm_view.xml	2013-06-05 13:32:29 +0000
@@ -9,8 +9,9 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/header/button[@name='case_mark_lost']" position="after">
-                        <button states="done" string="Create Quotation" name="%(action_crm_make_sale)d" type="action"/>
-                        <button states="draft,open,pending" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
+                        <field name="stage_sequence" invisible="1"/>
+                        <button attrs="{'invisible':[('stage_sequence','!=',6)]}" string="Create Quotation" name="%(action_crm_make_sale)d" type="action"/>
+                        <button attrs="{'invisible':[('stage_sequence','in',[6,7,8])]}" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
                     </xpath>
                 </data>
             </field>