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

Timestamp:

6 May 2014, 17:40:21 (11 years ago)

Author:

Henrik Bettermann

Message:

Session specific penalty fee must be added before re-categorization of carryover fees.

Fees are required and must not be set to None.

File:

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

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

@@ -258 +258 @@
                ticket.p_session == p_session:
                   return _('This type of payment has already been made.'), None
+        # Add session specific penalty fee.
+        if category == 'schoolfee' and student.is_postgrad:
+            amount += academic_session.penalty_pg
+        elif category == 'schoolfee':
+            amount += academic_session.penalty_ug
+        # Recategorize carryover fees.
         if category.startswith('carryover'):
             p_item = getUtility(IKofaUtils).PAYMENT_CATEGORIES[category]
@@ -263 +269 @@
             # Now we change the category to reduce the number of categories.
             category = 'schoolfee'
-        # Add session specific penalty fee.
-        if category == 'schoolfee' and student.is_postgrad:
-            amount += academic_session.penalty_pg
-        elif category == 'schoolfee':
-            amount += academic_session.penalty_ug
         if self._isPaymentDisabled(p_session, category, student):
             return _('Payment temporarily disabled.'), None