- Timestamp:
- 26 Apr 2023, 12:20:53 (17 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/utils.py
r17265 r17391 90 90 def _requiredPaymentsMade(self, student, session): 91 91 # SIWESS fee requirement removed on 18/01/2019 92 req_payments = ('ict_entre', 'logbook_combo' )93 req_payments_titles = 'ICT and Logbook'92 req_payments = ('ict_entre', 'logbook_combo','union') 93 req_payments_titles = 'ICT, Student Union and Logbook' 94 94 # All ND and HND part time do not pay for LOGBOOK 95 95 if student.current_mode.endswith('_pt'): 96 req_payments = ('ict_entre', )97 req_payments_titles = ' ICT'96 req_payments = ('ict_entre', 'union') 97 req_payments_titles = 'Student Union and ICT' 98 98 # HND1 and HND2 full time do not pay for LOGBOOK 99 99 elif student.current_mode == 'hnd_ft' and student.state in ( 100 100 CLEARED, RETURNING): 101 req_payments = ('ict_entre', )102 req_payments_titles = ' ICT'101 req_payments = ('ict_entre', 'union') 102 req_payments_titles = 'Student Union and ICT' 103 103 # ND2 FULL TIME do not pay LOGBOOK 104 104 elif student.current_mode == 'nd_ft' and student.state == RETURNING: 105 req_payments = ('ict_entre', )106 req_payments_titles = ' ICT'105 req_payments = ('ict_entre', 'union') 106 req_payments_titles = 'Student Union and ICT' 107 107 num = 0 108 108 if len(student['payments']): … … 153 153 p_level = student['studycourse'].current_level 154 154 p_current = True 155 # The following threefees are part of the school fee which must be155 # The following fout fees are part of the school fee which must be 156 156 # paid before tuition fee. They are paid for next session. 157 if category in ('ict_entre', 'logbook_combo', 'siwess_combo' ) and \157 if category in ('ict_entre', 'logbook_combo', 'siwess_combo', 'union') and \ 158 158 student.state == RETURNING and not previous_session: 159 159 p_session, p_level = self.getReturningData(student)
Note: See TracChangeset for help on using the changeset viewer.