Changeset 14378 for main/waeup.aaue/trunk/src/waeup/aaue
- Timestamp:
- 9 Jan 2017, 06:32:18 (8 years ago)
- 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_utils.py
r14229 r14378 117 117 self.assertEqual(error, None) 118 118 119 error, payment = utils.setPaymentDetails('restitution',self.student) 120 self.assertEqual(error, 'Restitution fee payment not required.') 121 self.student['studycourse'].certificate.study_mode = 'ug_ft' 122 self.app['configuration']['2004'].restitution_fee = 1111.0 123 error, payment = utils.setPaymentDetails('restitution',self.student) 124 self.assertEqual(payment.p_level, 100) 125 self.assertEqual(payment.p_session, 2004) 126 self.assertEqual(payment.amount_auth, 1111.0) 127 self.assertEqual(payment.p_item, u'') 128 self.assertEqual(error, None) 129 119 130 error, payment = utils.setPaymentDetails('schoolfee',self.student, 2004, 100) 120 131 self.assertEqual(error, u'Previous session payment not yet implemented.') -
main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py
r14296 r14378 189 189 elif category == 'bed_allocation': 190 190 amount = academic_session.booking_fee 191 elif category == 'restitution': 192 if student.entry_session > 2015 \ 193 or student.current_mode != 'ug_ft': 194 return _(u'Restitution fee payment not required.'), None 195 amount = academic_session.restitution_fee 191 196 elif category == 'hostel_maintenance': 192 197 amount = 0.0
Note: See TracChangeset for help on using the changeset viewer.