Index: /main/waeup.futminna/trunk/src/waeup/futminna/students/tests/test_browser.py
===================================================================
--- /main/waeup.futminna/trunk/src/waeup/futminna/students/tests/test_browser.py	(revision 9888)
+++ /main/waeup.futminna/trunk/src/waeup/futminna/students/tests/test_browser.py	(revision 9889)
@@ -176,4 +176,7 @@
 
         # Penalty fee is taken into consideration
+        self.app['configuration']['2005'].penalty_ug = 9999.0
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
+        self.assertEqual(error, u'School fee payment disabled.')
         self.app['configuration']['2005'].penalty_ug = 3000.0
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
Index: /main/waeup.futminna/trunk/src/waeup/futminna/students/utils.py
===================================================================
--- /main/waeup.futminna/trunk/src/waeup/futminna/students/utils.py	(revision 9888)
+++ /main/waeup.futminna/trunk/src/waeup/futminna/students/utils.py	(revision 9889)
@@ -149,4 +149,6 @@
             p_item = self.getAccommodationDetails(student)['bt']
             amount = academic_session.booking_fee
+        if 9999.0 in (academic_session.penalty_pg, academic_session.penalty_ug):
+            return _('School fee payment disabled.'), None
         if amount in (0.0, None):
             return _('Amount could not be determined.'), None
@@ -160,13 +162,7 @@
         # Add session specific penalty fee.
         if category == 'schoolfee' and student.is_postgrad:
-            if academic_session.penalty_pg == 9999.0:
-                amount = 0.0
-            else:
-                amount += academic_session.penalty_pg
+            amount += academic_session.penalty_pg
         elif category == 'schoolfee':
-            if academic_session.penalty_ug == 9999.0:
-                amount = 0.0
-            else:
-                amount += academic_session.penalty_ug
+            amount += academic_session.penalty_ug
         payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = ("%d" % int(time()*10000))[1:]
