Index: /WAeUP_SRP/trunk/skins/waeup_default/getNextSessionId.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/getNextSessionId.py	(revision 1763)
+++ /WAeUP_SRP/trunk/skins/waeup_default/getNextSessionId.py	(revision 1764)
@@ -10,7 +10,8 @@
 # $Id$
 """
-return the next Session Id 
+return the next Session Id
 """
-if session != context.getSessionId():
+
+if session != context.getSessionId()[2:]:
     ns = int(session) + 1
 else:
Index: /WAeUP_SRP/trunk/skins/waeup_default/getSessionId.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/getSessionId.py	(revision 1763)
+++ /WAeUP_SRP/trunk/skins/waeup_default/getSessionId.py	(revision 1764)
@@ -10,6 +10,9 @@
 # $Id$
 """
-return the Session Id 
+return the Session Id
 """
+
+# must be changed in 2007/2008; should return only the last two digits
+
 import DateTime
 now = DateTime.DateTime()
Index: /WAeUP_SRP/trunk/skins/waeup_default/getSessionString.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/getSessionString.py	(revision 1763)
+++ /WAeUP_SRP/trunk/skins/waeup_default/getSessionString.py	(revision 1764)
@@ -1,3 +1,3 @@
-## Script (Python) "getSessionId"
+## Script (Python) "getSessionString"
 ##bind container=container
 ##bind context=context
@@ -10,5 +10,5 @@
 # $Id$
 """
-return the Session string 
+return the Session string
 """
 import DateTime
Index: eUP_SRP/trunk/skins/waeup_epayment/callback.pt_not_used
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_epayment/callback.pt_not_used	(revision 1763)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<metal:html>
-  <metal:body use-macro="here/main_template/macros/master">
-    <metal:main fill-slot="main">
-      x_RespCode: <span tal:replace="request/x_RespCode|nothing" /><br />
-      x_RespDesc: <span tal:replace="request/x_RespDesc|nothing" /><br />
-      x_RespPayRef: <span tal:replace="request/x_RespPayRef|nothing" /><br />
-      x_CardNum: <span tal:replace="request/x_CardNum|nothing" /><br />
-      x_ApprAmt: <span tal:replace="request/x_ApprAmt|nothing" /><br />
-    </metal:main>
-  </metal:body>
-</metal:html>
Index: /WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py	(revision 1763)
+++ /WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py	(revision 1764)
@@ -92,9 +92,9 @@
     payment.getContent().edit(mapping=info)
     wftool.doActionFor(payment,'close')
-    if next_session == context.getSessionId(): 
+    if next_session == context.getSessionId()[2:]:
         wftool.doActionFor(student,'pay_school_fee')
     else:
         study_course = getattr(student,'study_course')
-        wftool.doActionFor(study_course,'open')
+        #wftool.doActionFor(study_course,'open')
         study_course_doc = study_course.getContent()
         next_level = "%s" % (int(s_brain.level) + 100)
