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

[Vidhin Mehta (OpenERP)]

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

8781. By Vidhin Mehta (OpenERP) on 2013-06-24

[IMP]project.py fixes and improvements.

8782. By Vidhin Mehta (OpenERP) on 2013-06-24

[IMP]improvement in view

8783. By Vidhin Mehta (OpenERP) on 2013-06-24

[IMP]Improvements in hr module (P1).

8784. By Vidhin Mehta (OpenERP) on 2013-06-24

[IMP]Improvement in project csv

8785. By Vidhin Mehta (OpenERP) on 2013-06-24

[IMP] Improvements in crm.

8786. By Vidhin Mehta (OpenERP) on 2013-06-25

[MERGE]Trunk.

8787. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]give proper name of methods.

8788. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]IMprovements in hr_recuriment

8789. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]misspel.

8790. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]Add some demo data.

8791. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]

8792. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]

8793. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]FIX

8794. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]

8795. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]

8796. By Vidhin Mehta (OpenERP) on 2013-06-25

[Imp]

8797. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]

8798. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]Change condition in crm_lead def stage_modify

8799. By Vidhin Mehta (OpenERP) on 2013-06-25

[MERGE]Trunk.

8800. By Vidhin Mehta (OpenERP) on 2013-07-16

[IMP]add demo data.

8801. By RGA(OpenERP) on 2013-08-13

Merge with trunk

Unmerged revisions

8801. By RGA(OpenERP) on 2013-08-13

Merge with trunk

8800. By Vidhin Mehta (OpenERP) on 2013-07-16

[IMP]add demo data.

8799. By Vidhin Mehta (OpenERP) on 2013-06-25

[MERGE]Trunk.

8798. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]Change condition in crm_lead def stage_modify

8797. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]

8796. By Vidhin Mehta (OpenERP) on 2013-06-25

[Imp]

8795. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]

8794. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]

8793. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]FIX

8792. By Vidhin Mehta (OpenERP) on 2013-06-25

[IMP]

=== modified file 'crm/crm.py'
--- crm/crm.py	2013-07-16 15:15:13 +0000
+++ crm/crm.py	2013-08-13 11:44:00 +0000
@@ -84,7 +84,63 @@
         '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:
+            create_return = self._stage_modify(cr, uid, stage_id[0], section_id, value, context=context) 
+            return create_return.get('id')
+        
+        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).state
+            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]
+            
+        if new_stage_id:
+            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 {'boolean':True, 'id': new_stage_id}
+        return  {'boolean': False, 'id' : Null}
 
+    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:
+                write_return = self._stage_modify(cr, uid, stage_id, section_id, value, context=context)
+                if not write_return.get('boolean'):
+                    return False
+            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_lead.py'
--- crm/crm_lead.py	2013-08-05 14:19:05 +0000
+++ crm/crm_lead.py	2013-08-13 11:44:00 +0000
@@ -365,7 +365,7 @@
         # OR all section_ids and OR with case_default
         search_domain = []
         if section_ids:
-            search_domain += [('|')] * len(section_ids)
+            search_domain += [('&')] * len(section_ids)
             for section_id in section_ids:
                 search_domain.append(('section_ids', '=', section_id))
         search_domain.append(('case_default', '=', True))
 
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2013-08-09 07:52:28 +0000
+++ crm/crm_lead_view.xml	2013-08-13 11:44:00 +0000
@@ -543,7 +543,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 'hr/hr_demo.xml'
--- hr/hr_demo.xml	2013-04-11 12:44:46 +0000
+++ hr/hr_demo.xml	2013-08-13 11:44:00 +0000
@@ -25,7 +25,7 @@
       <record id="dep_sales" model="hr.department">
           <field name="name">Sales</field>
       </record>
-
+      
     <!--Jobs-->
 
       <record id="job_ceo" model="hr.job">
 
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml	2013-06-21 11:03:44 +0000
+++ hr/hr_view.xml	2013-08-13 11:44:00 +0000
@@ -343,6 +343,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-07-24 07:22:13 +0000
+++ hr_recruitment/hr_recruitment.py	2013-08-13 11:44:00 +0000
@@ -44,7 +44,7 @@
     }
 
 class hr_recruitment_stage(osv.osv):
-    """ Stage of HR Recruitment """
+    """ Stage of HR Recruitment     """
     _name = "hr.recruitment.stage"
     _description = "Stage of Recruitment"
     _order = 'sequence'
@@ -54,12 +54,83 @@
         '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'),
     }
+
+    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['state'] = self.browse(cr, uid, stage_id, context=context).state
+            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]
+
+        if new_stage_id:
+            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 {'boolean': True,'id': new_stage_id}
+        return {'boolean': False,'id': Null}
+    
+    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:
+            create_return =  self._stage_modify(cr, uid, stage_ids[0], job_id, vals, context=context)
+            return create_return.get('id')
+        
+        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:
+                write_return = self._stage_modify(cr, uid, stage_id, job_id, vals, context=context)
+                if not write_return.get('boolean'):
+                    return False
+            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 """
     _name = "hr.recruitment.degree"
@@ -87,29 +158,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, [('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'
+    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 +192,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
@@ -220,7 +292,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(),
@@ -262,17 +334,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
@@ -463,8 +534,18 @@
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", 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-08-13 11:44:00 +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-08-13 11:44:00 +0000
@@ -63,7 +63,24 @@
             id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
     
         <menuitem parent="hr.menu_hr_configuration" id="hr.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
-
+        
+        <!-- Add new Button(Application) in department Form -->
+        
+	    <record id="view_job_form_inherit" model="ir.ui.view">
+	        <field name="name">hr.job.form.inherit</field>
+	        <field name="model">hr.job</field>
+	        <field name="inherit_id" ref="hr.view_hr_job_form"/>
+	        <field name="arch" type="xml">
+                <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}"/>
+                </xpath>    
+                <xpath expr="//field[@name='requirements']" position="after">
+                	<separator string="Recruitment Stages" />
+                	<field name="stage_ids" nolabel="1"/>
+                </xpath> 	                           	
+	        </field>
+	    </record>  
 
     </data>
 </openerp>
 
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2013-07-16 15:15:13 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2013-08-13 11:44:00 +0000
@@ -354,15 +354,17 @@
                 <group string="Stage Definition">
                     <group>
                         <field name="name"/>
+                        <field name="fold"/>
+                        <field name="case_default"/>
                         <field name="department_id"/>
                     </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>
 
=== modified file 'project/project.py'
--- project/project.py	2013-07-24 07:22:13 +0000
+++ project/project.py	2013-08-13 11:44:00 +0000
@@ -52,6 +52,59 @@
         'project_ids': lambda self, cr, uid, ctx=None: self.pool['project.task']._get_default_project_id(cr, uid, context=ctx),
     }
     _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 value.get('name') and project_id:
+            for id in ids:
+                write_return = self._stage_modify(cr, uid, id, project_id, value, context=context)
+                if not write_return.get('boolean'):
+                    return False
+            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['state'] = self.browse(cr, uid, stage_id, context=context).state
+            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]
+            
+        if new_stage_id:
+            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 {'boolean':True, 'id': new_stage_id}
+        return  {'boolean': False, 'id': Null}
+
+    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:
+            create_return = self._stage_modify(cr, uid, stage_id[0], project_id, value, context=context)
+            return create_return.get('id')
+        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({'type_ids': [cr, uid, project_id, (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/security/ir.model.access.csv'
--- project/security/ir.model.access.csv	2013-07-10 10:15:08 +0000
+++ project/security/ir.model.access.csv	2013-08-13 11:44:00 +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