Index: /WAeUP_SRP/base/WAeUPTool.py
===================================================================
--- /WAeUP_SRP/base/WAeUPTool.py	(revision 2262)
+++ /WAeUP_SRP/base/WAeUPTool.py	(revision 2263)
@@ -1120,8 +1120,8 @@
             editable_keys.remove('matric_no')
 
-        # included only to change wf state from admitted to returning
-        if res[0].review_state not in ('admitted','objection_raised'):
-            return '%s' % res[0].id ,"student is not in state admitted or objection_raised"
-        # end inclusion
+        ## included only to change wf state from admitted to returning
+        #if res[0].review_state not in ('admitted','objection_raised'):
+        #    return '%s' % res[0].id ,"student is not in state admitted or objection_raised"
+        ## end inclusion
 
         sid = res[0].id
@@ -1129,5 +1129,4 @@
         f2t = self.field2types_student
         d = {}
-        #import pdb;pdb.set_trace()
         any_change = False
         for pt in f2t.keys():
@@ -1157,24 +1156,24 @@
 
 
-        # included only to change wf state from admitted to returning
-            if res[0].review_state in ('admitted','objection_raised'):
-                new_state = f2t[pt]['wf_transition_return']
-                sub_obj = getattr(student_obj,f2t[pt]['id'],None)
-                if sub_obj and new_state != "remain":
-                    try:
-                        self.portal_workflow.doActionFor(sub_obj,new_state,dest_container=sub_obj)
-                    except:
-                        #logger.info('%s, wf transition %s of %s failed' % (sid,new_state,sub_obj.id))
-                        pass
-        if res[0].review_state in ('admitted','objection_raised'):
-            wfaction = 'return'
-            try:
-                self.portal_workflow.doActionFor(student_obj,wfaction)
-                logger.info('%s, wf state changed' % sid)
-                any_change = True
-            except:
-                logger.info('%s, wf transition failed, old state = %s' % (sid,res[0].review_state))
-                pass
-        # end inclusion
+        ## included only to change wf state from admitted to returning
+        #    if res[0].review_state in ('admitted','objection_raised'):
+        #        new_state = f2t[pt]['wf_transition_return']
+        #        sub_obj = getattr(student_obj,f2t[pt]['id'],None)
+        #        if sub_obj and new_state != "remain":
+        #            try:
+        #                self.portal_workflow.doActionFor(sub_obj,new_state,dest_container=sub_obj)
+        #            except:
+        #                #logger.info('%s, wf transition %s of %s failed' % (sid,new_state,sub_obj.id))
+        #                pass
+        #if res[0].review_state in ('admitted','objection_raised'):
+        #    wfaction = 'return'
+        #    try:
+        #        self.portal_workflow.doActionFor(student_obj,wfaction)
+        #        logger.info('%s, wf state changed' % sid)
+        #        any_change = True
+        #    except:
+        #        logger.info('%s, wf transition failed, old state = %s' % (sid,res[0].review_state))
+        #        pass
+        ## end inclusion
 
 
@@ -1260,5 +1259,5 @@
                 if by_pass_queue is not None:
                     bypass_queue(bypass_queue_catalog)
-                           
+
             dm = DataModel(item, adapters,context=self)
             ds = DataStructure(data=item,datamodel=dm)
