Changeset 9892 for main/waeup.futminna/trunk/src/waeup/futminna/students/utils.py

Timestamp:

15 Jan 2013, 15:33:14 (12 years ago)

Author:

Henrik Bettermann

Message:

Third time lucky.

File:

• main/waeup.futminna/trunk/src/waeup/futminna/students/utils.py (modified) (1 diff)

main/waeup.futminna/trunk/src/waeup/futminna/students/utils.py

@@ -149 +149 @@
             p_item = self.getAccommodationDetails(student)['bt']
             amount = academic_session.booking_fee
-        if category == 'schoolfee' and student.is_postgrad and \
-            9999.0 == academic_session.penalty_pg:
-            return _('School fee payment is disabled.'), None
-        elif category == 'schoolfee' and 9999.0 == academic_session.penalty_ug:
-            return _('School fee payment is disabled.'), None
+        if category == 'schoolfee':
+            if (student.is_postgrad and
+                academic_session.penalty_pg == 9999.0) or \
+                (not student.is_postgrad and
+                academic_session.penalty_ug == 9999.0):
+                return _('School fee payment is disabled.'), None
         if amount in (0.0, None):
             return _('Amount could not be determined.'), None