Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py	(revision 14891)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py	(revision 14892)
@@ -542,5 +542,4 @@
         IWorkflowState(self.student).setState('returning')
 
-
         #error, payment = utils.setPaymentDetails('schoolfee',
         #    self.student, None, None)
@@ -565,5 +564,19 @@
         self.assertEqual(error, None)
 
+        # Old returning students pay less
+        self.certificate.school_fee_2 = 50000.0
+        self.certificate.custom_textline_1 = 'sciEnce'
+        error, payment = utils.setPaymentDetails(
+            'schoolfee', self.student, None, None)
+        # minus 30000
+        self.assertEqual(payment.amount_auth, 20088.0)
+        self.certificate.custom_textline_1 = 'non-Science'
+        error, payment = utils.setPaymentDetails(
+            'schoolfee', self.student, None, None)
+        # minus 28000
+        self.assertEqual(payment.amount_auth, 22088.0)
+
         # Staff members pay less.
+        self.certificate.custom_textline_1 = ''
         self.student.is_staff = True
         error, payment = utils.setPaymentDetails('schoolfee',
@@ -571,5 +584,5 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 10088.0)
+        self.assertEqual(payment.amount_auth, 25088.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)
Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py	(revision 14891)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py	(revision 14892)
@@ -351,4 +351,12 @@
                     else:
                         amount = getattr(certificate, 'school_fee_2', 0.0)
+                        # Old returning students get a discount of
+                        # N30000 and N28000 respectively.
+                        if student.entry_session < 2017 \
+                            and certificate.custom_textline_1:
+                            if certificate.custom_textline_1.lower() == 'science':
+                                amount -= 30000
+                            elif certificate.custom_textline_1.lower() == 'non-science':
+                                amount -= 28000
             # Give 50% school fee discount to staff members.
             if student.is_staff:
