Changeset 18032 for main

Timestamp:

7 Mar 2025, 02:32:15 (3 days ago)

Author:

Henrik Bettermann

Message:

Do not deduct provider amount if blanace payment.

File:

• main/waeup.uniben/trunk/src/waeup/uniben/remita/browser.py (modified) (4 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/remita/browser.py

@@ -154 +154 @@
         reduced_inst_amt = 0.0
         lab_amt = 0.0
-        if self.context.p_category in ('schoolfee', 'schoolfee_1') and \
-            not self.context.p_item == 'Balance':
+        if self.context.p_category in ('schoolfee', 'schoolfee_1'):
             provider_amt = self.dynamic_provider_amt(self.context.student)
             if self.context.student.current_mode == 'ug_ft':
@@ -163 +162 @@
         elif self.context.p_category == 'bed_allocation':
             provider_amt = 1000.0
+        if self.context.p_item == 'Balance':
+            provider_amt = 0.0
 
         inst_amt = self.context.amount_auth - provider_amt - student_union
@@ -205 +206 @@
                 reduced_inst_amt = 0.4 * inst_amt
                 jupeb_amt = 0.6 * inst_amt
-            elif self.context.p_category in ('schoolfee', 'schoolfee_1') and \
-                not self.context.p_item == 'Balance':
+            elif self.context.p_category in ('schoolfee', 'schoolfee_1'):
                 provider_amt = self.dynamic_provider_amt(self.context.student)
                 #if self.context.student.depcode in ('AGR_JUP','EDU_JUP','ENG_JUP',
@@ -213 +213 @@
                 reduced_inst_amt = 0.4 * (inst_amt - lab_amt)
                 jupeb_amt = 0.6 * (inst_amt - lab_amt) + lab_amt
+            if self.context.p_item == 'Balance':
+                provider_amt = 0.0
             lineitems = (
                           {"lineItemsId":"itemid1","beneficiaryName":"Uniben",