Changeset 13410 for main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

Timestamp:

8 Nov 2015, 06:18:44 (9 years ago)

Author:

Henrik Bettermann

Message:

Remove duplicate payment category.

File:

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

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

@@ -31 +31 @@
         'schoolfee_1': 'School Fee 1st instalment',
         'schoolfee_2': 'School Fee 2nd instalment',
-        'schoolfee_incl': 'School Fee plus',
+        'schoolfee_incl': 'School Fee Plus',
         'clearance': 'Acceptance Fee',
-        'clearance_incl': 'Acceptance Fee plus',
+        'clearance_incl': 'Acceptance Fee Plus',
+        'clearance_medical': 'Medical Student Acceptance Fee',
+        'clearance_medical_incl': 'Medical Student Acceptance Fee Plus',
+        'medical': 'Medical Student Acceptance Fee', # deprecated
         'hostel_maintenance': 'Hostel Maintenance Fee',
         'application': 'Application Fee',
@@ -46 +49 @@
         'matric_gown': 'Matriculation Gown Fee',
         'concessional': 'Concessional Fee',
-        'medical': 'Medical Student Acceptance Fee',
         }
 
@@ -53 +55 @@
         #'schoolfee_1': 'School Fee 1st instalment',
         #'schoolfee_2': 'School Fee 2nd instalment',
-        'schoolfee_incl': 'School Fee plus Students\' Union and Welfare Assurance fees',
+        'schoolfee_incl': 'School Fee + Students\' Union Dues + Welfare Assurance Fee',
         'clearance': 'Acceptance Fee without additional fees',
-        'clearance_incl': 'Acceptance Fee plus Matric Gown and Lapel/File fees',
+        'clearance_incl': 'Acceptance Fee + Matric Gown Fee + Lapel/File Fee',
+        'clearance_medical': 'Medical Student Acceptance Fee',
+        'clearance_medical_incl': 'Medical Student Acceptance Fee + Matric Gown Fee + Lapel/File Fee',
         'hostel_maintenance': 'Hostel Maintenance Fee',
         'application': 'Application Fee',
@@ -68 +72 @@
         'matric_gown': 'Matriculation Gown Fee',
         'concessional': 'Concessional Fee',
-        'medical': 'Medical Student Acceptance Fee',
         }