Changeset 15108 for main

Timestamp:

15 Aug 2018, 10:46:30 (6 years ago)

Author:

Henrik Bettermann

Message:

Add development fee to school fee.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -231 +231 @@
             and student.current_mode == 'special_ft':
             amount = 80000.0
-        elif category == 'develop' and student.is_postgrad:
-            amount = academic_session.development_fee
+        #elif category == 'develop' and student.is_postgrad:
+        #    amount = academic_session.development_fee
         elif category == 'bed_allocation':
             p_item = self.getAccommodationDetails(student)['bt']
@@ -365 +365 @@
         if category == 'schoolfee' and student.is_postgrad:
             amount += academic_session.penalty_pg
+            amount += academic_session.development_fee
         elif category == 'schoolfee' and student.current_mode == ('ug_ft'):
             amount += academic_session.penalty_ug_ft

main/waeup.uniben/trunk/src/waeup/uniben/utils/utils.py

@@ -109 +109 @@
         #'pharmd_1':'PharmD Clerkship Fee (1st school fee prepayment)',
         'pharmd_2':'PharmD Module 1 Fee (school fee prepayment)',
-        'develop':'Development Fee',
+        #'develop':'Development Fee',
         }