Index: /WAeUP_SRP/trunk/skins/waeup_epayment/epayment_cb.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_epayment/epayment_cb.py	(revision 1303)
+++ /WAeUP_SRP/trunk/skins/waeup_epayment/epayment_cb.py	(revision 1304)
@@ -42,5 +42,5 @@
 context.getContent().edit(mapping=pd)
 wftool.doActionFor(student,'pay_school_fee')
-wftool.doActionFor(context,'close')
+#wftool.doActionFor(context,'close')
 
-return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url()) 
+return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url())
Index: /WAeUP_SRP/trunk/skins/waeup_epayment/pay_online.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_epayment/pay_online.py	(revision 1303)
+++ /WAeUP_SRP/trunk/skins/waeup_epayment/pay_online.py	(revision 1304)
@@ -33,5 +33,5 @@
 ##    logger.info('"%s","certificate not found", "%s"' % (student_id,course))
 ##    sfc = "ART"
-##else:    
+##else:
 ##    sfc = res[0].getPath().split('/')[-4]
 info = {}
@@ -71,5 +71,5 @@
 payment.getContent().edit(mapping=d)
 wftool.doActionFor(payment,'close')
-wftool.doActionFor(student,'pay_school_fee')
+#wftool.doActionFor(student,'pay_school_fee')
 info['callback_url'] = "%s/payments/%s/epayment_cb" % (student.absolute_url(),p_id)
 if context.portal_url().find('uniben-demo.waeup.org') >-1 or\
Index: /WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py	(revision 1303)
+++ /WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py	(revision 1304)
@@ -28,8 +28,9 @@
 info['url'] = student.absolute_url()
 review_state = info['review_state'] = wf.getInfoFor(student,'review_state',None)
-info['returning'] = review_state in  ('returning',
+info['cr'] = review_state in  ('returning',
                                            'school_fee_paid',
                                            'courses_registered',
                                            'courses_validated',
                                            )
+
 return info
Index: /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt	(revision 1303)
+++ /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt	(revision 1304)
@@ -3,5 +3,5 @@
            condition="context/isStudent">       
 
-<table class="registration" tal:condition="not:info/returning">
+<table class="registration" tal:condition="not:info/cr">
   <span tal:condition="python:path('info/review_state')=='application_pin_entered'">
   <tr><td class="active">
@@ -102,5 +102,5 @@
 </table>
 
-<table class="registration" tal:condition="info/returning">
+<table class="registration" tal:condition="info/cr">
   <span tal:condition="python:info['review_state']=='returning'">
   <tr><td class="active">
@@ -108,9 +108,4 @@
     Returning
     </a>
-  </td></tr>
-  </span>
-  <span tal:condition="python:info['review_state']!='returning'">
-  <tr><td>
-    Returning
   </td></tr>
   </span>
