Changeset 13502 for main/waeup.aaue/trunk/src/waeup

Timestamp:

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

Author:

Henrik Bettermann

Message:

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

File:

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

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

@@ -132 +132 @@
             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.display_coordinates
                 if bedticket.bed.__parent__.maint_fee > 0:
@@ -140 +140 @@
                     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 == 'welfare':
             amount = academic_session.welfare_fee