Merge lp:~openerp-dev/openobject-addons/trunk-kanban-column-vme-new into lp:openobject-addons

[Vidhin Mehta (OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-kanban-column-vme-new]

8989. By Vidhin Mehta (OpenERP) on 2013-11-27

[CHANGE]comment

8990. By Vidhin Mehta (OpenERP) on 2013-11-27

[REM]limit

8991. By Vidhin Mehta (OpenERP) on 2013-12-02

[IMP]if default_XXX is not found in context than default behaviour of stage given.

8992. By Vidhin Mehta (OpenERP) on 2013-12-02

[IMP]forgot to add vals

8993. By Vidhin Mehta (OpenERP) on 2013-12-02

[ERM]jobid from tree view

8994. By Darshan Kalola(OpenERP) on 2014-02-21

[MERGE]sync with trunk and resolve conflicts.

8995. By Mahendra Barad(OpenERP) on 2014-02-25

[Merge]with trunk

8996. By Mahendra Barad(OpenERP) on 2014-02-25

[IMP]job_ids

8997. By Mahendra Barad(OpenERP) on 2014-02-27

[IMP]stage sequence changed in .sequence object if default projetc_id, section_id or job_id not in stage object

8998. By Mahendra Barad(OpenERP) on 2014-02-27

[IMP]stage load sequence if context in project_issue

8999. By Mahendra Barad(OpenERP) on 2014-02-27

[IMP]added access rule for new created sequence object

Unmerged revisions

8999. By Mahendra Barad(OpenERP) on 2014-02-27

[IMP]added access rule for new created sequence object

8998. By Mahendra Barad(OpenERP) on 2014-02-27

[IMP]stage load sequence if context in project_issue

8997. By Mahendra Barad(OpenERP) on 2014-02-27

[IMP]stage sequence changed in .sequence object if default projetc_id, section_id or job_id not in stage object

8996. By Mahendra Barad(OpenERP) on 2014-02-25

[IMP]job_ids

8995. By Mahendra Barad(OpenERP) on 2014-02-25

[Merge]with trunk

8994. By Darshan Kalola(OpenERP) on 2014-02-21

[MERGE]sync with trunk and resolve conflicts.

8993. By Vidhin Mehta (OpenERP) on 2013-12-02

[ERM]jobid from tree view

8992. By Vidhin Mehta (OpenERP) on 2013-12-02

[IMP]forgot to add vals

8991. By Vidhin Mehta (OpenERP) on 2013-12-02

[IMP]if default_XXX is not found in context than default behaviour of stage given.

8990. By Vidhin Mehta (OpenERP) on 2013-11-27

[REM]limit

=== modified file 'crm/__init__.py'
--- crm/__init__.py	2014-01-15 09:38:05 +0000
+++ crm/__init__.py	2014-02-27 12:12:58 +0000
@@ -29,6 +29,6 @@
 import res_partner
 import res_config
 import base_partner_merge
-
+import tests
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'crm/__openerp__.py'
--- crm/__openerp__.py	2014-01-15 09:38:05 +0000
+++ crm/__openerp__.py	2014-02-27 12:12:58 +0000
@@ -75,6 +75,8 @@
         'wizard/crm_opportunity_to_phonecall_view.xml',
 
         'wizard/crm_merge_opportunities_view.xml',
+        
+        'wizard/crm_case_stage_management_view.xml',
 
         'crm_view.xml',
 

=== modified file 'crm/crm.py'
--- crm/crm.py	2014-02-11 11:09:36 +0000
+++ crm/crm.py	2014-02-27 12:12:58 +0000
@@ -47,6 +47,17 @@
         'active': lambda *a: 1,
     }
 
+class crm_case_stage_sequence(osv.osv):
+    _name = 'crm.case.stage.sequence'
+    _table = 'section_stage_rel'
+    _description = 'Crm Case Stage Sequence'
+    _order = 'sequence'
+    _columns = {
+        'section_id': fields.many2one('crm.case.section', 'Sequence/Section'),
+        'stage_id': fields.many2one('crm.case.stage', 'Sequence/Stage'),
+        'sequence': fields.integer('Sequence')
+    }
+
 class crm_case_stage(osv.osv):
     """ Model for case stages. This models the main stages of a document
         management flow. Main CRM objects (leads, opportunities, project
@@ -87,6 +98,16 @@
         'case_default': True,
     }
 
+    def write(self, cr, uid, ids, vals, context=None):
+        section_id = context.get('default_section_id')
+        crm_case_stage_sequence = self.pool.get('crm.case.stage.sequence')
+
+        if section_id:
+            lead_ids = crm_case_stage_sequence.search(cr, uid, [('stage_id', '=', ids),('section_id', '=', section_id)], context=context)
+            crm_case_stage_sequence.write(cr, uid, lead_ids, vals , context=context)
+        else:
+            return super(crm_case_stage, self).write(cr, uid, ids, vals, context=context)
+        return True
 
 class crm_case_section(osv.osv):
     """ Model for sales teams. """

=== modified file 'crm/crm_case_section_view.xml'
--- crm/crm_case_section_view.xml	2014-02-20 16:38:15 +0000
+++ crm/crm_case_section_view.xml	2014-02-27 12:12:58 +0000
@@ -42,7 +42,7 @@
             <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
             <field name="context">{
                     'search_default_section_id': [active_id],
-                    'default_section_id': active_id,
+                    'search_default_assigned_to_me': 1,
                     'stage_type': 'opportunity',
                     'default_type': 'opportunity',
                     'default_user_id': uid,

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2014-02-20 16:38:15 +0000
+++ crm/crm_lead.py	2014-02-27 12:12:58 +0000
@@ -143,9 +143,15 @@
             search_domain += ['|', ('type', '=', type), ('type', '=', 'both')]
         # perform search
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
+        if section_id:
+            sequence_ids = self.pool.get('crm.case.stage.sequence').search_read(cr, uid, [('section_id', '=', section_id), ('stage_id', 'in', stage_ids)], ['stage_id'], order=order, context=context)
+            type_ids = map(lambda type_ids: type_ids['stage_id'][0], sequence_ids)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
-        result.sort(lambda x, y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
+        if section_id:
+            result.sort(lambda x,y: cmp(type_ids.index(x[0]), type_ids.index(y[0])))
+        else:
+            result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
 
         fold = {}
         for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2014-02-12 18:08:45 +0000
+++ crm/crm_lead_view.xml	2014-02-27 12:12:58 +0000
@@ -259,7 +259,7 @@
             <field name="name">CRM - Leads Kanban</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <kanban default_group_by="stage_id">
+                <kanban default_group_by="stage_id" stage_management="crm.case.stage.management" stage_options = "{'group_by':'stage_id'}">
                     <field name="stage_id"/>
                     <field name="color"/>
                     <field name="priority"/>
@@ -545,7 +545,7 @@
                 <search string="Search Opportunities">
                     <field name="name" string="Opportunity" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                     <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="section_id" groups="base.group_multi_salesteams"/>
                     <field name="user_id"/>
                     <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="stage_id" domain="[]"/>

=== modified file 'crm/security/ir.model.access.csv'
--- crm/security/ir.model.access.csv	2013-11-27 15:32:57 +0000
+++ crm/security/ir.model.access.csv	2014-02-27 12:12:58 +0000
@@ -16,6 +16,8 @@
 access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
 access_crm_case_stage,crm.case.stage,model_crm_case_stage,,1,0,0,0
 access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1
+access_crm_case_stage_sequence,crm.case.stage.sequence,model_crm_case_stage_sequence,,1,0,0,0
+access_crm_case_stage_sequence_manager,crm.case.stage.sequence,model_crm_case_stage_sequence,base.group_sale_manager,1,1,1,1
 access_crm_case_resource_type_user,crm_case_resource_type user,model_crm_case_resource_type,base.group_sale_salesman,1,1,1,0
 access_crm_case_resource_type_manager,crm_case_resource_type manager,model_crm_case_resource_type,base.group_sale_manager,1,1,1,1
 access_crm_phonecall_report_user,crm.phonecall.report.user,model_crm_phonecall_report,base.group_sale_salesman,1,0,0,0

=== added directory 'crm/tests'
=== added file 'crm/tests/__init__.py'
--- crm/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ crm/tests/__init__.py	2014-02-27 12:12:58 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    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 . import test_crm_stages_case
+checks = [
+          test_crm_stages_case,
+      ]
\ No newline at end of file

=== added file 'crm/tests/test_crm_stages_case.py'
--- crm/tests/test_crm_stages_case.py	1970-01-01 00:00:00 +0000
+++ crm/tests/test_crm_stages_case.py	2014-02-27 12:12:58 +0000
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    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 openerp.osv.orm import except_orm
+from openerp.tests import common
+
+
+class TestCrmStagesCase(common.TransactionCase):
+    def setUp(self):
+        super(TestCrmStagesCase, self).setUp()
+        
+    def test_00_stage_management(self):
+        cr, uid = self.cr, self.uid
+        crm_stage_management = self.registry('crm.case.stage.management')
+        crm_case_section = self.registry('crm.case.section')
+        crm_case_stage= self.registry('crm.case.stage')
+        crm_lead = self.registry('crm.lead');
+        crm_case_section_id = crm_case_section.create(cr, uid, {'name':'test_section'},context={})
+        context = {'default_section_id': crm_case_section_id, 'default_action':'create'}
+        
+        ''' For create when default_section_id pass in context
+                If same name is present than returns its id otherwise create new.
+                 and link with given section.
+        '''
+        
+        stage_m2m_oldlist = crm_case_section.browse(cr, uid, crm_case_section_id, context=context).stage_ids
+        crm_stage_management.create(cr, uid, {'name':'First','action':'create'},context)
+        crm_stage_management.create(cr, uid, {'name':'First','action':'create'},context)
+        check_len_id = crm_case_stage.search(cr, uid, [('name','=', 'First')], context=context)
+        self.assertEqual(len(check_len_id), 1)
+        opportunity_id = crm_lead.create(cr, uid, {'name':'Test1','stage_id': check_len_id[0],'section_id':crm_case_section_id})
+        test1 = check_len_id
+        stage_m2m_newlist = crm_case_section.browse(cr, uid, crm_case_section_id, context=context).stage_ids
+        self.assertEqual(len(stage_m2m_oldlist) + 1, len(stage_m2m_newlist))
+        
+        ''' For edit when default_section_id pass in context
+                If same name is present than returns its id otherwise create new.
+                and link with given section and remove old link with section and crm_lead.
+        '''
+        
+        context.update({'active_id':test1[0], 'default_action':'write'})
+        crm_stage_management.modify_stage(cr, uid, {'name':'Second'},context=context)
+        test2 = crm_case_stage.search(cr, uid, [('name','=', 'Second')], context=context)
+        stage_m2m_newlist = crm_case_section.browse(cr, uid, crm_case_section_id, context=context).stage_ids
+        
+        check_crm_case_stage_id = crm_lead.browse(cr, uid, opportunity_id, context).stage_id.id
+        self.assertEqual(check_crm_case_stage_id, test2[0])
+        self.assertIn(test2[0], [x.id for x in stage_m2m_newlist])
+        
+        ''' For unlink when default_section_id pass in context
+                It will unlink relation, not delete.
+        '''
+        
+        stage_m2m_oldlist = crm_case_section.browse(cr, uid, crm_case_section_id, context=context).stage_ids
+        crm_stage_management.unlink(cr, uid, test2, context=context)
+        stage_m2m_newlist = crm_case_section.browse(cr, uid, crm_case_section_id, context=context).stage_ids
+        self.assertEqual(len(stage_m2m_oldlist) -1, len(stage_m2m_newlist))
+        unlink_id = crm_case_stage.search(cr, uid, [('name','=', 'Second')], context=context)
+        self.assertEqual(unlink_id, test2)

=== modified file 'crm/wizard/__init__.py'
--- crm/wizard/__init__.py	2012-12-05 13:03:21 +0000
+++ crm/wizard/__init__.py	2014-02-27 12:12:58 +0000
@@ -24,5 +24,6 @@
 import crm_opportunity_to_phonecall
 import crm_lead_to_opportunity
 import crm_merge_opportunities
+import crm_case_stage_management
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'crm/wizard/crm_case_stage_management.py'
--- crm/wizard/crm_case_stage_management.py	1970-01-01 00:00:00 +0000
+++ crm/wizard/crm_case_stage_management.py	2014-02-27 12:12:58 +0000
@@ -0,0 +1,100 @@
+# -*- 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 openerp.osv import osv,fields
+
+class crm_case_stage_management(osv.TransientModel):
+    
+    _name = "crm.case.stage.management"
+    _description = "Stage of opportunity"
+    _columns = {
+        'name': fields.char('Stage Name', required= True, size=64),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:context = {}
+        old_stage_id = context.get('active_id')
+        res = super(crm_case_stage_management, self).default_get(cr, uid, fields, context)
+        
+        if(context.get('default_action') == "create"):return res
+        crm_case_type = self.pool.get("crm.case.stage").browse(cr , uid, old_stage_id, context)
+        res.update({'name': crm_case_type.name})
+        return res
+
+    def create(self, cr, uid, vals, context):
+        if context is None: context = {}
+        action = context.get('default_action')
+        if action == 'create': self.create_stage(cr, uid, vals.get('name'), context)
+        if action == 'write': self.modify_stage(cr, uid, vals, context)
+        return None
+    
+    def create_stage(self, cr, uid, name, context):
+        if context is None:context = {}
+        section_id = context.get('default_section_id')
+        
+        crm_case_section = self.pool.get('crm.case.section')
+        crm_case_stage = self.pool.get("crm.case.stage")
+        
+        if section_id:
+            new_id = crm_case_stage.search(cr, uid, [('name','=', name)], context=context, limit=1)
+            if not new_id:
+                new_id = [crm_case_stage.create(cr, uid, {'name': name}, context=context)]
+            crm_case_section.write(cr, uid, [section_id], {'stage_ids': [(4, new_id[0])]}, context=context)
+        else:
+            new_id = [crm_case_stage.create(cr, uid, {'name': name}, context=context)]
+        return new_id
+
+    def unlink(self, cr, uid, ids, context):
+        if context is None: context = {}
+        section_id = context.get('default_section_id')
+        
+        crm_case_section = self.pool.get('crm.case.section')
+        crm_lead = self.pool.get('crm.lead')
+        crm_case_stage = self.pool.get("crm.case.stage")
+        
+        if section_id:
+            for stage_id in ids:
+                crm_lead_ids = crm_lead.search(cr, uid, [('stage_id','=',stage_id),('section_id','=', section_id)])
+                crm_lead.write(cr, uid, crm_lead_ids, {'stage_id': False} , context=context)
+                crm_case_section.write(cr, uid, section_id, {'stage_ids': [(3, stage_id)]}, context=context)
+        else:
+            crm_case_stage.unlink(cr, uid, ids, context=context)
+        return True
+    
+    def modify_stage(self,cr, uid, vals, context=None):
+        old_stage_id = context.get('active_id')
+        section_id = context.get('default_section_id')
+        
+        crm_case_section = self.pool.get('crm.case.section')
+        crm_lead = self.pool.get('crm.lead')
+        crm_case_stage = self.pool.get("crm.case.stage")
+        if section_id:
+            new_case_type_id = crm_case_stage.search(cr, uid, [('name','=', vals.get('name'))], context=context, limit=1)
+            if not new_case_type_id:
+                vals['section_ids'] = [(6, 0, [section_id])]
+                new_case_type_id = [crm_case_stage.copy(cr, uid, old_stage_id, default=vals, context=context)]
+            new_stage_id = new_case_type_id[0]
+            
+            opportunity_ids = crm_lead.search(cr, uid, [('stage_id','=', old_stage_id),('section_id','=', section_id)], context=context)
+            crm_lead.write(cr, uid, opportunity_ids, {'stage_id': new_stage_id} , context=context)
+            if section_id:
+                crm_case_section.write(cr, uid, [section_id], {'stage_ids': [(3, old_stage_id),(4, new_stage_id),]}, context=context)
+        else:
+            crm_case_stage.write(cr, uid, old_stage_id, vals, context=context)
+        return True

=== added file 'crm/wizard/crm_case_stage_management_view.xml'
--- crm/wizard/crm_case_stage_management_view.xml	1970-01-01 00:00:00 +0000
+++ crm/wizard/crm_case_stage_management_view.xml	2014-02-27 12:12:58 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="crm_stage_form_wizard">
+            <field name="name">crm.case.stage.management.form</field>
+            <field name="model">crm.case.stage.management</field>
+            <field name="arch" type="xml">
+                <form string="Stage" version="7.0">
+                    <group>
+                        <group>
+                             <field name="name"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml	2014-02-11 12:04:33 +0000
+++ hr/hr_view.xml	2014-02-27 12:12:58 +0000
@@ -338,6 +338,8 @@
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
+                        <div name="hr_applicant_button" class="oe_right oe_button_box">
+                        </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name" class="oe_inline"/></h1>
@@ -484,4 +486,4 @@
        <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file

=== modified file 'hr_recruitment/__init__.py'
--- hr_recruitment/__init__.py	2012-04-02 05:44:18 +0000
+++ hr_recruitment/__init__.py	2014-02-27 12:12:58 +0000
@@ -23,5 +23,6 @@
 import report
 import wizard
 import res_config
+import tests
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'hr_recruitment/__openerp__.py'
--- hr_recruitment/__openerp__.py	2014-02-10 07:21:00 +0000
+++ hr_recruitment/__openerp__.py	2014-02-27 12:12:58 +0000
@@ -48,6 +48,7 @@
     ],
     'data': [
         'wizard/hr_recruitment_create_partner_job_view.xml',
+        'wizard/hr_recruitment_stage_management_view.xml',
         'hr_recruitment_view.xml',
         'hr_recruitment_menu.xml',
         'security/hr_recruitment_security.xml',

=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py	2014-02-12 10:43:40 +0000
+++ hr_recruitment/hr_recruitment.py	2014-02-27 12:12:58 +0000
@@ -41,6 +41,17 @@
         'name': fields.char('Source Name', size=64, required=True, translate=True),
     }
 
+class hr_recruitment_stage_sequence(osv.osv):
+    _name = 'hr.recruitment.stage.sequence'
+    _table = 'job_stage_rel'
+    _description = 'Hr Recruitment Stage Sequence'
+    _order = 'sequence'
+    _columns = {
+        'job_id': fields.many2one('hr.job', 'Sequence/Job'),
+        'stage_id': fields.many2one('hr.recruitment.stage', 'Sequence/Stage'),
+        'sequence': fields.integer('Sequence')
+    }
+
 class hr_recruitment_stage(osv.osv):
     """ Stage of HR Recruitment """
     _name = "hr.recruitment.stage"
@@ -49,17 +60,38 @@
     _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."),
+        'job_ids': fields.many2many('hr.job',  'job_stage_rel', 'stage_id','job_id', 'Stages'),
         'requirements': fields.text('Requirements'),
+        'case_default': fields.boolean('Default for New Job'),
         'template_id': fields.many2one('email.template', 'Use template', help="If set, a message is posted on the applicant using the template when the applicant is set to the stage."),
         'fold': fields.boolean('Folded in Kanban View',
                                help='This stage is folded in the kanban view when'
                                'there are no records in that stage to display.'),
     }
+
+    def _get_default_job_id(self, cr, uid, ctx={}):
+        job = ctx.get('default_job_id', False)
+        if type(job) in (int, long):
+            return [job]
+        return job
+    
     _defaults = {
         'sequence': 1,
+        'job_ids': _get_default_job_id,
+        'case_default': True,
     }
 
+    def write(self, cr, uid, ids, vals, context=None):
+        job_id = context.get('default_job_id')
+        hr_recruitment_stage_sequence = self.pool.get('hr.recruitment.stage.sequence')
+
+        if job_id:
+            recruitment_ids = hr_recruitment_stage_sequence.search(cr, uid, [('stage_id', '=', ids),('job_id', '=', job_id)], context=context)
+            hr_recruitment_stage_sequence.write(cr, uid, recruitment_ids, vals , context=context)
+        else:
+            return super(hr_recruitment_stage, self).write(cr, uid, ids, vals, context=context)
+        return True
+
 class hr_recruitment_degree(osv.osv):
     """ Degree of HR Recruitment """
     _name = "hr.recruitment.degree"
@@ -88,29 +120,29 @@
         },
     }
 
-    def _get_default_department_id(self, cr, uid, context=None):
+    def _get_default_job_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)
-
+        return (self._resolve_job_id_from_context(cr, uid, context=context) or False)
+    
     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, [('fold', '=', False)], context=context)
+        job_id = self._get_default_job_id(cr, uid, context=context)
+        return self.stage_find(cr, uid, [], job_id, [('sequence', '=', '1')], context=context)
 
-    def _resolve_department_id_from_context(self, cr, uid, context=None):
-        """ Returns ID of department based on the value of 'default_department_id'
-            context key, or None if it cannot be resolved to a single
+    def _resolve_job_id_from_context(self, cr, uid, context=None):
+        """ Returns ID of job based on the value of 'default_job_id'
+             context key, or None if it cannot be resolved to a single
             department.
         """
         if context is None:
             context = {}
-        if type(context.get('default_department_id')) in (int, long):
-            return context.get('default_department_id')
-        if isinstance(context.get('default_department_id'), basestring):
-            department_name = context['default_department_id']
-            department_ids = self.pool.get('hr.department').name_search(cr, uid, name=department_name, context=context)
-            if len(department_ids) == 1:
-                return int(department_ids[0][0])
+        if type(context.get('default_job_id')) in (int, long):
+            return context.get('default_job_id')
+        if isinstance(context.get('default_job_id'), basestring):
+            job_name = context['default_job_id']
+            job_ids = self.pool.get('hr.job').name_search(cr, uid, name=job_name, context=context)
+            if len(job_ids) == 1:
+                return int(job_ids[0][0])
         return None
 
     def _read_group_stage_ids(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
@@ -122,18 +154,23 @@
             order = "%s desc" % order
         # retrieve section_id from the context and write the domain
         # - ('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)
+        # - OR ('job_id', '=', False), ('fold', '=', False): add default columns that are not folded
+        # - OR ('job_id', 'in', job_id), ('fold', '=', False) if job_id: add department columns that are not folded
+        job_id = self._resolve_job_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_ids', '=', job_id)]
+        search_domain += ['|', '|', ('id', 'in', ids), ('job_ids', '=', False), ('case_default', '=', True)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
+        if job_id:
+            sequence_ids = self.pool.get('hr.recruitment.stage.sequence').search_read(cr, uid, [('job_id', '=', job_id), ('stage_id', 'in', stage_ids)], ['stage_id'], order=order, context=context)
+            type_ids = map(lambda type_ids: type_ids['stage_id'][0], sequence_ids)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
-        result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
-
+        if job_id:
+            result.sort(lambda x,y: cmp(type_ids.index(x[0]), type_ids.index(y[0])))
+        else:
+            result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
         fold = {}
         for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
             fold[stage.id] = stage.fold or False
@@ -188,7 +225,7 @@
         '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)]"),
+                        domain="['|', ('job_ids', '=', job_id), ('job_ids', '=', False)]"),
         'last_stage_id': fields.many2one('hr.recruitment.stage', 'Last Stage',
                                          help='Stage of the applicant before being in the current stage. Used for lost cases analysis.'),
         'categ_ids': fields.many2many('hr.applicant_category', string='Tags'),
@@ -229,7 +266,7 @@
         'active': lambda *a: 1,
         'user_id': lambda s, cr, uid, c: uid,
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
-        'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
+        'job_id': lambda s, cr, uid, c: s._get_default_job_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),
         'color': 0,
         'date_last_stage_update': fields.datetime.now,
@@ -272,17 +309,16 @@
         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_ids', 'in', job_ids)]
         # AND with the domain in parameter
         search_domain += list(domain)
         # perform search, return the first found
@@ -395,6 +431,7 @@
         if vals.get('user_id'):
             vals['date_start'] = fields.datetime.now()
         # stage_id: track last stage before update
+        res = True
         if 'stage_id' in vals:
             vals['date_last_stage_update'] = fields.datetime.now()
             for applicant in self.browse(cr, uid, ids, context=None):
@@ -522,6 +559,7 @@
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
                                     help="Email alias for this job position. New emails will automatically "
                                          "create new applicants for this job position."),
+        'stage_ids':fields.many2many('hr.recruitment.stage',  'job_stage_rel','job_id', 'stage_id', 'Stages'),
         'address_id': fields.many2one('res.partner', 'Job Location', help="Address where employees are working"),
         'application_ids': fields.one2many('hr.applicant', 'job_id', 'Applications'),
         'manager_id': fields.related('department_id', 'manager_id', type='many2one', string='Department Manager', relation='hr.employee', readonly=True, store=True),
@@ -534,7 +572,12 @@
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.company_id.partner_id.id
 
+    def _get_stage_common(self, cr, uid, context):
+        return self.pool.get('hr.recruitment.stage').search(cr, uid, [('case_default','=',1)], context=context)
+
     _defaults = {
+        'alias_domain': False, # always hide alias during creation
+        'stage_ids': _get_stage_common,
         'address_id': _address_get
     }
 
@@ -596,4 +639,4 @@
         'name': fields.char('Name', size=64, required=True, translate=True),
     }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'hr_recruitment/hr_recruitment_demo.xml'
--- hr_recruitment/hr_recruitment_demo.xml	2013-12-24 05:37:04 +0000
+++ hr_recruitment/hr_recruitment_demo.xml	2014-02-27 12:12:58 +0000
@@ -127,32 +127,39 @@
         <field name="state">recruit</field>
         <field name="no_of_recruitment">4</field>
         <field name="survey_id" ref="survey_job_0"/>
+        <field name= "stage_ids" eval="[(4, stage_job1),(4, stage_job2),(4, stage_job3),(4, stage_job4),(4, stage_job5),(4, stage_job6)]" />
     </record>
     <record id="hr.job_ceo" model="hr.job">
         <field name="survey_id" ref="survey_job_0"/>
+        <field name= "stage_ids" eval="[(4, stage_job3),(4, stage_job4),(4, stage_job5),(4, stage_job6)]" />
     </record>
     <record id="hr.job_cto" model="hr.job">
         <field name="survey_id" ref="survey_job_0"/>
+        <field name= "stage_ids" eval="[(4, stage_job1),(4, stage_job4),(4, stage_job5),(4, stage_job6)]" />
     </record>
     <record id="hr.job_consultant" model="hr.job">
         <field name="state">recruit</field>
         <field name="no_of_recruitment">1</field>
         <field name="survey_id" ref="survey_job_0"/>
+        <field name= "stage_ids" eval="[(4, stage_job1),(4, stage_job2),(4, stage_job3),(4, stage_job4)]" />
     </record>
     <record id="hr.job_hrm" model="hr.job">
         <field name="no_of_recruitment">1</field>
         <field name="state">recruit</field>
         <field name="survey_id" ref="survey_job_0"/>
+        <field name= "stage_ids" eval="[(4, stage_job1),(4, stage_job2),(4, stage_job3),(4, stage_job4)]" />
     </record>
     <record id="hr.job_marketing" model="hr.job">
         <field name="state">recruit</field>
         <field name="no_of_recruitment">3</field>
         <field name="survey_id" ref="survey_job_0"/>
+        <field name= "stage_ids" eval="[(4, stage_job1),(4, stage_job2),(4, stage_job3),(4, stage_job4)]" />
     </record>
     <record id="hr.job_trainee" model="hr.job">
         <field name="state">recruit</field>
         <field name="no_of_recruitment">6</field>
         <field name="survey_id" ref="survey_job_0"/>
+        <field name= "stage_ids" eval="[(4, stage_job1),(4, stage_job2),(4, stage_job3),(4, stage_job4)]" />
     </record>
 
     <record id="message_application_demo" model="mail.message">

=== modified file 'hr_recruitment/hr_recruitment_menu.xml'
--- hr_recruitment/hr_recruitment_menu.xml	2014-02-11 11:41:21 +0000
+++ hr_recruitment/hr_recruitment_menu.xml	2014-02-27 12:12:58 +0000
@@ -1,26 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        ######################## JOB OPPORTUNITIES (menu) ###########################
-         <record model="ir.actions.act_window" id="crm_case_categ0_act_job">
-            <field name="name">Applications</field>
-            <field name="res_model">hr.applicant</field>
-            <field name="view_mode">kanban,tree,form,graph,calendar</field>
-            <field name="view_id" eval="False"/>
-            <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
-            <field name="context">{'empty_list_help_model': 'hr.job'}</field>
-            <field name="help" type="html">
-              <p>
-                OpenERP helps you track applicants in the recruitment
-                process and follow up all operations: meetings, interviews, etc.
-              </p><p>
-                Applicants and their attached CV are created automatically when an email is sent.
-                If you install the document management modules, all resumes are indexed automatically, 
-                so that you can easily search through their content.
-              </p>
-            </field>
-        </record>
-
         <record model="ir.actions.act_window.view" id="action_hr_sec_kanban_view_act_job">
             <field name="sequence" eval="0"/>
             <field name="view_mode">kanban</field>
@@ -61,5 +41,34 @@
             name="Applications"
             parent="base.menu_crm_case_job_req_main"
             id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="2"/>
+    
+        <menuitem parent="hr.menu_hr_configuration" id="hr.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
+
+        <menuitem name="Recruitment"
+            id="menu_hr_recruitment_recruitment"
+            parent="hr.menu_hr_configuration"
+            sequence="40"/>
+
+        <menuitem
+            id="menu_hr_recruitment_stage"
+            name="Stages"
+            parent="menu_hr_recruitment_recruitment"
+            action="hr_recruitment_stage_act"
+            sequence="1" groups="base.group_no_one"/>
+
+        <menuitem
+            id="menu_hr_recruitment_degree"
+            name="Degrees"
+            parent="menu_hr_recruitment_recruitment"
+            action="hr_recruitment_degree_action"
+            sequence="5" groups="base.group_no_one"/>
+
+        <menuitem
+            id="menu_hr_recruitment_source"
+            parent="menu_hr_recruitment_recruitment"
+            action="hr_recruitment_source_action"
+            groups="base.group_no_one"
+            sequence="10"/>
+
     </data>
-</openerp>
+</openerp>
\ No newline at end of file

=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2014-02-11 12:23:08 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2014-02-27 12:12:58 +0000
@@ -2,11 +2,6 @@
 <openerp>
     <data>
 
-    <menuitem name="Recruitment"
-        id="menu_hr_recruitment_recruitment"
-        parent="hr.menu_hr_configuration"
-        sequence="40"/>
-
     <act_window
         id="act_hr_applicant_to_meeting"
         name="Meetings"
@@ -33,7 +28,6 @@
         </field>
     </record>
 
-
     <!-- Applicants -->
     <record model="ir.ui.view" id="crm_case_tree_view_job">
         <field name="name">Applicants</field>
@@ -121,7 +115,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, stage_id)"/>
+                        <field name="department_id"/>
                         <field name="company_id" />
                         <label for="availability"/>
                         <div>
@@ -207,6 +201,25 @@
            </search>
         </field>
     </record>
+    
+    <!-- Applications Action-->
+    <record model="ir.actions.act_window" id="crm_case_categ0_act_job">
+        <field name="name">Applications</field>
+        <field name="res_model">hr.applicant</field>
+        <field name="view_mode">kanban,tree,form,graph,calendar</field>
+        <field name="view_id" eval="False"/>
+        <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
+        <field name="help" type="html">
+          <p>
+            OpenERP helps you track applicants in the recruitment
+            process and follow up all operations: meetings, interviews, etc.
+          </p><p>
+            Applicants and their attached CV are created automatically when an email is sent.
+            If you install the document management modules, all resumes are indexed automatically, 
+            so that you can easily search through their content.
+          </p>
+        </field>
+    </record>
 
     <!-- CRM Lead Calendar View -->
     <record model="ir.ui.view" id="hr_applicant_calendar_view">
@@ -228,7 +241,7 @@
         <field name="name">Hr Applicants kanban</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <kanban default_group_by="stage_id">
+            <kanban default_group_by="stage_id" stage_management="hr.recruitment.stage.management" stage_options = "{'group_by':'stage_id'}">
                 <field name="stage_id"/>
                 <field name="color"/>
                 <field name="priority"/>
@@ -364,6 +377,14 @@
                         </div>
                     </div>
             </xpath>
+            <xpath expr="//div[@name='hr_applicant_button']" position="inside">
+                <button name="%(crm_case_categ0_act_job)d" string="Applications" type="action" 
+                    context="{'search_default_job_id': active_id, 'stage_m2m_field':'stage_ids'}"/>
+            </xpath>    
+            <xpath expr="//field[@name='requirements']" position="after">
+                <separator string="Recruitment Stages" />
+                    <field name="stage_ids" nolabel="1"/>
+            </xpath>
             <xpath expr="//field[@name='department_id']" position="after">
                 <field name="user_id" class="oe_inline"/>
             </xpath>
@@ -499,7 +520,6 @@
             <tree string="Stages">
                 <field name="sequence" invisible="1"/>
                 <field name="name"/>
-                <field name="department_id"/>
                 <field name="fold"/>
             </tree>
         </field>
@@ -515,16 +535,17 @@
                 <group string="Stage Definition">
                     <group>
                         <field name="name"/>
-                        <field name="department_id"/>
+                        <field name="fold"/>
+                        <field name="case_default"/>
                     </group>
                     <group>
                         <field name="sequence"/>
-                        <field name="fold"/>
                         <field name="template_id" domain= "[('model_id.model', '=', 'hr.applicant')]"/>
                     </group>
                 </group>
                 <separator string="Requirements"/>
                 <field name="requirements"/>
+                <field name="job_ids" invisible="1"/>
                 </sheet>
             </form>
         </field>
@@ -545,14 +566,7 @@
           </p>
         </field>
     </record>
-
-    <menuitem
-        id="menu_hr_recruitment_stage"
-        name="Stages"
-        parent="menu_hr_recruitment_recruitment"
-        action="hr_recruitment_stage_act"
-        sequence="1" groups="base.group_no_one"/>
-
+    
     <!-- Degree Tree View -->
     <record model="ir.ui.view" id="hr_recruitment_degree_tree">
         <field name="name">hr.recruitment.degree.tree</field>
@@ -589,13 +603,6 @@
         <field name="view_id" ref="hr_recruitment_degree_tree"/>
     </record>
 
-     <menuitem
-            id="menu_hr_recruitment_degree"
-            name="Degrees"
-            parent="menu_hr_recruitment_recruitment"
-            action="hr_recruitment_degree_action"
-            sequence="5" groups="base.group_no_one"/>
-
     <!-- Source Tree View -->
     <record model="ir.ui.view" id="hr_recruitment_source_tree">
         <field name="name">hr.recruitment.source.tree</field>
@@ -625,12 +632,5 @@
         <field name="view_type">form</field>
     </record>
 
-    <menuitem
-        id="menu_hr_recruitment_source"
-        parent="menu_hr_recruitment_recruitment"
-        action="hr_recruitment_source_action"
-        groups="base.group_no_one"
-        sequence="10"/>
-
     </data>
-</openerp>
+</openerp>
\ No newline at end of file

=== modified file 'hr_recruitment/security/ir.model.access.csv'
--- hr_recruitment/security/ir.model.access.csv	2014-01-15 09:38:05 +0000
+++ hr_recruitment/security/ir.model.access.csv	2014-02-27 12:12:58 +0000
@@ -1,7 +1,10 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_hr_applicant_user,hr.applicant.user,model_hr_applicant,base.group_hr_user,1,1,1,1
 access_hr_recruitment_report,hr.recruitment.report,model_hr_recruitment_report,base.group_hr_manager,1,1,1,1
-access_hr_recruitment_stage_user,hr.recruitment.stage.user,model_hr_recruitment_stage,base.group_hr_user,1,1,1,1
+access_hr_recruitment_stage_user,hr.recruitment.stage.user,model_hr_recruitment_stage,base.group_hr_user,1,0,0,0
+access_hr_recruitment_stage_manager,hr.recruitment.stage.manager,model_hr_recruitment_stage,base.group_hr_manager,1,1,1,1
+access_hr_recruitment_stage_sequence_user,hr.recruitment.stage.sequence.user,model_hr_recruitment_stage_sequence,base.group_hr_user,1,0,0,0
+access_hr_recruitment_stage_sequence_manager,hr.recruitment.stage.sequence.manager,model_hr_recruitment_stage_sequence,base.group_hr_manager,1,1,1,1
 access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,base.group_hr_user,1,1,1,1
 access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1
 access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,1,0

=== added directory 'hr_recruitment/tests'
=== added file 'hr_recruitment/tests/__init__.py'
--- hr_recruitment/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ hr_recruitment/tests/__init__.py	2014-02-27 12:12:58 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    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 . import test_hr_recruitment_stage
+checks = [
+          test_hr_recruitment_stage,
+      ]
\ No newline at end of file

=== added file 'hr_recruitment/tests/test_hr_recruitment_stage.py'
--- hr_recruitment/tests/test_hr_recruitment_stage.py	1970-01-01 00:00:00 +0000
+++ hr_recruitment/tests/test_hr_recruitment_stage.py	2014-02-27 12:12:58 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    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 openerp.osv.orm import except_orm
+from openerp.tests import common
+
+
+class TestHrRecruitmentStage(common.TransactionCase):
+    def setUp(self):
+        super(TestHrRecruitmentStage, self).setUp()
+        
+    def test_00_stage_management(self):
+        cr, uid = self.cr, self.uid
+        recruitment_stage_management = self.registry('hr.recruitment.stage.management')
+        hr_job = self.registry('hr.job')
+        hr_recruitment_stage= self.registry('hr.recruitment.stage')
+        hr_applicant = self.registry('hr.applicant');
+        hr_job_id = hr_job.create(cr, uid, {'name':'test_section'},context={})
+        context = {'default_job_id': hr_job_id,  'default_action':'create'}
+        
+        ''' For create when default_job_id pass in context
+                If same name is present than returns its id otherwise create new.
+                 and link with given job.
+        '''
+        
+        stage_m2m_oldlist = hr_job.browse(cr, uid, hr_job_id, context=context).stage_ids
+        recruitment_stage_management.create(cr, uid, {'name':'First','action':'create'},context)
+        recruitment_stage_management.create(cr, uid, {'name':'First','action':'create'},context)
+        check_len_id = hr_recruitment_stage.search(cr, uid, [('name','=', 'First')], context=context)
+        self.assertEqual(len(check_len_id), 1)
+        hr_applicant_id = hr_applicant.create(cr, uid, {'name':'Test1','stage_id': check_len_id[0],'job_id':hr_job_id})
+        test1 = check_len_id
+        stage_m2m_newlist = hr_job.browse(cr, uid, hr_job_id, context=context).stage_ids
+        self.assertEqual(len(stage_m2m_oldlist) + 1, len(stage_m2m_newlist))
+        
+        ''' For edit when default_job_id pass in context
+                If same name is present than returns its id otherwise create new.
+                and link with given job and remove old link with job and project_task.        
+         '''
+        
+        context.update({'active_id':test1[0], 'default_action':'create'})
+        recruitment_stage_management.modify_stage(cr, uid, {'name':'Second'}, context=context)
+        test2 = hr_recruitment_stage.search(cr, uid, [('name','=', 'Second')], context=context)
+        stage_m2m_newlist = hr_job.browse(cr, uid, hr_job_id, context=context).stage_ids
+        
+        check_hr_recruitment_stage_id = hr_applicant.browse(cr, uid, hr_applicant_id, context).stage_id.id
+        self.assertEqual(check_hr_recruitment_stage_id, test2[0])
+        self.assertIn(test2[0], [x.id for x in stage_m2m_newlist])
+        
+        ''' For unlink when default_job_id pass in context
+                It will unlink relation, not delete.
+        '''
+        
+        stage_m2m_oldlist = hr_job.browse(cr, uid, hr_job_id, context=context).stage_ids
+        recruitment_stage_management.unlink(cr, uid, test2, context=context)
+        stage_m2m_newlist = hr_job.browse(cr, uid, hr_job_id, context=context).stage_ids
+        self.assertEqual(len(stage_m2m_oldlist) -1, len(stage_m2m_newlist))
+        unlink_id = hr_recruitment_stage.search(cr, uid, [('name','=', 'Second')], context=context)
+        self.assertEqual(unlink_id, test2)
+ 

=== modified file 'hr_recruitment/wizard/__init__.py'
--- hr_recruitment/wizard/__init__.py	2013-10-27 12:31:04 +0000
+++ hr_recruitment/wizard/__init__.py	2014-02-27 12:12:58 +0000
@@ -20,6 +20,5 @@
 ##############################################################################
 
 import hr_recruitment_create_partner_job
-
+import hr_recruitment_stage_management
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== added file 'hr_recruitment/wizard/hr_recruitment_stage_management.py'
--- hr_recruitment/wizard/hr_recruitment_stage_management.py	1970-01-01 00:00:00 +0000
+++ hr_recruitment/wizard/hr_recruitment_stage_management.py	2014-02-27 12:12:58 +0000
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    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 openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+class hr_recruitment_stage_management(osv.TransientModel):
+    
+    _name = "hr.recruitment.stage.management"
+    _description = "Stages of application"
+
+    _columns = {
+         'name': fields.char('Stage Name', required= True, size=64),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:context = {}
+        old_stage_id = context.get('active_id')
+        res = super(hr_recruitment_stage_management, self).default_get(cr, uid, fields, context)
+        
+        if(context.get('default_action') == "create"):return res
+        hr_rec_stage = self.pool.get("hr.recruitment.stage").browse(cr , uid, old_stage_id, context)
+        res.update({'name': hr_rec_stage.name})
+        return res
+    
+        
+    def create(self, cr, uid, vals, context):
+        if context is None: context = {}
+        action = context.get('default_action')
+        if action == 'create': self.create_stage(cr, uid, vals.get('name'), context)
+        if action == 'write': self.modify_stage(cr, uid, vals, context)
+        return None
+
+    def create_stage(self, cr, uid, name, context):
+        if context is None:context = {}
+        job_id = context.get('default_job_id')
+        
+        hr_job = self.pool.get('hr.job')
+        hr_rec_stage = self.pool.get("hr.recruitment.stage")
+        
+        if job_id:
+            new_id = hr_rec_stage.search(cr, uid, [('name','=', name)], context=context, limit=1)
+            if not new_id:
+                new_id = [hr_rec_stage.create(cr, uid, {'name': name}, context = context)]
+            hr_job.write(cr, uid, [job_id], {'stage_ids': [(4, new_id[0])]}, context=context)
+        else:
+            new_id = [hr_rec_stage.create(cr, uid, {'name': name}, context = context)]
+        return new_id
+
+    def unlink(self, cr, uid, ids, context=None):
+        if context is None: context = {}
+        job_id = context.get('default_job_id')
+        
+        hr_applicant = self.pool.get('hr.applicant')
+        hr_job = self.pool.get('hr.job')
+        hr_rec_stage = self.pool.get("hr.recruitment.stage")
+        
+        if job_id:
+            for stage_id in ids:
+                hr_applicant_ids = hr_applicant.search(cr, uid, [('stage_id','=',stage_id),('job_id','=', job_id)])
+                hr_applicant.write(cr, uid, hr_applicant_ids, {'stage_id': False} , context=context)
+                hr_job.write(cr, uid, job_id, {'stage_ids': [(3, stage_id)]}, context=context)
+        else:
+            hr_rec_stage.unlink(cr, uid, ids, context=context)
+        return True
+
+    def modify_stage(self,cr, uid, vals, context=None):
+        old_stage_id = context.get('active_id')
+        job_id = context.get('default_job_id')
+        
+        hr_job = self.pool.get('hr.job')
+        hr_applicant = self.pool.get('hr.applicant')
+        hr_rec_stage = self.pool.get("hr.recruitment.stage")
+        
+        if job_id:
+            hr_rec_stage_id = hr_rec_stage.search(cr, uid, [('name','=', vals.get('name'))], context=context, limit=1)
+            if not hr_rec_stage_id:
+                vals['job_ids'] = [(6, 0, [job_id])]
+                hr_rec_stage_id = [hr_rec_stage.copy(cr, uid, old_stage_id, default=vals, context=context)]
+            new_stage_id = hr_rec_stage_id[0]
+            
+            applicant_ids = hr_applicant.search(cr, uid, [('stage_id','=', old_stage_id),('job_id','=', job_id)], context=context)
+            hr_applicant.write(cr, uid, applicant_ids, {'stage_id': new_stage_id} , context=context)
+            hr_job.write(cr, uid, [job_id], {'stage_ids': [(3, old_stage_id),(4, new_stage_id),]}, context=context)
+        else:
+            hr_rec_stage.write(cr, uid, old_stage_id, vals, context=context)
+        return True
\ No newline at end of file

=== added file 'hr_recruitment/wizard/hr_recruitment_stage_management_view.xml'
--- hr_recruitment/wizard/hr_recruitment_stage_management_view.xml	1970-01-01 00:00:00 +0000
+++ hr_recruitment/wizard/hr_recruitment_stage_management_view.xml	2014-02-27 12:12:58 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="crm_case_stage_form_wizard">
+            <field name="name">hr.recruitment.stage.management.form</field>
+            <field name="model">hr.recruitment.stage.management</field>
+            <field name="arch" type="xml">
+                <form string="Stage" version="7.0">
+                    <group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file

=== modified file 'project/__openerp__.py'
--- project/__openerp__.py	2013-10-27 12:31:04 +0000
+++ project/__openerp__.py	2014-02-27 12:12:58 +0000
@@ -65,6 +65,7 @@
     'data': [
         'security/project_security.xml',
         'wizard/project_task_delegate_view.xml',
+        'wizard/project_stage_management.xml',
         'security/ir.model.access.csv',
         'project_data.xml',
         'project_view.xml',

=== modified file 'project/project.py'
--- project/project.py	2014-02-12 17:51:41 +0000
+++ project/project.py	2014-02-27 12:12:58 +0000
@@ -29,6 +29,16 @@
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
+class project_task_type_sequence(osv.osv):
+    _name = 'project.task.type.sequence'
+    _table = 'project_task_type_rel'
+    _description = 'Task Stage Sequence'
+    _order = 'sequence'
+    _columns = {
+        'project_id': fields.many2one('project.project', 'Sequence/Project'),
+        'type_id': fields.many2one('project.task.type', 'Sequence/Stage'),
+        'sequence': fields.integer('Sequence')
+    }
 
 class project_task_type(osv.osv):
     _name = 'project.task.type'
@@ -56,8 +66,19 @@
         'sequence': 1,
         'project_ids': _get_default_project_ids,
     }
+    
     _order = 'sequence'
 
+    def write(self, cr, uid, ids, vals, context=None):
+        project_id = context.get('default_project_id')
+        project_task_type_sequence = self.pool.get('project.task.type.sequence')
+
+        if project_id:
+            task_ids = project_task_type_sequence.search(cr, uid, [('type_id', '=', ids),('project_id', '=', project_id)], context=context)
+            project_task_type_sequence.write(cr, uid, task_ids, vals , context=context)
+        else:
+            return super(project_task_type, self).write(cr, uid, ids, vals, context=context)
+        return True
 
 class project(osv.osv):
     _name = "project.project"
@@ -197,7 +218,8 @@
         ctx['active_test'] = False
         task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=ctx)
         for task in self.pool.get('project.task').browse(cr, uid, task_ids, context):
-            res[task.project_id.id] += 1
+            if task.stage_id.fold == False:
+                res[task.project_id.id] += 1
         return res
 
     def _get_alias_models(self, cr, uid, context=None):
@@ -618,13 +640,17 @@
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
-            search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += [('id', 'in', ids)]
+            search_domain += [('project_ids', '=', project_id)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
+        if project_id:
+            sequence_ids = self.pool.get('project.task.type.sequence').search_read(cr, uid, [('project_id', '=', project_id), ('type_id', 'in', stage_ids)], ['type_id'], order=order, context=context)
+            type_ids = map(lambda type_ids: type_ids['type_id'][0], sequence_ids)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
-        result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
-
+        if project_id:
+            result.sort(lambda x,y: cmp(type_ids.index(x[0]), type_ids.index(y[0])))
+        else:
+            result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
         fold = {}
         for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
             fold[stage.id] = stage.fold or False

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2013-12-24 10:29:22 +0000
+++ project/project_view.xml	2014-02-27 12:12:58 +0000
@@ -50,7 +50,6 @@
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
             <field name="context">{
                 'search_default_project_id': [active_id], 
-                'default_project_id': active_id,
                 'active_test': False,
             }</field>
             <field name="search_view_id" ref="view_task_search_form"/>
@@ -469,7 +468,7 @@
             <field name="name">project.task.kanban</field>
             <field name="model">project.task</field>
             <field name="arch" type="xml">
-                <kanban default_group_by="stage_id" >
+                <kanban default_group_by="stage_id" stage_management="project.stage.management" stage_options = "{'group_by':'stage_id'}">
                     <field name="color"/>
                     <field name="priority"/>
                     <field name="stage_id"/>

=== modified file 'project/security/ir.model.access.csv'
--- project/security/ir.model.access.csv	2013-10-27 12:31:04 +0000
+++ project/security/ir.model.access.csv	2014-02-27 12:12:58 +0000
@@ -3,7 +3,10 @@
 access_project_project_manager,project.project,model_project_project,project.group_project_manager,1,1,1,1
 access_account_analytic_account_user,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,0,0,0
 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1
-access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1
+access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,0,0,0
+access_project_task_type_manager,project.task.type manager,model_project_task_type,project.group_project_manager,1,1,1,1
+access_project_task_type_sequence_user,project.task.type.sequence user,model_project_task_type_sequence,project.group_project_user,1,0,0,0
+access_project_task_type_sequence_manager,project.task.type.sequence manager,model_project_task_type_sequence,project.group_project_manager,1,1,1,1
 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1
 access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1
 access_report_project_task_user,report.project.task.user,model_report_project_task_user,project.group_project_manager,1,1,1,1
@@ -11,7 +14,7 @@
 access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0
 access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0
 access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,1,1,1
-access_project_task_type_sale_user,project.task.type salesman,project.model_project_task_type,base.group_sale_salesman,1,1,1,1
+access_project_task_type_sale_user,project.task.type salesman,project.model_project_task_type,base.group_sale_salesman,1,0,0,0
 access_project_task_history_sale_user,project.task.history salesman,project.model_project_task_history,base.group_sale_salesman,1,1,1,1
 access_project_project_sale_user,project.project salesman,model_project_project,base.group_sale_salesman,1,0,0,0
 access_account_analytic_line_project,account.analytic.line project,analytic.model_account_analytic_line,project.group_project_manager,1,1,1,1

=== modified file 'project/tests/__init__.py'
--- project/tests/__init__.py	2013-07-10 10:15:08 +0000
+++ project/tests/__init__.py	2014-02-27 12:12:58 +0000
@@ -19,10 +19,11 @@
 #
 ##############################################################################
 
-from . import test_project_flow
+from . import test_project_flow,project_stage_management
 
 checks = [
     test_project_flow,
+    project_stage_management,
 ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project/tests/project_stage_management.py'
--- project/tests/project_stage_management.py	1970-01-01 00:00:00 +0000
+++ project/tests/project_stage_management.py	2014-02-27 12:12:58 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    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 openerp.osv.orm import except_orm
+from openerp.tests import common
+
+
+class TestCrmStagesCase(common.TransactionCase):
+    def setUp(self):
+        super(TestCrmStagesCase, self).setUp()
+        
+    def test_00_stage_management(self):
+        cr, uid = self.cr, self.uid
+        project_stage_management = self.registry('project.stage.management')
+        project_project = self.registry('project.project')
+        project_task_type= self.registry('project.task.type')
+        project_task = self.registry('project.task');
+        project_project_id = project_project.create(cr, uid, {'name':'test_section'},context={})
+        context = {'default_project_id': project_project_id, 'default_action':'create'}
+        
+        ''' For create when default_project_id pass in context
+                If same name is present than returns its id otherwise create new.
+                and link with given project
+        '''
+        
+        stage_m2m_oldlist = project_project.browse(cr, uid, project_project_id, context=context).type_ids
+        project_stage_management.create(cr, uid, {'name':'First','action':'create'},context)
+        project_stage_management.create(cr, uid, {'name':'First','action':'create'},context)
+        check_len_id = project_task_type.search(cr, uid, [('name','=', 'First')], context=context)
+        self.assertEqual(len(check_len_id), 1)
+        task_id = project_task.create(cr, uid, {'name':'Test1','stage_id': check_len_id[0],'project_id':project_project_id})
+        test1 = check_len_id
+        stage_m2m_newlist = project_project.browse(cr, uid, project_project_id, context=context).type_ids
+        
+        self.assertEqual(len(stage_m2m_oldlist) + 1, len(stage_m2m_newlist))
+        
+        ''' For edit when default_project_id pass in context
+                If same name is present than returns its id otherwise create new.
+                 and link with given project and remove old link with project and project_task.
+        '''
+        context.update({'active_id':test1[0], 'current_model':'project.task','default_action':'write'})
+        project_stage_management.modify_stage(cr, uid, {'name':'Second'}, context=context)
+        test2 = project_task_type.search(cr, uid, [('name','=', 'Second')], context=context)
+        stage_m2m_newlist = project_project.browse(cr, uid, project_project_id, context=context).type_ids
+        
+        self.assertIn(test2[0], [x.id for x in stage_m2m_newlist])
+        check_project_task_stage_id = project_task.browse(cr, uid, task_id, context).stage_id.id
+        self.assertEqual(check_project_task_stage_id, test2[0])
+
+        ''' For unlink when default_project_id pass in context
+                It will unlink relation, not delete.
+        '''
+        
+        stage_m2m_oldlist = project_project.browse(cr, uid, project_project_id, context=context).type_ids
+        project_stage_management.unlink(cr, uid, test2, context=context)
+        stage_m2m_newlist = project_project.browse(cr, uid, project_project_id, context=context).type_ids
+        self.assertEqual(len(stage_m2m_oldlist) -1, len(stage_m2m_newlist))
+        unlink_id = project_task_type.search(cr, uid, [('name','=', 'Second')], context=context)
+        self.assertEqual(unlink_id, test2)
+        
\ No newline at end of file

=== modified file 'project/wizard/__init__.py'
--- project/wizard/__init__.py	2013-10-27 12:31:04 +0000
+++ project/wizard/__init__.py	2014-02-27 12:12:58 +0000
@@ -20,5 +20,6 @@
 ##############################################################################
 
 import project_task_delegate
+import project_stage_management
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project/wizard/project_stage_management.py'
--- project/wizard/project_stage_management.py	1970-01-01 00:00:00 +0000
+++ project/wizard/project_stage_management.py	2014-02-27 12:12:58 +0000
@@ -0,0 +1,104 @@
+# -*- 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 openerp.osv import osv,fields
+
+class project_stage_management(osv.TransientModel):
+    
+    _name = "project.stage.management"
+    _description = "Management of stages for project"
+    _columns = {
+        'name': fields.char('Stage Name', required= True, size=64),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:context = {}
+        old_stage_id = context.get('active_id')
+        res = super(project_stage_management, self).default_get(cr, uid, fields, context)
+        
+        if(context.get('default_action') == "create"):return res
+        project_task_type = self.pool.get('project.task.type').browse(cr , uid, old_stage_id, context)
+        res.update({'name': project_task_type.name})
+        return res
+    
+    def create(self, cr, uid, vals, context):
+        if context is None:context = {}
+        action = context.get('default_action')
+        if action == 'create':self.create_stage(cr, uid, vals.get('name'), context)
+        if action == 'write':self.modify_stage(cr, uid, vals, context)
+        return None
+    
+    def create_stage(self, cr, uid, name, context):
+        if context is None:context = {}
+        project_id = context.get('default_project_id')
+        
+        project = self.pool.get('project.project')
+        project_task_type = self.pool.get('project.task.type')
+        
+        if project_id:
+            task_type_id = project_task_type.search(cr, uid, [('name','=', name)], context=context, limit=1)
+            if not task_type_id:
+                task_type_id = [project_task_type.create(cr, uid, {'name': name}, context=context)]
+            project.write(cr, uid, [project_id], {'type_ids': [(4, task_type_id[0]),]}, context=context)
+        else:
+            task_type_id = [project_task_type.create(cr, uid, {'name': name}, context=context)]
+        return task_type_id
+        
+    def unlink(self,  cr, uid, ids, context=None):
+        if context is None:context = {}
+        project_id = context.get('default_project_id')
+        model = context.get('current_model')
+        if not model: return False
+        
+        project_task_or_issue = self.pool.get(model)
+        project_project = self.pool.get('project.project')
+        project_task_type = self.pool.get('project.task.type')
+        
+        if project_id:
+            for stage_id in ids:
+                task_ids = project_task_or_issue.search(cr, uid, [('stage_id','=', stage_id),('project_id','=', project_id)])
+                project_task_or_issue.write(cr, uid, task_ids, {'stage_id': False} , context=context)
+                project_project.write(cr, uid, project_id, {'type_ids': [(3, stage_id)]}, context=context)
+        else:
+            project_task_type.unlink(cr, uid, ids, context=context)
+        return True
+    
+    def modify_stage(self,cr, uid, vals, context=None):
+        old_stage_id = context.get('active_id')
+        project_id = context.get('default_project_id')
+        model = context.get('current_model')
+        if not model: return False
+        
+        project_task_type = self.pool.get('project.task.type')
+        project_project = self.pool.get('project.project')
+        project_task_or_issue = self.pool.get(model)
+        
+        if project_id:
+            new_task_type_id = project_task_type.search(cr, uid, [('name','=', vals.get('name'))], context=context, limit=1)
+            if not new_task_type_id:
+                vals['project_ids'] = [(6, 0, [project_id])]
+                new_task_type_id = [project_task_type.copy(cr, uid, old_stage_id, default=vals, context=context)]
+            new_stage_id = new_task_type_id[0]
+            
+            task_ids = project_task_or_issue.search(cr, uid, [('stage_id','=', old_stage_id),('project_id','=', project_id)], context=context)
+            project_task_or_issue.write(cr, uid, task_ids, {'stage_id': new_stage_id} , context=context)
+            project_project.write(cr, uid, [project_id], {'type_ids': [(3, old_stage_id),(4, new_stage_id),]}, context=context)
+        else:
+            project_task_type.write(cr, uid, old_stage_id, vals, context=context)
+        return True
\ No newline at end of file

=== added file 'project/wizard/project_stage_management.xml'
--- project/wizard/project_stage_management.xml	1970-01-01 00:00:00 +0000
+++ project/wizard/project_stage_management.xml	2014-02-27 12:12:58 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="project_stage_form_wizard">
+            <field name="name">project.stage.management.form</field>
+            <field name="model">project.stage.management</field>
+            <field name="arch" type="xml">
+                <form string="Stage" version="7.0">
+                    <group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>

=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2013-12-02 15:09:25 +0000
+++ project_issue/project_issue.py	2014-02-27 12:12:58 +0000
@@ -106,14 +106,18 @@
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
-            search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += [('id', 'in', ids)]
+            search_domain += [('project_ids', '=', project_id)]
         # perform search
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
+        if project_id:
+            sequence_ids = self.pool.get('project.task.type.sequence').search_read(cr, uid, [('project_id', '=', project_id), ('type_id', 'in', stage_ids)], ['type_id'], order=order, context=context)
+            type_ids = map(lambda type_ids: type_ids['type_id'][0], sequence_ids)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
-        result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
-
+        if project_id:
+            result.sort(lambda x,y: cmp(type_ids.index(x[0]), type_ids.index(y[0])))
+        else:
+            result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
         fold = {}
         for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
             fold[stage.id] = stage.fold or False

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2013-11-29 09:46:10 +0000
+++ project_issue/project_issue_view.xml	2014-02-27 12:12:58 +0000
@@ -184,7 +184,7 @@
             <field name="name">Project Issue Kanban</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <kanban default_group_by="stage_id">
+                <kanban default_group_by="stage_id" stage_management="project.stage.management" stage_options = "{'group_by':'stage_id','default_context_key':'default_project_id'}">
                     <field name="stage_id"/>
                     <field name="color"/>
                     <field name="priority"/>
@@ -281,7 +281,6 @@
             <field name="view_mode">kanban,tree,form,calendar,graph</field>
             <field name="context">{
                     'search_default_project_id': [active_id], 
-                    'default_project_id': active_id,
                 }
             </field>
             <field name="help" type="html">

=== added directory 'project_issue/tests'
=== added file 'project_issue/tests/__init__.py'
--- project_issue/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ project_issue/tests/__init__.py	2014-02-27 12:12:58 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013-TODAY OpenERP S.A. <http://www.openerp.com>
+#
+#    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 . import project_stage_management
+
+checks = [
+    project_stage_management,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_issue/tests/project_stage_management.py'
--- project_issue/tests/project_stage_management.py	1970-01-01 00:00:00 +0000
+++ project_issue/tests/project_stage_management.py	2014-02-27 12:12:58 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    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 openerp.osv.orm import except_orm
+from openerp.tests import common
+
+
+class TestProjectStagesCase(common.TransactionCase):
+    def setUp(self):
+        super(TestProjectStagesCase, self).setUp()
+        
+    def test_00_stage_management(self):
+        cr, uid = self.cr, self.uid
+        project_issue_stage_management = self.registry('project.stage.management')
+        project_project = self.registry('project.project')
+        project_issue_type= self.registry('project.task.type')
+        project_issue = self.registry('project.issue')
+        project_project_id = project_project.create(cr, uid, {'name':'test_section'},context={})
+        context = {'default_project_id': project_project_id, 'default_action':'create'}
+        
+        ''' For create when default_project_id pass in context
+                If same name is present than returns its id otherwise create new.
+                 and link with given project.
+        '''
+        
+        stage_m2m_oldlist = project_project.browse(cr, uid, project_project_id, context=context).type_ids
+        project_issue_stage_management.create(cr, uid, {'name':'First','action':'create'},context)
+        project_issue_stage_management.create(cr, uid, {'name':'First','action':'create'},context)
+        check_len_id = project_issue_type.search(cr, uid, [('name','=', 'First')], context=context)
+        self.assertEqual(len(check_len_id), 1)
+        issue_id = project_issue.create(cr, uid, {'name':'Test1','stage_id': check_len_id[0],'project_id':project_project_id})
+        test1 = check_len_id
+        stage_m2m_newlist = project_project.browse(cr, uid, project_project_id, context=context).type_ids
+        
+        self.assertEqual(len(stage_m2m_oldlist) + 1, len(stage_m2m_newlist))
+        
+        ''' For edit when default_project_id pass in context
+                If same name is present than returns its id otherwise create new.
+                and link with given project and remove old link with project and project_issue.
+         '''
+        
+        context.update({'active_id':test1[0],'current_model':'project.issue', 'default_action':'write'})
+        project_issue_stage_management.modify_stage(cr, uid, {'name':'Second'}, context=context)
+        test2 = project_issue_type.search(cr, uid, [('name','=', 'Second')], context=context)
+        stage_m2m_newlist = project_project.browse(cr, uid, project_project_id, context=context).type_ids
+        
+        self.assertIn(test2[0], [x.id for x in stage_m2m_newlist])
+        check_project_task_stage_id = project_issue.browse(cr, uid, issue_id, context).stage_id.id
+        self.assertEqual(check_project_task_stage_id, test2[0])
+        
+        ''' For unlink when default_project_id pass in context
+                It will unlink relation, not delete.
+        '''
+        
+        stage_m2m_oldlist = project_project.browse(cr, uid, project_project_id, context=context).type_ids
+        project_issue_stage_management.unlink(cr, uid, test2, context=context)
+        stage_m2m_newlist = project_project.browse(cr, uid, project_project_id, context=context).type_ids
+        self.assertEqual(len(stage_m2m_oldlist) -1, len(stage_m2m_newlist))
+        unlink_id = project_issue_type.search(cr, uid, [('name','=', 'Second')], context=context)
+        self.assertEqual(unlink_id, test2)