Changeset 18214


Ignore:
Timestamp:
1 Dec 2025, 14:47:15 (12 months ago)
Author:
Henrik Bettermann
Message:

Registration Fee GST222 to Registration Fee GST222/GST211

Location:
main/waeup.aaue/trunk/src/waeup/aaue
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py

    r18045 r18214  
    201201
    202202    gst_text_book_3_fee = schema.Float(
    203         title = _(u'Text Book Fee GST222'),
     203        title = _(u'Text Book Fee GST222/GST211'),
    204204        default = 0.0,
    205205        required = True,
    … …  
    231231
    232232    gst_registration_2_fee = schema.Float(
    233         title = _(u'Registration Fee GST222'),
     233        title = _(u'Registration Fee GST222/GST211'),
    234234        default = 0.0,
    235235        required = True,
  • main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

    r18158 r18214  
    298298                not 'gst_registration_1' in paid_cats:
    299299                return False
    300             if course.code in ('GST222',) and \
     300            if course.code in ('GST222','GST211') and \
    301301                not 'gst_registration_2' in paid_cats:
    302302                return False
    … …  
    309309                not 'gst_text_book_0' in paid_cats:
    310310                return False
    311             if course.code in ('GST222',) and \
     311            if course.code in ('GST222','GST211') and \
    312312                not 'gst_text_book_3' in paid_cats:
    313313                return False
  • main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

    r18210 r18214  
    6262        'gst_text_book_1': 'Text Book Fee GST101 GST102',
    6363        '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',
    6565        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
    66         'gst_registration_2': 'Registration Fee GST222',
     66        'gst_registration_2': 'Registration Fee GST222/GST211',
    6767        'ent_text_book_1': 'Text Book Fee ENT201',
    6868        'ent_text_book_2': 'Text Book Fee ENT211',
    … …  
    113113        'gst_text_book_1': 'Text Book Fee GST101 GST102',
    114114        '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',
    116116        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
    117         'gst_registration_2': 'Registration Fee GST222',
     117        'gst_registration_2': 'Registration Fee GST222/GST211',
    118118        'ent_text_book_1': 'Text Book Fee ENT201',
    119119        'ent_text_book_2': 'Text Book Fee ENT211',
    … …  
    177177        'ent_registration_0': 'Registration Fee for ENT201 and ENT211',
    178178        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
    179         'gst_registration_2': 'Registration Fee GST222',
     179        'gst_registration_2': 'Registration Fee GST222/GST211',
    180180        'gst_text_book_0': 'Text Book Fee GST101 GST102 GST111 GST112',
    181181        'gst_text_book_1': 'Text Book Fee GST101 GST102',
    182182        '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',
    184184        'ent_combined': 'Registration and Textbook Fee for ENT201 and ENT211',
    185185        'late_registration': 'Late Course Registration Fee',
    … …  
    229229        'gst_text_book_1': 'Text Book Fee GST101 GST102',
    230230        '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',
    232232        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
    233         'gst_registration_2': 'Registration Fee GST222',
     233        'gst_registration_2': 'Registration Fee GST222/GST211',
    234234        'ent_text_book_1': 'Text Book Fee ENT201',
    235235        'ent_text_book_2': 'Text Book Fee ENT211',
Note: See TracChangeset for help on using the changeset viewer.