Index: WAeUP_SRP/trunk/profiles/default/layouts/student_schoolfee.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_schoolfee.xml	(revision 1283)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_schoolfee.xml	(revision 1286)
@@ -7,14 +7,11 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
- <property name="label"></property>
- <property name="label_edit"></property>
- <property name="is_i18n">False</property>
  <widget name="pin" meta_type="Scratchcard Pin Widget">
-  <property name="title">Schoolfee Scratchcard</property>
+  <property name="title">Schoolfee Scratch Card</property>
   <property name="fields">
    <element value="payment_id"/>
   </property>
-  <property name="label">Scratchcard</property>
-  <property name="label_edit">Scratchcard</property>
+  <property name="label">Access Code</property>
+  <property name="label_edit">Access Code</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
Index: WAeUP_SRP/trunk/profiles/default/students_catalog.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/students_catalog.xml	(revision 1283)
+++ WAeUP_SRP/trunk/profiles/default/students_catalog.xml	(revision 1286)
@@ -1,3 +1,3 @@
-<?xml version="1.0"?>
+z<?xml version="1.0"?>
 <object name="portal_catalog" meta_type="WAeUP Table">
  <column value="id"/>
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 1283)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 1286)
@@ -94,4 +94,5 @@
   <exit-transition transition_id="create_content"/>
   <exit-transition transition_id="defer"/>
+  <exit-transition transition_id="pay_school_fee"/>
   <exit-transition transition_id="reject_clearance"/>
   <permission-map name="Delete objects" acquired="False">
@@ -188,11 +189,11 @@
  <state state_id="returning" title="">
   <exit-transition transition_id="create_content"/>
-  <exit-transition transition_id="enter_school_fee_pin"/>
-  <permission-map name="View" acquired="True">
-   <permission-role>Owner</permission-role>
-   <permission-role>SectionOfficer</permission-role>
-  </permission-map>
- </state>
- <state state_id="school_fee_pin_entered" title="">
+  <exit-transition transition_id="pay_school_fee"/>
+  <permission-map name="View" acquired="True">
+   <permission-role>Owner</permission-role>
+   <permission-role>SectionOfficer</permission-role>
+  </permission-map>
+ </state>
+ <state state_id="school_fee_paid" title="">
   <exit-transition transition_id="create_content"/>
   <exit-transition transition_id="register_courses"/>
@@ -224,5 +225,5 @@
              new_state="admitted" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -235,5 +236,5 @@
              new_state="admission_applied" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -246,5 +247,5 @@
              new_state="cleared_and_validated"
              trigger="USER" before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -257,5 +258,5 @@
              new_state="student_created" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>Manager</guard-role>
@@ -268,5 +269,5 @@
              new_state="" trigger="USER" before_script=""
              after_script="">
-
+  
   <guard>
    <guard-role>Manager</guard-role>
@@ -280,5 +281,5 @@
              new_state="deferred" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -291,5 +292,5 @@
              new_state="application_pin_entered"
              trigger="USER" before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -302,20 +303,10 @@
              new_state="clearance_pin_entered"
              trigger="USER" before_script="" after_script="">
-
-  <guard>
-   <guard-role>SectionOfficer</guard-role>
-   <guard-role>Owner</guard-role>
-   <guard-role>Manager</guard-role>
-   <guard-role>SectionManager</guard-role>
-  </guard>
- </transition>
- <transition transition_id="enter_school_fee_pin" title=""
-             new_state="school_fee_pin_entered"
-             trigger="USER" before_script="" after_script="">
-
-  <guard>
-   <guard-role>Manager</guard-role>
-   <guard-role>SectionManager</guard-role>
-   <guard-role>Owner</guard-role>
+  
+  <guard>
+   <guard-role>SectionOfficer</guard-role>
+   <guard-role>Owner</guard-role>
+   <guard-role>Manager</guard-role>
+   <guard-role>SectionManager</guard-role>
   </guard>
  </transition>
@@ -323,5 +314,5 @@
              new_state="finally_rejected" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -332,11 +323,21 @@
  </transition>
  <transition transition_id="notify_change_courses" title=""
-             new_state="school_fee_pin_entered"
-             trigger="USER" before_script="" after_script="">
-
+             new_state="school_fee_paid" trigger="USER"
+             before_script="" after_script="">
+  
   <guard>
    <guard-role>CourseAdviser</guard-role>
    <guard-role>Manager</guard-role>
    <guard-role>SectionManager</guard-role>
+  </guard>
+ </transition>
+ <transition transition_id="pay_school_fee" title=""
+             new_state="school_fee_paid" trigger="USER"
+             before_script="" after_script="">
+  
+  <guard>
+   <guard-role>Manager</guard-role>
+   <guard-role>SectionManager</guard-role>
+   <guard-role>Owner</guard-role>
   </guard>
  </transition>
@@ -344,5 +345,5 @@
              new_state="pume_failed" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -355,5 +356,5 @@
              new_state="pume_passed" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -366,5 +367,5 @@
              new_state="objection_raised" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -378,5 +379,5 @@
              new_state="courses_registered" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>Manager</guard-role>
@@ -388,5 +389,5 @@
              new_state="admission_rejected" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -399,5 +400,5 @@
              new_state="clearance_pin_entered"
              trigger="USER" before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -410,5 +411,5 @@
              new_state="clearance_requested" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -421,5 +422,5 @@
              new_state="returning" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -431,5 +432,5 @@
              new_state="courses_validated" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>CourseAdviser</guard-role>
@@ -443,5 +444,5 @@
   <description>Time of the last transition</description>
   <default>
-
+   
    <expression>state_change/getDateTime</expression>
   </default>
