Changeset 13855 for main


Ignore:
Timestamp:
2 May 2016, 10:13:16 (9 years ago)
Author:
Henrik Bettermann
Message:

See ticket #213.

Location:
main/waeup.aaue/trunk/src/waeup/aaue/students
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

    r13834 r13855  
    333333        self.browser.getControl("Create ticket").click()
    334334        self.assertTrue(
    335             'Another school fee payment for this session has already been made'
    336             in self.browser.contents)
     335            'You must chose a payment which includes additional fees'
     336            in self.browser.contents)
     337        #self.assertTrue(
     338        #    'Another school fee payment for this session has already been made'
     339        #    in self.browser.contents)
    337340        # Test hostel maintenance payments
    338341        self.browser.open(self.student_path + '/payments')
  • main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

    r13854 r13855  
    197197            if student.state not in (ADMITTED, CLEARANCE, REQUESTED, CLEARED):
    198198                return _(u'Acceptance Fee payments not allowed.'), None
     199            if student.current_mode in (
     200                'ug_ft', 'ug_pt', 'de_ft', 'de_pt',
     201                'transfer', 'mug_ft', 'mde_ft') \
     202                and category != 'clearance_incl':
     203                    return _("Additional fees must be included."), None
    199204            if student.faccode == 'FP':
    200205                amount = academic_session.clearance_fee_fp
     
    231236            if student.is_postgrad and category != 'schoolfee':
    232237                return _("No additional fees required."), None
     238            if student.current_mode in (
     239                'ug_ft', 'ug_pt', 'de_ft', 'de_pt',
     240                'transfer', 'mug_ft', 'mde_ft') \
     241                and not category in (
     242                'schoolfee_incl', 'schoolfee_1', 'schoolfee_2'):
     243                    return _("You must chose a payment which includes "
     244                             "additional fees."), None
    233245            if category in ('schoolfee_1', 'schoolfee_2'):
    234246                if student.current_mode == 'ug_pt':
Note: See TracChangeset for help on using the changeset viewer.