Changeset 13503 for main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students

Timestamp:

27 Nov 2015, 04:50:33 (9 years ago)

Author:

Henrik Bettermann

Message:

Do not try to determine maintenance fee if no bed is allocated.

File:

• main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py (modified) (2 diffs)

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

@@ -194 +194 @@
             bedticket = student['accommodation'].get(
                 str(student.current_session), None)
-            if bedticket:
+            if bedticket is not None and bedticket.bed is not None:
                 p_item = bedticket.bed_coordinates
                 if bedticket.bed.__parent__.maint_fee > 0:
@@ -202 +202 @@
                     amount = academic_session.maint_fee
             else:
-                # Should not happen because this is already checked
-                # in the browser module, but anyway ...
                 portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-                p_item = trans(_('no bed allocated'), portal_language)
+                p_item = trans(_('No bed allocated.'), portal_language)
         elif category == 'clearance':
             amount = academic_session.clearance_fee