Index: /WAeUP_SRP/base/WAeUPImport.py
===================================================================
--- /WAeUP_SRP/base/WAeUPImport.py	(revision 3335)
+++ /WAeUP_SRP/base/WAeUPImport.py	(revision 3336)
@@ -351,5 +351,5 @@
         student_record = None
         id_count = 0
-        for id_key in ('id','matric_no'):
+        for id_key in ('matric_no','id'):
             id_field = mapping.get(id_key,'')
             if id_field:
@@ -358,8 +358,8 @@
                 search_field = id_field
         while True:
-            if id_count > 1:
-                msg = "both id and matric_no are provided"
-                break
-            elif id_count == 0:
+            #if id_count > 1:
+            #    msg = "both id and matric_no are provided"
+            #    break
+            if id_count == 0:
                 msg = "neither id nor matric_no provided"
                 break
@@ -441,5 +441,5 @@
             if msg:
                 break
-            student_id = student_record.id    
+            student_id = student_record.id
             level_id = mapping.get('level_id','')
             code = mapping.get('code','')
