Index: /main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py	(revision 16680)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py	(revision 16681)
@@ -113,4 +113,7 @@
             self.pay_item_id = '101'
             self.mac = MAC_PT
+            if self.applicant.__parent__.prefix == 'ijmbe':
+                xmldict['institution_bank_id'] = '123'
+                xmldict['institution_acct'] = '1012278272'
         else:
             self.product_id = PRODUCT_ID_REGULAR
@@ -145,7 +148,4 @@
                 self.institution_acct = '0001115694'
                 self.institution_bank_id = '10'
-            elif self.applicant.__parent__.prefix == 'ijmbe':
-                xmldict['institution_bank_id'] = '123'
-                xmldict['institution_acct'] = '1012278272'
 
         xmldict = {}
@@ -317,8 +317,11 @@
                 xmldict['institution_acct'] = '1014847058'
                 xmldict['institution_bank_id'] = '7'
+                self.pay_item_id = '105'
                 if student.current_mode == 'found':
                     self.pay_item_id = '103'
-                else:
-                    self.pay_item_id = '105'
+                elif student.current_mode == 'ijmbe':
+                    self.pay_item_id = '119'
+                    xmldict['institution_bank_id'] = '123'
+                    xmldict['institution_acct'] = '1012278272'
             else:
                 # Second agreement
@@ -347,8 +350,4 @@
                     xmldict['institution_acct'] = '5210006575'
                     xmldict['institution_bank_id'] = '51'
-                if student.current_mode == 'ijmbe':
-                    self.pay_item_id = '119'
-                    xmldict['institution_bank_id'] = '123'
-                    xmldict['institution_acct'] = '1012278272'
 
             xmldict['provider_amt'] = 100 * provider_amt
@@ -462,10 +461,13 @@
             if contr_agreement_student(student) == 'first':
                 # First agreement
+                xmldict['institution_acct'] = '1014847058'
+                xmldict['institution_bank_id'] = '7'
+                self.pay_item_id = '104'
                 if student.current_mode == 'found':
                     self.pay_item_id = '102'
-                else:
-                    self.pay_item_id = '104'
-                xmldict['institution_acct'] = '1014847058'
-                xmldict['institution_bank_id'] = '7'
+                elif student.current_mode == 'ijmbe':
+                    self.pay_item_id = '120'
+                    xmldict['institution_bank_id'] = '123'
+                    xmldict['institution_acct'] = '1012278272'
             else:
                 # Second agreement
@@ -475,8 +477,4 @@
                     xmldict['institution_acct'] = '5210006575'
                     xmldict['institution_bank_id'] = '51'
-                if student.current_mode == 'ijmbe':
-                    self.pay_item_id = '120'
-                    xmldict['institution_bank_id'] = '123'
-                    xmldict['institution_acct'] = '1012278272'
                 # ivama: Acceptance fee split is unique to "ug_ft"
                 # The reason for split is perculiar to them only...
