Ignore:
Timestamp:
15 Jan 2013, 15:33:14 (12 years ago)
Author:
Henrik Bettermann
Message:

Third time lucky.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.futminna/trunk/src/waeup/futminna/students/utils.py

    r9891 r9892  
    149149            p_item = self.getAccommodationDetails(student)['bt']
    150150            amount = academic_session.booking_fee
    151         if category == 'schoolfee' and student.is_postgrad and \
    152             9999.0 == academic_session.penalty_pg:
    153             return _('School fee payment is disabled.'), None
    154         elif category == 'schoolfee' and 9999.0 == academic_session.penalty_ug:
    155             return _('School fee payment is disabled.'), None
     151        if category == 'schoolfee':
     152            if (student.is_postgrad and
     153                academic_session.penalty_pg == 9999.0) or \
     154                (not student.is_postgrad and
     155                academic_session.penalty_ug == 9999.0):
     156                return _('School fee payment is disabled.'), None
    156157        if amount in (0.0, None):
    157158            return _('Amount could not be determined.'), None
Note: See TracChangeset for help on using the changeset viewer.