Index: /WAeUP_SRP/trunk/profiles/fceokene/layouts/acco_hall.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/fceokene/layouts/acco_hall.xml	(revision 3867)
+++ /WAeUP_SRP/trunk/profiles/fceokene/layouts/acco_hall.xml	(revision 3868)
@@ -208,4 +208,7 @@
   </row>
   <row>
+   <cell name="special_handling"/>
+  </row>  
+  <row>
    <cell name="text"/>
   </row>
Index: /WAeUP_SRP/trunk/skins/waeup_student/getStudentFolderInfo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/getStudentFolderInfo.py	(revision 3867)
+++ /WAeUP_SRP/trunk/skins/waeup_student/getStudentFolderInfo.py	(revision 3868)
@@ -115,5 +115,5 @@
 except:
     current_level = 0
-info['transition_return_allowed'] = info['review_state'] in ('school_fee_paid','courses_validated') and info['is_sectionofficer'] # and current_level > 100
+info['transition_return_allowed'] = info['review_state'] in ('school_fee_paid','courses_validated','graduated') and info['is_sectionofficer'] # and current_level > 100
 info['transition_pay_school_fee_allowed'] = info['review_state'] == 'returning' and info['is_sectionofficer']
 info['transition_admit_allowed'] = info['review_state'] == 'returning' and info['is_sectionofficer']
Index: /WAeUP_SRP/trunk/skins/waeup_student/student_view.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/student_view.pt	(revision 3867)
+++ /WAeUP_SRP/trunk/skins/waeup_student/student_view.pt	(revision 3868)
@@ -111,5 +111,5 @@
               tal:condition="info/transition_return_allowed"
               tal:attributes="action string:${context/absolute_url}/changeRegState">
-          <input type="submit" class="context" value="Execute Transition 'return'" />
+          <input type="submit" class="context" value="Transfer to returning" />
           <input type="hidden" name="transition"
                  tal:attributes="value string:return"
@@ -121,5 +121,5 @@
               tal:condition="info/transition_pay_school_fee_allowed"
               tal:attributes="action string:${context/absolute_url}/changeRegState">
-          <input type="submit" class="context" value="Execute Transition 'pay_school_fee'" />
+          <input type="submit" class="context" value="Transfer to school_fee_paid" />
           <input type="hidden" name="transition"
                  tal:attributes="value string:pay_school_fee"
@@ -131,5 +131,5 @@
               tal:condition="info/transition_admit_allowed"
               tal:attributes="action string:${context/absolute_url}/changeRegState">
-          <input type="submit" class="context" value="Execute Transition 'admit'" />
+          <input type="submit" class="context" value="Transfer to admitted" />
           <input type="hidden" name="transition"
                  tal:attributes="value string:admit"
