Changeset 9157

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:

• tests/test_browser.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py

@@ -232 +232 @@
         self.assertTrue(u'Amount could not be determined.' in error)
 
-        # Previous session payment, fresh and returning
-        # are being distinguished by their entry_level
+        # Previous session payment; fresh and returning
+        # are distinguished by their entry_level
         error, payment = utils.setPaymentDetails('schoolfee',
             self.student, 2004, 300)
@@ -240 +240 @@
         self.assertEqual(payment.p_level, 300)
         self.assertFalse(payment.p_current)
-        self.student['studycourse'].entry_session = 2003
-        error, payment = utils.setPaymentDetails('schoolfee',
-            self.student, 2004, 300)
+        error, payment = utils.setPaymentDetails('schoolfee',
+            self.student, 2005, 300)
         self.assertEqual(payment.amount_auth, 20000.0)
-        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.p_session, 2005)
         self.assertEqual(payment.p_level, 300)
         self.assertFalse(payment.p_current)
 
-        # Current payment, fresh and returning
-        # are being distinguished by their state
+        # Current payment; fresh and returning
+        # are distinguished by their state
         IWorkflowState(self.student).setState('cleared')
         error, payment = utils.setPaymentDetails('schoolfee',

main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

@@ -97 +97 @@
                 return _('Study course data are incomplete.'), None
             if previous_session:
-                if student.current_session == student['studycourse'].entry_session:
+                if previous_session == student['studycourse'].entry_session:
                     if student.is_foreigner:
                         amount = getattr(certificate, 'school_fee_3', 0.0)