Index: /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py
===================================================================
--- /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py	(revision 18235)
+++ /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py	(revision 18236)
@@ -270,5 +270,6 @@
             p_level = student['studycourse'].current_level
             p_current = True
-            if category in list(self._all_required_payments) + ['required_combi',] \
+            if category in list(self._all_required_payments) + [
+                'required_combi','schoolfee','schoolfee40','secondinstal'] \
                 and student.state == RETURNING:
                 # In case of school fee or required sundry fee payments the
@@ -429,7 +430,6 @@
             p_level = student['studycourse'].current_level
             p_current = True
-            if category in self.REQUIRED_PAYMENTS_FRESH.keys() \
-                + self.REQUIRED_PAYMENTS_RETURNING.keys() \
-                + ['schoolfee','schoolfee40','secondinstal'] \
+            if category in list(self._all_required_payments) + [
+                'required_combi','schoolfee','schoolfee40','secondinstal'] \
                 and student.state == RETURNING:
                 # In case of school fee or required sundry fee payments the
