Changeset 14213 for main

Timestamp:

11 Oct 2016, 08:58:17 (8 years ago)

Author:

Henrik Bettermann

Message:

Remove restrictions for adding balance payment tickets.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• batching.py (modified) (1 diff)
• utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -831 +831 @@
         p_id = row['p_id'].strip('#')
         # Requirement added on 19/02/2015: same payment must not exist.
-        if self.samePaymentMade(student, obj.p_category, obj.p_session):
+        if obj.p_item != 'Balance' and self.samePaymentMade(
+            student, obj.p_category, obj.p_session):
             student.__parent__.logger.info(
                 '%s - %s - previous update cancelled'

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

@@ -504 +504 @@
         if amount in (0.0, None) or amount < 0:
             return _('Amount must be greater than 0.'), None
-        if self.samePaymentMade(student, 'balance', p_item, p_session):
-            return _('This type of payment has already been made.'), None
         payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = ("%d" % int(time()*10000))[1:]