Changeset 17364 for main

Timestamp:

27 Mar 2023, 13:22:52 (21 months ago)

Author:

Henrik Bettermann

Message:

Hostel fee is paid by instalments too.

Location:

main/kofacustom.edocons/trunk/src/kofacustom/edocons

Files:

• interfaces.py (modified) (3 diffs)
• utils/utils.py (modified) (2 diffs)

main/kofacustom.edocons/trunk/src/kofacustom/edocons/interfaces.py

@@ -38 +38 @@
 
     booking_fee = schema.Float(
-        title = _(u'Bed Booking Fee'),
+        title = _(u'Bed Booking Fee (n/a)'),
         default = 0.0,
         required = False,
@@ -44 +44 @@
 
     maint_fee = schema.Float(
-        title = _(u'Rent (fallback)'),
+        title = _(u'Rent (n/a)'),
+        default = 0.0,
+        required = False,
+        )
+
+    hostel_fee = schema.Float(
+        title = _(u'Hostel Fee (Total)'),
+        default = 0.0,
+        required = False,
+        )
+
+    hostel_fee_1 = schema.Float(
+        title = _(u'Hostel Fee (1st Instalment)'),
+        default = 0.0,
+        required = False,
+        )
+
+    hostel_fee_2 = schema.Float(
+        title = _(u'Hostel Fee (2nd Instalment)'),
         default = 0.0,
         required = False,
@@ -63 +81 @@
     transfer_fee = schema.Float(
         title = _(u'Transfer Fee'),
-        default = 0.0,
-        required = False,
-        )
-
-    hostel_fee = schema.Float(
-        title = _(u'Hostel Fee'),
         default = 0.0,
         required = False,

main/kofacustom.edocons/trunk/src/kofacustom/edocons/utils/utils.py

@@ -60 +60 @@
         'secondinstal': 'School Fee (34% - 2nd instalment)',
         'clearance': 'Acceptance Fee',
-        'hostel':'Hostel Fee',
+        'hostel':'Hostel Fee (Total)',
+        'hostel_1':'Hostel Fee (1st instalment)',
+        'hostel_2':'Hostel Fee (2nd instalment)',
         #'bed_allocation': 'Bed Allocation Fee',
         #'hostel_maintenance': 'Hostel Maintenance Fee',
@@ -77 +79 @@
         'schoolfee_1': 'School Fee (66% - 1st instalment)',
         'secondinstal': 'School Fee (34% - 2nd instalment)',
-        'hostel':'Hostel Fee',
+        'hostel':'Hostel Fee (Total)',
+        'hostel_1':'Hostel Fee (1st instalment)',
+        'hostel_2':'Hostel Fee (2nd instalment)',
         'resit': 'Resit Fee',
         }