Index: /main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/utils.py
===================================================================
--- /main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/utils.py	(revision 17931)
+++ /main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/utils.py	(revision 17932)
@@ -141,10 +141,18 @@
                             ), None
                     amount = getattr(certificate, 'school_fee_2', 0.0)
+            # Add non-local surcharges
             if amount and not local(student):
-                if student.faccode == 'NCE':
-                    amount += 14600
-                elif student.faccode not in (
-                    'PRE', 'JUPEB', 'DELSU', 'IJMB', 'DP_FT', 'DP_PT'):
-                    amount += 40000
+                non_local_surcharge = 40000
+                if student.faccode in ('FAG', 'FCP', 'FES',
+                                       'FSS', 'FMS', 'FSC',
+                                       'FAT', 'FED'):
+                    if p_level == 200:
+                        non_local_surcharge = 47000
+                    if p_level == 500:
+                        non_local_surcharge = 50000
+                if student.faccode == 'FET':
+                    if p_level == 500:
+                        non_local_surcharge = 31000
+                amount += non_local_surcharge
         elif category == 'clearance':
             try:
