Changeset 17397 for main


Ignore:
Timestamp:
28 Apr 2023, 08:38:41 (20 months ago)
Author:
Henrik Bettermann
Message:

Pt students do not pay SUD.

Location:
main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/tests/test_utils.py

    r17391 r17397  
    7474        self.app['configuration']['2005'].union_fee = 1434.0
    7575        error, payment = utils.setPaymentDetails('schoolfee',self.student)
    76         self.assertEqual(error, u'Pay Student Union and ICT fee(s) first.')
     76        self.assertEqual(error, u'Pay ICT fee(s) first.')
    7777        error, payment = utils.setPaymentDetails('ict_entre',self.student)
    7878        self.assertEqual(error, None)
     
    8282        payment.p_state = 'paid'
    8383        self.student['payments']['any_key'] = payment
    84         error, payment = utils.setPaymentDetails('union',self.student)
    85         self.assertEqual(error, None)
    86         self.assertEqual(payment.p_level, 200)
    87         self.assertEqual(payment.p_session, 2005)
    88         self.assertEqual(payment.amount_auth, 1434.0)
    89         payment.p_state = 'paid'
    90         self.student['payments']['any_key_2'] = payment
     84        #error, payment = utils.setPaymentDetails('union',self.student)
     85        #self.assertEqual(error, None)
     86        #self.assertEqual(payment.p_level, 200)
     87        #self.assertEqual(payment.p_session, 2005)
     88        #self.assertEqual(payment.amount_auth, 1434.0)
     89        #payment.p_state = 'paid'
     90        #self.student['payments']['any_key_2'] = payment
    9191        error, payment = utils.setPaymentDetails('schoolfee',self.student)
    9292        self.assertEqual(error, None)
  • main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/students/utils.py

    r17391 r17397  
    9292        req_payments = ('ict_entre', 'logbook_combo','union')
    9393        req_payments_titles = 'ICT, Student Union and Logbook'
    94         # All ND and HND part time do not pay for LOGBOOK
     94        # All ND and HND part time do not pay for logbook and union
    9595        if student.current_mode.endswith('_pt'):
    96             req_payments = ('ict_entre', 'union')
    97             req_payments_titles = 'Student Union and ICT'
     96            req_payments = ('ict_entre',)
     97            req_payments_titles = 'ICT'
    9898        # HND1 and HND2 full time do not pay for LOGBOOK
    9999        elif student.current_mode == 'hnd_ft' and student.state in (
Note: See TracChangeset for help on using the changeset viewer.