Index: /main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py	(revision 14116)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py	(revision 14117)
@@ -110,4 +110,10 @@
         )
 
+    late_pg_registration_fee = schema.Float(
+        title = _(u'Late PG Course Reg. Fee'),
+        default = 0.0,
+        required = True,
+        )
+
     welfare_fee = schema.Float(
         title = _(u'AAU Student Welfare Assurance Fee'),
@@ -141,5 +147,29 @@
 
     coursereg_deadline = schema.Datetime(
-        title = _(u'Course Reg. Deadline'),
+        title = _(u'FT Course Reg. Deadline'),
+        required = False,
+        description = _('Example: ') + u'2011-12-31 23:59:59+01:00',
+        )
+
+    coursereg_deadline_pg = schema.Datetime(
+        title = _(u'PG Course Reg. Deadline'),
+        required = False,
+        description = _('Example: ') + u'2011-12-31 23:59:59+01:00',
+        )
+
+    coursereg_deadline_pt = schema.Datetime(
+        title = _(u'PT Course Reg. Deadline'),
+        required = False,
+        description = _('Example: ') + u'2011-12-31 23:59:59+01:00',
+        )
+
+    coursereg_deadline_dp = schema.Datetime(
+        title = _(u'DP Course Reg. Deadline'),
+        required = False,
+        description = _('Example: ') + u'2011-12-31 23:59:59+01:00',
+        )
+
+    coursereg_deadline_found = schema.Datetime(
+        title = _(u'FOUND Course Reg. Deadline'),
         required = False,
         description = _('Example: ') + u'2011-12-31 23:59:59+01:00',
Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py	(revision 14116)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py	(revision 14117)
@@ -99,6 +99,19 @@
             return True
         try:
-            deadline = grok.getSite()['configuration'][
-                    str(self.level_session)].coursereg_deadline
+            if self.student.is_postgrad:
+                deadline = grok.getSite()['configuration'][
+                        str(self.level_session)].coursereg_deadline_pg
+            elif self.student.current_mode.startswith('dp'):
+                deadline = grok.getSite()['configuration'][
+                        str(self.level_session)].coursereg_deadline_dp
+            elif self.student.current_mode.endswith('_pt'):
+                deadline = grok.getSite()['configuration'][
+                        str(self.level_session)].coursereg_deadline_pt
+            elif self.student.current_mode == 'found':
+                deadline = grok.getSite()['configuration'][
+                        str(self.level_session)].coursereg_deadline_found
+            else:
+                deadline = grok.getSite()['configuration'][
+                        str(self.level_session)].coursereg_deadline
         except (TypeError, KeyError):
             return True
Index: /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 14116)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py	(revision 14117)
@@ -227,5 +227,8 @@
                     gateway_net_amt(academic_session.lapel_fee)
         elif category == 'late_registration':
-            amount = academic_session.late_registration_fee
+            if student.is_postgrad:
+                amount = academic_session.late_pg_registration_fee
+            else:
+                amount = academic_session.late_registration_fee
         elif category.startswith('schoolfee'):
             try:
