Index: /WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py	(revision 4817)
+++ /WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py	(revision 4818)
@@ -56,5 +56,10 @@
 # begin customization
 
-if review_state == 'cleared_and_validated' and session not in ('07','08'):
+# special handling of 06 payments for testing purposes 
+if review_state == 'cleared_and_validated' and session in ('06'):
+    info['payment_method'] = "online_payment"
+elif review_state == 'returning' and info['next_session'] == '06':
+    info['payment_method'] = "both_payments"
+elif review_state == 'cleared_and_validated' and session not in ('07','08'):
     info['payment_method'] = "both_payments"
 elif review_state == 'cleared_and_validated' and session in ('07','08'):
Index: /WAeUP_SRP/trunk/skins/waeup_epayment/getSchoolFee.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_epayment/getSchoolFee.py	(revision 4817)
+++ /WAeUP_SRP/trunk/skins/waeup_epayment/getSchoolFee.py	(revision 4818)
@@ -121,5 +121,12 @@
          }
 
-d = {}
+
+
+next_info = context.getNextInfo(brain)
+next_session_str = next_info['next_session_str']
+description = "School Fee for Session %s" % next_session_str 
+
+d = {} 
+
 if brain.mode.endswith('_ft'):
     f = 1
@@ -128,9 +135,11 @@
     d['new'] = session_fees[brain.session][f]
     d['returning'] = 'not set'
-    d['description'] = "School Fee for Session %s" % context.getSessionsVoc(key=brain.session)
+    d['description'] =description 
 if pt_fees.has_key(brain.course):
     d = pt_fees[brain.course]
-    d['description'] = "School Fee for Session %s, %s" % (context.getSessionsVoc(key=brain.session),
-                                                         d['description'])
+    d['description'] = "%s (%s)" % (description,d['description'])
+    
+d['next_session_id'] = next_info['next_session_id']
+                                                    
 return d
 
Index: /WAeUP_SRP/trunk/skins/waeup_epayment/pay_interswitch.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_epayment/pay_interswitch.py	(revision 4817)
+++ /WAeUP_SRP/trunk/skins/waeup_epayment/pay_interswitch.py	(revision 4818)
@@ -70,5 +70,6 @@
 info['student_name'] = student_record.name
 info['student_email'] = student_record.email
-info['session_id'] = student_record.session   # this holds only for new students und must be replaced when also previous session students will pay online !!!!!!
+#info['session_id'] = student_record.session   # this holds only for new students und must be replaced when also previous session students will pay online !!!!!!
+info['session_id'] = fee_dict['next_session_id']
 info['type'] = 'online'
 info['status'] = 'started'
