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

[Vidhin Mehta (OpenERP)]

Unmerged revisions

8877. By Mahendra Barad(OpenERP) on 2013-10-10

[REV] revert the changes for global method

8876. By Mahendra Barad(OpenERP) on 2013-10-10

[Merge] merge with trunk

8875. By Mahendra Barad(OpenERP) on 2013-09-24

Merge with trunk

8874. By RGA(OpenERP) on 2013-09-20

[IMP] add context stage_m2m_field so we can link group with this field instead of add new group

8873. By RGA(OpenERP) on 2013-09-20

[IMP] hr_recruitment view add Application button on job position form view

8872. By RGA(OpenERP) on 2013-09-19

Merge with trunk

8871. By Mahendra Barad(OpenERP) on 2013-09-09

merge with trunk

8870. By Mahendra Barad(OpenERP) on 2013-09-05

[IMP]solve the deletion problem for stages

8869. By RGA(OpenERP) on 2013-09-05

Merge with lp:~openerp-dev/openobject-addons/trunk-kanban-column-exp-rga which add comman base stage

8868. By RGA(OpenERP) on 2013-09-05

Merge with trunk

=== modified file 'crm/crm.py'
--- crm/crm.py	2013-10-06 11:58:08 +0000
+++ crm/crm.py	2013-10-10 08:36:19 +0000
@@ -85,7 +85,57 @@
         'type': 'both',
         'case_default': True,
     }
+    def create(self, cr, uid, value, context=None):
+        if context is None: context = {}
+        stage_id = self.search(cr, uid, [('name','=', value.get('name'))], context=context, limit=1)
+        section_id = context.get('default_section_id', False)
+        if section_id and stage_id:
+            return self._stage_modify(cr, uid, stage_id[0], section_id, value, context=context) 
+        create_return = super(crm_case_stage, self).create(cr, uid, value, context=context)
+        if section_id:
+            self.pool.get('crm.case.section').write(cr ,uid, section_id, {'stage_ids': [(4, create_return)]}, context=context)
+        return create_return
+    
+    def _stage_modify(self, cr, uid, stage_id, section_id, value, context=None):
+        crm_lead = self.pool.get('crm.lead')
+        section_browse = self.pool.get('crm.case.section').browse(cr, uid, section_id, context=context)
+        crm_lead_ids = crm_lead.search(cr, uid, [('stage_id','=', stage_id),('section_id','=', section_id)], context=context)
+        stage_ids = self.search(cr, uid, [('name','=', value.get('name'))], context=context, limit=1)
+        if not stage_ids:
+            value['state'] = self.browse(cr, uid, stage_id, context=context).name
+            value['section_ids'] = [(6, 0, [section_id])]
+            new_stage_id = self.copy(cr, uid, stage_id, default=value, context=context)
+        else:
+            new_stage_id = stage_ids[0]
+        
+        section_write = section_browse.write({'stage_ids': [(3, stage_id),(4, new_stage_id)]}, context=context)
+        crm_write = crm_lead.write(cr, uid, crm_lead_ids, {'stage_id': new_stage_id} , context=context)
+        if section_write and crm_write:
+            return new_stage_id 
+        return False
 
+    def write(self, cr, uid, ids, value, context=None):
+        if context is None: context = {}
+        section_id = context.get('default_section_id', False)
+        if value.get('name') and section_id:
+            for stage_id in ids:
+                return self._stage_modify(cr, uid, stage_id, section_id, value, context=context)
+            return True
+        return super(crm_case_stage, self).write(cr, uid, ids, value, context=context)
+    
+    def unlink(self, cr, uid, ids, context=None):
+        if context is None: context = {}
+        section_id = context.get('default_section_id', False)
+        if section_id:
+            crm_lead = self.pool.get('crm.lead')
+            for stage_id in ids:
+                crm_lead_ids = crm_lead.search(cr, uid, [('stage_id','=',stage_id),('section_id','=', section_id)])
+                crm_write = crm_lead.write(cr, uid, crm_lead_ids, {'stage_id': False} , context=context)
+                section_write =  self.pool.get('crm.case.section').write(cr, uid, section_id, {'stage_ids': [(3, stage_id)]}, context=context)
+                if not crm_write or not section_write:
+                    return False
+            return True
+        return super(crm_case_stage,self).unlink(cr, uid, ids, context)
 
 class crm_case_section(osv.osv):
     """ Model for sales teams. """

=== modified file 'crm/crm_case_section_view.xml'
--- crm/crm_case_section_view.xml	2013-09-13 08:42:35 +0000
+++ crm/crm_case_section_view.xml	2013-10-10 08:36:19 +0000
@@ -48,6 +48,7 @@
                     'stage_type': 'opportunity',
                     'default_type': 'opportunity',
                     'default_user_id': uid,
+                    'stage_m2m_field':'stage_ids',
                 }
             </field>
             <field name="help" type="html">

=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml	2013-10-06 13:12:25 +0000
+++ hr/hr_view.xml	2013-10-10 08:36:19 +0000
@@ -336,6 +336,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>

=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py	2013-09-19 14:23:38 +0000
+++ hr_recruitment/hr_recruitment.py	2013-10-10 08:36:19 +0000
@@ -51,14 +51,79 @@
     _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."),
         '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'),
+        'case_default': fields.boolean('Default to New Job'),
+        'job_ids': fields.many2many('hr.job',  'job_stage_rel', 'stage_id','job_id', 'Stages')
     }
+    
+    def _get_default_job_id(self, cr, uid, ctx={}):
+        job = ctx.get('default_job_id', False)
+        if type(job) is int:
+            return [job]
+        return job
+    
     _defaults = {
         'sequence': 1,
         'fold': False,
+        'job_ids': _get_default_job_id,
+        'case_default': True
     }
+    
+    def _stage_modify(self, cr, uid, stage_id, job_id, vals, context=None):
+        hr_applicant = self.pool.get('hr.applicant')
+        hr_job = self.pool.get('hr.job').browse(cr, uid, job_id, context=context)
+        hr_applicant_ids = hr_applicant.search(cr, uid, [('stage_id','=', stage_id),('job_id','=', job_id)], context=context)
+        stage_ids = self.search(cr, uid, [('name','=', vals['name'])], context=context)
+        if not stage_ids:
+            vals['job_ids'] = [(6, 0, [job_id])]
+            new_stage_id = self.copy(cr, uid, stage_id, default=vals, context=context)
+        else:
+            new_stage_id = stage_ids[0]
+
+        hr_job_write = hr_job.write({'stage_ids': [(4, new_stage_id),(3, stage_id)]}, context=context)
+        hr_applicant_write = hr_applicant.write(cr, uid, hr_applicant_ids, {'stage_id': new_stage_id} , context=context)
+        if hr_job_write and hr_applicant_write:
+            return new_stage_id
+        return False
+    
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        stage_ids = self.search(cr, uid, [('name','=', vals.get('name'))], context=context, limit=1)
+        job_id = context.get('default_job_id')
+        if job_id and stage_ids:
+            return self._stage_modify(cr, uid, stage_ids[0], job_id, vals, context=context)
+        create_return = super(hr_recruitment_stage, self).create(cr, uid, vals, context=context)
+        if job_id:
+            self.pool.get('hr.job').write(cr, uid, job_id, {'stage_ids': [(4, create_return)]}, context=context)
+        return create_return
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
+        job_id = context.get('default_job_id')
+        if vals.get('name') and job_id:
+            for stage_id in ids:
+                return self._stage_modify(cr, uid, stage_id, job_id, vals, context=context)
+            return True
+        return super(hr_recruitment_stage, self).write(cr, uid, ids, vals, context=context)
+
+    def unlink(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        job_id = context.get('default_job_id', False)
+        if job_id:
+            hr_application = self.pool.get('hr.applicant')
+            for stage_id in ids:
+                applicant_ids = hr_application.search(cr, uid, [('stage_id','=',stage_id),('job_id','=',job_id)])
+                hr_app_write = hr_application.write(cr, uid, applicant_ids, {'stage_id': False} , context=context)
+                hr_job_write = self.pool.get('hr.job').write(cr, uid, job_id, {'stage_ids': [(3, stage_id)]}, context=context)
+                if not hr_app_write or not hr_job_write:
+                    return False
+            return True
+        return super(hr_recruitment_stage,self).unlink(cr, uid, ids, context)
+
 
 class hr_recruitment_degree(osv.osv):
     """ Degree of HR Recruitment """
@@ -87,29 +152,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)
+        department_id = self._get_default_job_id(cr, uid, context=context)
         return self.stage_find(cr, uid, [], department_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):
@@ -121,13 +186,14 @@
             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)]
+        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)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
@@ -181,7 +247,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)]"),
         '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'),
@@ -222,7 +288,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,
@@ -239,11 +305,6 @@
                 return {'value': {'department_id': job_record.department_id.id}}
         return {}
 
-    def onchange_department_id(self, cr, uid, ids, department_id=False, stage_id=False, context=None):
-        if not stage_id:
-            stage_id = self.stage_find(cr, uid, [], department_id, [('sequence', '=', '1')], context=context)
-        return {'value': {'stage_id': stage_id}}
-
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
         data = {'partner_phone': False,
                 'partner_mobile': False,
@@ -264,17 +325,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
@@ -466,8 +526,18 @@
         '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')
+    }
+
+
+    def _get_stage_common(self, cr, uid, context):
+        ids = self.pool.get('hr.recruitment.stage').search(cr, uid, [('case_default','=',1)], context=context)
+        return ids
+        
+    _defaults = {
+        'alias_domain': False, # always hide alias during creation
+        'stage_ids': _get_stage_common,
+    }
     def _auto_init(self, cr, context=None):
         """Installation hook to create aliases for all jobs and avoid constraint errors."""
         return self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job, self)._auto_init,

=== modified file 'hr_recruitment/hr_recruitment_demo.xml'
--- hr_recruitment/hr_recruitment_demo.xml	2013-03-13 09:37:09 +0000
+++ hr_recruitment/hr_recruitment_demo.xml	2013-10-10 08:36:19 +0000
@@ -124,6 +124,35 @@
 
     <record id="hr.job_developer" model="hr.job">
         <field name="survey_id" ref="survey_job_0"/>
-    </record>
+        <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_hrm" model="hr.job">
+        <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_consultant" model="hr.job">
+        <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="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="survey_id" ref="survey_job_0"/>
+        <field name= "stage_ids" eval="[(4, stage_job1),(4, stage_job2),(4, stage_job3),(4, stage_job4)]" />
+    </record>
+
+
   </data>
 </openerp>
\ No newline at end of file

=== modified file 'hr_recruitment/hr_recruitment_menu.xml'
--- hr_recruitment/hr_recruitment_menu.xml	2013-03-04 15:13:55 +0000
+++ hr_recruitment/hr_recruitment_menu.xml	2013-10-10 08:36:19 +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="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>
@@ -64,6 +44,31 @@
     
         <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>

=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2013-09-04 14:11:22 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2013-10-10 08:36:19 +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"
@@ -32,8 +27,7 @@
           </p>
         </field>
     </record>
-
-
+    
     <!-- Jobs -->
     <record model="ir.ui.view" id="crm_case_tree_view_job">
         <field name="name">Applicants</field>
@@ -120,7 +114,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"/>
                         <label for="availability"/>
                         <div>
                             <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>
@@ -204,6 +198,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">
@@ -330,6 +343,14 @@
                     <field name="alias_contact" class="oe_inline" string="Accept Emails From"/>
                 </group>
             </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, '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>
         </field>
     </record>
 
@@ -341,7 +362,6 @@
             <tree string="Stages">
                 <field name="sequence" invisible="1"/>
                 <field name="name"/>
-                <field name="department_id"/>
             </tree>
         </field>
     </record>
@@ -356,15 +376,16 @@
                 <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"/>
                     </group>
                 </group>
                 <separator string="Requirements"/>
                 <field name="requirements"/>
+                <field name="job_ids" invisible="1"/>
                 </sheet>
             </form>
         </field>
@@ -385,14 +406,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>
@@ -429,13 +443,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>
@@ -465,12 +472,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>

=== modified file 'project/project.py'
--- project/project.py	2013-09-19 14:23:38 +0000
+++ project/project.py	2013-10-10 08:36:19 +0000
@@ -44,14 +44,69 @@
         '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."),
     }
-
+    
+    def _get_default_project_id(self, cr, uid, context=None):
+        project = self.pool['project.task']._get_default_project_id(cr, uid, context=context)
+        if type(project) in (long, int,):
+            return [project]
+        return project
+        
     _defaults = {
         'sequence': 1,
         'fold': False,
         'case_default': False,
-        'project_ids': lambda self, cr, uid, ctx=None: self.pool['project.task']._get_default_project_id(cr, uid, context=ctx),
+        'project_ids':_get_default_project_id
     }
     _order = 'sequence'
+    
+    def write(self, cr, uid, ids, value, context=None):
+        if context is None:context = {}
+        project_id = context.get('default_project_id', False)
+        if project_id and value.get('name'):
+            for id in ids:
+                return self._stage_modify(cr, uid, id, project_id, value, context=context)
+            return True
+        return super(project_task_type, self).write(cr, uid, ids, value, context=context)
+
+    def _stage_modify(self, cr, uid, stage_id, project_id, vals, context=None):
+        project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+        project_task = self.pool.get('project.task')
+        stage_ids = self.search(cr, uid, [('name','=', vals.get('name'))], context=context, limit=1)
+        task_ids = project_task.search(cr, uid, [('stage_id','=', stage_id),('project_id','=', project_id)], context=context)
+        
+        if not stage_ids:
+            vals['project_ids'] = [(6, 0, [project_id])]
+            new_stage_id = self.copy(cr, uid, stage_id, default=vals, context=context)
+        else:
+            new_stage_id = stage_ids[0]
+            
+        project_write = project.write({'type_ids': [(3, stage_id),(4, new_stage_id),]}, context=context)
+        task_write = project_task.write(cr, uid, task_ids, {'stage_id': new_stage_id} , context=context)
+        if project_write and task_write: 
+            return new_stage_id
+        return False
+
+    def create(self, cr, uid, value, context=None):
+        if context is None:context = {}
+        stage_id = self.search(cr, uid, [('name','=', value.get('name'))], context=context, limit=1)
+        project_id = context.get('default_project_id', False)
+        if project_id and stage_id:
+            return self._stage_modify(cr, uid, stage_id[0], project_id, value, context=context)
+        return super(project_task_type, self).create(cr, uid, value, context=context)
+    
+    def unlink(self, cr, uid, ids, context=None):
+        if context is None: context = {}
+        project_id = context.get('default_project_id')
+        if project_id:
+            project_task = self.pool.get('project.task')
+            for stage_id in ids:
+                 task_ids = project_task.search(cr, uid, [('stage_id','=', stage_id),('project_id','=', project_id)])
+                 task_write = project_task.write(cr, uid, task_ids, {'stage_id': False} , context=context)
+                 project_write = self.pool.get('project.project').write(cr, uid, project_id, {'type_ids': [(3, stage_id)]}, context=context)
+                 if not project_write or  not task_write:
+                     return False
+            return True
+        return super(project_task_type,self).unlink(cr, uid, ids, context)
 
 
 class project(osv.osv):

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2013-10-08 13:56:50 +0000
+++ project/project_view.xml	2013-10-10 08:36:19 +0000
@@ -52,6 +52,7 @@
                 'search_default_project_id': [active_id], 
                 'default_project_id': active_id,
                 'active_test': False,
+                'stage_m2m_field':'type_ids'
             }</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help" type="html">

=== modified file 'project/security/ir.model.access.csv'
--- project/security/ir.model.access.csv	2013-09-11 11:07:55 +0000
+++ project/security/ir.model.access.csv	2013-10-10 08:36:19 +0000
@@ -3,7 +3,8 @@
 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_manager,project.task.type manager,model_project_task_type,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,0,0,0
 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 +12,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