Merge lp:~gs.clearcorp/openerp-ccorp-addons/7.0_project_openerp_methodology into lp:openerp-ccorp-addons/7.0

[Glen Sojo]

[IMP] - ccorp_project_oerp: Modified task creation wizard to allow creation of task using the phase from the sprint.

=== modified file 'ccorp_project_oerp/wizard/task_create_wizard.py'
--- ccorp_project_oerp/wizard/task_create_wizard.py	2014-05-14 16:04:33 +0000
+++ ccorp_project_oerp/wizard/task_create_wizard.py	2014-05-30 22:52:35 +0000
@@ -43,9 +43,6 @@
         sprint = wizard.sprint_id
         features = wizard.sprint_id.feature_ids
         
-        if sprint.task_from_features:
-            raise osv.except_osv(_('Error'),_('All task were created before.'))
-        
         desirables = []
         for feature in features:
             try:
@@ -59,9 +56,10 @@
 FROM ccorp_project_oerp_feature_hours AS hours,
  ccorp_project_oerp_work_type AS types
 WHERE hours.feature_id = %s
+AND hours.phase_id = %s
 AND hours.work_type_id = types.id) AS types
 GROUP BY types.sequence
-ORDER BY types.sequence ASC;''', (feature.id,))
+ORDER BY types.sequence ASC;''', (feature.id, sprint.phase_id.id))
                 
                 previous_id = False
                 for sequence in cr.dictfetchall():
@@ -123,11 +121,11 @@
                                                   'Please contact your system administrator.'))
             
         sprint_obj = self.pool.get('ccorp.project.scrum.sprint')
-        sprint_obj.write(cr, uid, sprint.id,
-                         {
-                          'task_from_features': True,
-                          'desirable_task_ids': [[6,0,desirables]],
-                          })
+        for desirable in desirables:
+            sprint_obj.write(cr, uid, sprint.id,
+                             {
+                              'desirable_task_ids': [[4,desirable]],
+                              })
             
         return {
                 'name': 'Sprints',