Merge lp:~openerp-dev/openobject-addons/6.1-bug-972544-vba into lp:openobject-addons/6.1

[Vijaykumar Baladaniya (OpenERP)]

Hello Sir,

    I have improve the code for move a task to a stage that is defined on the project of the task. Kindly review the code.

Thanks,
Vijay Baladaniya

Unmerged revisions

6977. By Vijaykumar Baladaniya (OpenERP) on 2012-09-12

[FIX] Not possible to move a task to a stage that is not defined on the project.

6976. By Vijaykumar Baladaniya (OpenERP) on 2012-09-06

[FIX] Possible to move a task to a stage that is defined on the project of the task.

=== modified file 'project/project.py'
--- project/project.py	2012-07-20 15:12:03 +0000
+++ project/project.py	2012-09-13 10:05:23 +0000
@@ -1043,9 +1043,14 @@
             new_stage = vals.get('type_id')
             vals_reset_kstate = dict(vals, kanban_state='normal')
             for t in self.browse(cr, uid, ids, context=context):
-                write_vals = vals_reset_kstate if t.type_id != new_stage else vals 
-                super(task,self).write(cr, uid, [t.id], write_vals, context=context)
-            result = True
+                if  t.project_id.type_ids:
+                    stage_id = [ item.id for item in t.project_id.type_ids]
+                    if new_stage in (stage_id):
+                        write_vals = vals_reset_kstate if t.type_id != new_stage else vals 
+                        super(task,self).write(cr, uid, [t.id], write_vals, context=context)
+                        result = True
+                    else:
+                        result = False
         else:
             result = super(task,self).write(cr, uid, ids, vals, context=context)
         if ('type_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('state' in vals) or ('kanban_state' in vals):