Index: /main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/tests/test_utils.py
===================================================================
--- /main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/tests/test_utils.py	(revision 17726)
+++ /main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/tests/test_utils.py	(revision 17727)
@@ -39,4 +39,9 @@
         # nd_ft
         self.certificate.study_mode ='nd_ft'
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(msg, 'Matriculation number cannot be set.')
+        error, payment = utils.setPaymentDetails('clearance',self.student)
+        payment.p_state = 'paid'
+        self.student['payments']['any_key'] = payment
         msg, mnumber = utils.setMatricNumber(self.student)
         self.assertEqual(self.student.matric_number, 'fac1/ND/04/00001')
Index: /main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/utils.py
===================================================================
--- /main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/utils.py	(revision 17726)
+++ /main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/utils.py	(revision 17727)
@@ -248,8 +248,15 @@
         #depcode = student.depcode
         #certcode = student.certcode
+        clearance_paid = False
+        if len(student['payments']):
+            for ticket in student['payments'].values():
+                if ticket.p_state == 'paid' and \
+                    ticket.p_category == 'clearance' and \
+                    ticket.p_session == student.entry_session:
+                        clearance_paid = True
+                        break
+        if not clearance_paid or not student.is_fresh:
+            return _('Matriculation number cannot be set.'), None
         year = unicode(student.entry_session)[2:]
-        if not student.state in (PAID, ) or not student.is_fresh:
-            return _('Matriculation number cannot be set.'), None
-
         # SASND1809001
         if student.current_mode == 'nd_ft':
