Index: /WAeUP_SRP/trunk/skins/waeup_aaua/getSchoolFee.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_aaua/getSchoolFee.py	(revision 5171)
+++ /WAeUP_SRP/trunk/skins/waeup_aaua/getSchoolFee.py	(revision 5172)
@@ -14,4 +14,7 @@
  
 d = {}
+d['all'] = 0
+
+MPA = ('MPAPT','MEMPT','MMPPT') 
 
 if brain.mode == 'ug_sw':    # ug_sw students payment does not depend on the current session
@@ -37,8 +40,4 @@
         elif str(brain.level) == '700':  # only 700 fresh
             d['all'] = 75000  
-        else:
-            d['all'] = 0    
-    else:
-        d['all'] = 0
 elif brain.session in ('06',) and brain.review_state == 'returning': 
     if brain.mode == 'dp_pt':  
@@ -53,19 +52,49 @@
         else:
             d['all'] = 65000
-    else:
-        d['all'] = 0
         
-elif brain.session in ('07','08','09',):       # 07 returning students, and all students registering for 08 upwards
-    if instalment == '1':
-        d['all'] = 8888888      # for testing
-        d['instalment'] = '1'
-    elif instalment == '2':
-        d['all'] = 9999999      # for testing
-        d['instalment'] = '2'
-    else:
-        d['all'] = 0
-else:
-    d['all'] = 0
-
+elif brain.session in ('07','08','09',):    
+    if brain.mode == 'dp_pt':  
+        if brain.review_state == 'cleared_and_validated' and str(brain.level) in ('100',):
+            if instalment == '1':
+                d['all'] = 35000
+            elif instalment == '2':
+                d['all'] = 20000
+        elif brain.review_state == 'returning':
+            if instalment == '1':
+                d['all'] = 25000
+            elif instalment == '2':
+                d['all'] = 10000
+    if brain.mode == 'ug_pt':  
+        if brain.review_state == 'cleared_and_validated' and str(brain.level) in ('100','200'):
+            if instalment == '1':
+                d['all'] = 40000
+            elif instalment == '2':
+                d['all'] = 30000
+        elif brain.review_state == 'returning':
+            if instalment == '1':
+                d['all'] = 25000
+            elif instalment == '2':
+                d['all'] = 20000
+    if brain.mode == 'pg_pt':  
+        if brain.review_state == 'cleared_and_validated' and str(brain.level) in ('600',):
+            if instalment == '1':
+                d['all'] = 65000
+            elif instalment == '2':
+                d['all'] = 50000
+        elif brain.review_state == 'returning':
+            if instalment == '1':
+                d['all'] = 35000
+            elif instalment == '2':
+                d['all'] = 30000
+        elif brain.review_state == 'cleared_and_validated' and str(brain.level) in ('700',) and brain.course in MPA:                           
+            if instalment == '1':
+                d['all'] = 85000
+            elif instalment == '2':
+                d['all'] = 80000
+        elif brain.review_state == 'cleared_and_validated' and str(brain.level) in ('700',) :                           
+            if instalment == '1':
+                d['all'] = 95000
+            elif instalment == '2':
+                d['all'] = 85000
 
 next_info = context.getNextInfo(brain)
