Ignore:
Timestamp:
5 Sep 2012, 06:01:47 (12 years ago)
Author:
Henrik Bettermann
Message:

Not current session but the previous session selected must coincide with entry session.

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

Legend:

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

    r9152 r9157  
    232232        self.assertTrue(u'Amount could not be determined.' in error)
    233233
    234         # Previous session payment, fresh and returning
    235         # are being distinguished by their entry_level
     234        # Previous session payment; fresh and returning
     235        # are distinguished by their entry_level
    236236        error, payment = utils.setPaymentDetails('schoolfee',
    237237            self.student, 2004, 300)
     
    240240        self.assertEqual(payment.p_level, 300)
    241241        self.assertFalse(payment.p_current)
    242         self.student['studycourse'].entry_session = 2003
    243         error, payment = utils.setPaymentDetails('schoolfee',
    244             self.student, 2004, 300)
     242        error, payment = utils.setPaymentDetails('schoolfee',
     243            self.student, 2005, 300)
    245244        self.assertEqual(payment.amount_auth, 20000.0)
    246         self.assertEqual(payment.p_session, 2004)
     245        self.assertEqual(payment.p_session, 2005)
    247246        self.assertEqual(payment.p_level, 300)
    248247        self.assertFalse(payment.p_current)
    249248
    250         # Current payment, fresh and returning
    251         # are being distinguished by their state
     249        # Current payment; fresh and returning
     250        # are distinguished by their state
    252251        IWorkflowState(self.student).setState('cleared')
    253252        error, payment = utils.setPaymentDetails('schoolfee',
  • main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

    r9152 r9157  
    9797                return _('Study course data are incomplete.'), None
    9898            if previous_session:
    99                 if student.current_session == student['studycourse'].entry_session:
     99                if previous_session == student['studycourse'].entry_session:
    100100                    if student.is_foreigner:
    101101                        amount = getattr(certificate, 'school_fee_3', 0.0)
Note: See TracChangeset for help on using the changeset viewer.