Changeset 18214 for main/waeup.aaue
- Timestamp:
- 1 Dec 2025, 14:47:15 (12 months ago)
- Location:
- main/waeup.aaue/trunk/src/waeup/aaue
- Files:
-
- 3 edited
-
interfaces.py (modified) (2 diffs)
-
students/studylevel.py (modified) (2 diffs)
-
utils/utils.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py
r18045 r18214 201 201 202 202 gst_text_book_3_fee = schema.Float( 203 title = _(u'Text Book Fee GST222 '),203 title = _(u'Text Book Fee GST222/GST211'), 204 204 default = 0.0, 205 205 required = True, … … 231 231 232 232 gst_registration_2_fee = schema.Float( 233 title = _(u'Registration Fee GST222 '),233 title = _(u'Registration Fee GST222/GST211'), 234 234 default = 0.0, 235 235 required = True, -
main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py
r18158 r18214 298 298 not 'gst_registration_1' in paid_cats: 299 299 return False 300 if course.code in ('GST222', ) and \300 if course.code in ('GST222','GST211') and \ 301 301 not 'gst_registration_2' in paid_cats: 302 302 return False … … 309 309 not 'gst_text_book_0' in paid_cats: 310 310 return False 311 if course.code in ('GST222', ) and \311 if course.code in ('GST222','GST211') and \ 312 312 not 'gst_text_book_3' in paid_cats: 313 313 return False -
main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py
r18210 r18214 62 62 'gst_text_book_1': 'Text Book Fee GST101 GST102', 63 63 'gst_text_book_2': 'Text Book Fee GST111 GST112', 64 'gst_text_book_3': 'Text Book Fee GST222 ',64 'gst_text_book_3': 'Text Book Fee GST222/GST211', 65 65 'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112', 66 'gst_registration_2': 'Registration Fee GST222 ',66 'gst_registration_2': 'Registration Fee GST222/GST211', 67 67 'ent_text_book_1': 'Text Book Fee ENT201', 68 68 'ent_text_book_2': 'Text Book Fee ENT211', … … 113 113 'gst_text_book_1': 'Text Book Fee GST101 GST102', 114 114 'gst_text_book_2': 'Text Book Fee GST111 GST112', 115 'gst_text_book_3': 'Text Book Fee GST222 ',115 'gst_text_book_3': 'Text Book Fee GST222/GST211', 116 116 'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112', 117 'gst_registration_2': 'Registration Fee GST222 ',117 'gst_registration_2': 'Registration Fee GST222/GST211', 118 118 'ent_text_book_1': 'Text Book Fee ENT201', 119 119 'ent_text_book_2': 'Text Book Fee ENT211', … … 177 177 'ent_registration_0': 'Registration Fee for ENT201 and ENT211', 178 178 'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112', 179 'gst_registration_2': 'Registration Fee GST222 ',179 'gst_registration_2': 'Registration Fee GST222/GST211', 180 180 'gst_text_book_0': 'Text Book Fee GST101 GST102 GST111 GST112', 181 181 'gst_text_book_1': 'Text Book Fee GST101 GST102', 182 182 'gst_text_book_2': 'Text Book Fee GST111 GST112', 183 'gst_text_book_3': 'Text Book Fee GST222 ',183 'gst_text_book_3': 'Text Book Fee GST222/GST211', 184 184 'ent_combined': 'Registration and Textbook Fee for ENT201 and ENT211', 185 185 'late_registration': 'Late Course Registration Fee', … … 229 229 'gst_text_book_1': 'Text Book Fee GST101 GST102', 230 230 'gst_text_book_2': 'Text Book Fee GST111 GST112', 231 'gst_text_book_3': 'Text Book Fee GST222 ',231 'gst_text_book_3': 'Text Book Fee GST222/GST211', 232 232 'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112', 233 'gst_registration_2': 'Registration Fee GST222 ',233 'gst_registration_2': 'Registration Fee GST222/GST211', 234 234 'ent_text_book_1': 'Text Book Fee ENT201', 235 235 'ent_text_book_2': 'Text Book Fee ENT211',
Note: See TracChangeset for help on using the changeset viewer.
