Index: /WAeUP_SRP/trunk/profiles/default/layouts/import_student.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/import_student.xml	(revision 1770)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/import_student.xml	(revision 1771)
@@ -56,5 +56,5 @@
   <property name="vocabulary">states</property>
  </widget>
- <widget name="lga" meta_type="Select Widget">
+ <widget name="lga" meta_type="String Widget">
   <property name="title">LGA</property>
   <property name="fields">
@@ -66,5 +66,4 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">local_gov_areas</property>
  </widget>
  <widget name="firstname" meta_type="String Widget">
@@ -271,5 +270,5 @@
   <row>
    <cell name="current_mode"/>
-  </row>  
+  </row>
   <row>
    <cell name="entry_session"/>
@@ -296,5 +295,5 @@
    <cell name="study_course"/>
   </row>
- 
+
  </table>
 </object>
Index: /WAeUP_SRP/trunk/skins/waeup_default/getNextSessionId.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/getNextSessionId.py	(revision 1770)
+++ /WAeUP_SRP/trunk/skins/waeup_default/getNextSessionId.py	(revision 1771)
@@ -13,5 +13,5 @@
 """
 
-if session != context.getSessionId()[2:]:
+if session != context.getSessionId()[-2:]:
     ns = int(session) + 1
 else:
Index: /WAeUP_SRP/trunk/skins/waeup_default/import_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/import_form.pt	(revision 1770)
+++ /WAeUP_SRP/trunk/skins/waeup_default/import_form.pt	(revision 1771)
@@ -3,5 +3,5 @@
            data_storage options/ds;
            formaction options/formaction|string:import;
-           button options/button|string:import;
+           button options/button|string:Import;
            creation creation|nothing;"
            >
@@ -18,5 +18,5 @@
           <br />
           <input type="submit" class="standalone" 
-                 name="import" value="Import"
+                 name="import" value="import"
                  tal:attributes="value button"
                  tal:condition="not:creation" />
Index: /WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py	(revision 1770)
+++ /WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py	(revision 1771)
@@ -92,5 +92,5 @@
     payment.getContent().edit(mapping=info)
     wftool.doActionFor(payment,'close')
-    if next_session == context.getSessionId()[2:]:
+    if next_session == context.getSessionId()[-2:]:
         wftool.doActionFor(student,'pay_school_fee')
     else:
Index: /WAeUP_SRP/trunk/skins/waeup_utilities/ti_188_resolve.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_utilities/ti_188_resolve.py	(revision 1770)
+++ /WAeUP_SRP/trunk/skins/waeup_utilities/ti_188_resolve.py	(revision 1771)
@@ -49,4 +49,6 @@
 res = scat()
 for sbrain in res:
+    if not sbrain.matric_no:
+        continue
     if str(sbrain.level) == '100':
         ec = "new"
