Index: /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/tests.py
===================================================================
--- /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/tests.py	(revision 18042)
+++ /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/interswitch/tests.py	(revision 18043)
@@ -99,5 +99,5 @@
         self.browser.getControl(name="form.p_option").value = ['first']
         self.browser.getControl("Create payment").click()
-        self.assertTrue('Make either single payments or make a' in self.browser.contents)
+        self.assertTrue('must be paid before Tution Fee' in self.browser.contents)
         self.browser.getControl(name="form.p_category").value = ['required_combi']
         self.browser.getControl("Create payment").click()
Index: /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py
===================================================================
--- /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py	(revision 18042)
+++ /main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py	(revision 18043)
@@ -183,4 +183,8 @@
             or student.certcode in ('MBBSMED',):
             return
+        # Only in states, which allow to pay school fees, sundry payments
+        # are required
+        if student.state not in (CLEARANCE, REQUESTED, CLEARED, RETURNING):
+            return
         # Has the required combi payment been made?
         for ticket in student['payments'].values():
@@ -201,5 +205,5 @@
                 if not cats_missing:
                     return
-        return "%s must be paid before Tution Fee. Make either single payments or make a 'Required Combi Payment'." % ', '.join(
+        return "%s must be paid before Tution Fee. Make a 'Required Combi Payment'." % ', '.join(
             cats_missing.values())
 
