Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py	(revision 11592)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py	(revision 11593)
@@ -19,4 +19,5 @@
 import shutil
 import tempfile
+import grok
 from StringIO import StringIO
 from hurry.workflow.interfaces import IWorkflowState
@@ -433,2 +434,30 @@
         self.assertEqual(utils.maxCredits(dummy), 48)
         return
+
+    def test_set_matric_number(self):
+        site = grok.getSite()
+        utils = getUtility(IStudentsUtils)
+        site['configuration'].next_matric_integer = 1
+        self.student.matric_number = None
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(msg, None)
+        self.assertEqual(mnumber, 1)
+        self.assertEqual(self.student.matric_number, 'fac1/dep1/04/00001')
+        self.assertEqual(site['configuration'].next_matric_integer, 2)
+        # Part time have an extended matric number
+        self.student.matric_number = None
+        self.student['studycourse'].certificate.study_mode = 'ug_pt'
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(self.student.matric_number, 'PTP/fac1/dep1/04/00002')
+        # Foundation programme students don't get matric number.
+        self.student.matric_number = None
+        self.student['studycourse'].certificate.study_mode = 'found'
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(msg, 'Matriculation number cannot be set.')
+        self.assertEqual(mnumber, None)
+        # Certificate must be set.
+        self.student.matric_number = None
+        self.student['studycourse'].certificate = None
+        msg, mnumber = utils.setMatricNumber(self.student)
+        self.assertEqual(msg, 'No certificate assigned.')
+        return
Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 11592)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 11593)
@@ -70,4 +70,16 @@
                       (4.5, '2nd Class Honours Upper Division'),
                       (5, '1st Class Honours'))
+
+    def _constructMatricNumber(self, student, next_integer):
+        faccode = student.faccode
+        depcode = student.depcode
+        year = unicode(student.entry_session)[2:]
+        if student.current_mode in ('ug_pt', 'de_pt'):
+            return "PTP/%s/%s/%s/%05d" % (faccode, depcode, year, next_integer)
+        if student.current_mode in ('pg_ft', 'pg_pt'):
+            return "SPS/%s/%s/%s/%05d" % (faccode, depcode, year, next_integer)
+        if student.current_mode == 'found':
+            return None
+        return "%s/%s/%s/%05d" % (faccode, depcode, year, next_integer)
 
     def getReturningData(self, student):
Index: /main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py	(revision 11592)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py	(revision 11593)
@@ -68,4 +68,6 @@
         'ug_ft': 'Undergraduate Full Time',
         'ug_pt': 'Undergraduate Part Time',
+        'de_ft': 'Direct Entry Full Time',
+        'de_pt': 'Direct Entry Part Time',
         'dp_pt': 'Diploma Part Time',
         'dp_ft': 'Diploma Full Time',
