Changeset 10192 for main

Timestamp:

22 May 2013, 12:48:32 (12 years ago)

Author:

Henrik Bettermann

Message:

Only ug_pt students get the reduction?!

Location:

main/waeup.aaua/trunk/src/waeup/aaua/students

Files:

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

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

@@ -170 +170 @@
 
         # Returning students with entry session 2005-2007
-        # get a reduction of 20000
+        # and study mode ug_pt get a reduction of 20000
+        self.certificate.study_mode = 'ug_pt'
         IWorkflowState(self.student).setState('returning')
         self.student['studycourse'].entry_session = 2005

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

@@ -83 +83 @@
                 elif category == 'schoolfee_1':
                     amount = getattr(certificate, 'school_fee_2', 0.0) * ratio
-                    if student['studycourse'].entry_session in (2005, 2006, 2007):
+                    if student['studycourse'].entry_session in (
+                        2005, 2006, 2007) and student.current_mode == 'ug_pt':
                         amount -= 20000.0
             elif student.is_postgrad and student.state == PAID: