Changeset 14660

Timestamp:

29 Mar 2017, 20:51:06 (7 years ago)

Author:

Henrik Bettermann

Message:

"dp_ft" Diploma Full Time should be included in the payment of restitution fee.

Location:

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

Files:

• studylevel.py (modified) (1 diff)
• utils.py (modified) (1 diff)

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

@@ -139 +139 @@
         restitution_paid = True
         if self.student.entry_session < 2016 \
-            and self.student.current_mode == 'ug_ft':
+            and self.student.current_mode in ('ug_ft', 'dp_ft'):
             restitution_paid = False
             for ticket in self.student['payments'].values():

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

@@ -250 +250 @@
             amount = academic_session.booking_fee
         elif category == 'restitution':
-            if student.entry_session == 2016 \
-                and student.current_session == 2016 \
-                or student.current_mode != 'ug_ft':
+            if student.entry_session >= 2016 \
+                or student.current_mode not in ('ug_ft', 'dp_ft'):
                 return _(u'Restitution fee payment not required.'), None
             amount = academic_session.restitution_fee