Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_subobject_wf/definition.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_subobject_wf/definition.xml	(revision 1512)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_subobject_wf/definition.xml	(revision 1515)
@@ -12,7 +12,9 @@
   <exit-transition transition_id="open"/>
   <permission-map name="Add portal content" acquired="True">
+   <permission-role>CourseAdviser</permission-role>
    <permission-role>SectionOfficer</permission-role>
   </permission-map>
   <permission-map name="Delete objects" acquired="False">
+   <permission-role>CourseAdviser</permission-role>
    <permission-role>Manager</permission-role>
    <permission-role>SectionManager</permission-role>
@@ -21,7 +23,9 @@
                   acquired="True">
    <permission-role>ClearanceOfficer</permission-role>
+   <permission-role>CourseAdviser</permission-role>
    <permission-role>SectionOfficer</permission-role>
   </permission-map>
   <permission-map name="View" acquired="True">
+   <permission-role>CourseAdviser</permission-role>
    <permission-role>SectionOfficer</permission-role>
   </permission-map>
@@ -32,8 +36,10 @@
   <exit-transition transition_id="open"/>
   <permission-map name="Add portal content" acquired="True">
+   <permission-role>CourseAdviser</permission-role>
    <permission-role>Owner</permission-role>
    <permission-role>SectionOfficer</permission-role>
   </permission-map>
   <permission-map name="Delete objects" acquired="False">
+   <permission-role>CourseAdviser</permission-role>
    <permission-role>Manager</permission-role>
    <permission-role>Owner</permission-role>
@@ -43,7 +49,9 @@
   <permission-map name="Modify portal content"
                   acquired="True">
+   <permission-role>CourseAdviser</permission-role>
    <permission-role>SectionOfficer</permission-role>
   </permission-map>
   <permission-map name="View" acquired="True">
+   <permission-role>CourseAdviser</permission-role>
    <permission-role>SectionOfficer</permission-role>
   </permission-map>
@@ -101,4 +109,5 @@
    <guard-role>SectionManager</guard-role>
    <guard-role>Owner</guard-role>
+   <guard-role>CourseAdviser</guard-role>
   </guard>
  </transition>
@@ -112,4 +121,5 @@
    <guard-role>SectionManager</guard-role>
    <guard-role>Owner</guard-role>
+   <guard-role>CourseAdviser</guard-role>
   </guard>
  </transition>
@@ -141,4 +151,5 @@
    <guard-role>SectionManager</guard-role>
    <guard-role>Owner</guard-role>
+   <guard-role>CourseAdviser</guard-role>
   </guard>
  </transition>
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 1512)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 1515)
@@ -110,5 +110,5 @@
  </state>
  <state state_id="courses_registered" title="">
-  <exit-transition transition_id="notify_change_courses"/>
+  <exit-transition transition_id="reject_courses"/>
   <exit-transition transition_id="validate_courses"/>
   <permission-map name="View" acquired="True">
@@ -118,4 +118,5 @@
  </state>
  <state state_id="courses_validated" title="">
+  <exit-transition transition_id="reject_courses"/>
   <permission-map name="View" acquired="True">
    <permission-role>Owner</permission-role>
@@ -226,5 +227,5 @@
              new_state="admitted" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -237,5 +238,5 @@
              new_state="admission_applied" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -248,5 +249,5 @@
              new_state="cleared_and_validated"
              trigger="USER" before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -259,5 +260,5 @@
              new_state="student_created" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>Manager</guard-role>
@@ -271,5 +272,5 @@
              new_state="" trigger="USER" before_script=""
              after_script="">
-
+  
   <guard>
    <guard-role>Manager</guard-role>
@@ -283,5 +284,5 @@
              new_state="deferred" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -294,5 +295,5 @@
              new_state="application_pin_entered"
              trigger="USER" before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -305,5 +306,5 @@
              new_state="clearance_pin_entered"
              trigger="USER" before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -316,18 +317,8 @@
              new_state="finally_rejected" trigger="USER"
              before_script="" after_script="">
-
-  <guard>
-   <guard-role>SectionOfficer</guard-role>
-   <guard-role>ClearanceOfficer</guard-role>
-   <guard-role>Manager</guard-role>
-   <guard-role>SectionManager</guard-role>
-  </guard>
- </transition>
- <transition transition_id="notify_change_courses" title=""
-             new_state="school_fee_paid" trigger="USER"
-             before_script="" after_script="">
-
-  <guard>
-   <guard-role>CourseAdviser</guard-role>
+  
+  <guard>
+   <guard-role>SectionOfficer</guard-role>
+   <guard-role>ClearanceOfficer</guard-role>
    <guard-role>Manager</guard-role>
    <guard-role>SectionManager</guard-role>
@@ -337,5 +328,5 @@
              new_state="school_fee_paid" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>Manager</guard-role>
@@ -348,5 +339,5 @@
              new_state="pume_failed" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -359,5 +350,5 @@
              new_state="pume_passed" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -370,5 +361,5 @@
              new_state="objection_raised" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -382,6 +373,7 @@
              new_state="courses_registered" trigger="USER"
              before_script="" after_script="">
-
-  <guard>
+  
+  <guard>
+   <guard-role>CourseAdviser</guard-role>
    <guard-role>Manager</guard-role>
    <guard-role>SectionManager</guard-role>
@@ -392,5 +384,5 @@
              new_state="admission_rejected" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -403,8 +395,19 @@
              new_state="clearance_pin_entered"
              trigger="USER" before_script="" after_script="">
-
-  <guard>
-   <guard-role>SectionOfficer</guard-role>
-   <guard-role>ClearanceOfficer</guard-role>
+  
+  <guard>
+   <guard-role>SectionOfficer</guard-role>
+   <guard-role>ClearanceOfficer</guard-role>
+   <guard-role>Manager</guard-role>
+   <guard-role>SectionManager</guard-role>
+  </guard>
+ </transition>
+ <transition transition_id="reject_courses" title=""
+             new_state="school_fee_paid" trigger="USER"
+             before_script="" after_script="">
+  
+  <guard>
+   <guard-role>CourseAdviser</guard-role>
+   <guard-role>SectionOfficer</guard-role>
    <guard-role>Manager</guard-role>
    <guard-role>SectionManager</guard-role>
@@ -414,5 +417,5 @@
              new_state="clearance_requested" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -425,5 +428,5 @@
              new_state="returning" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -435,5 +438,5 @@
              new_state="courses_validated" trigger="USER"
              before_script="" after_script="">
-
+  
   <guard>
    <guard-role>CourseAdviser</guard-role>
@@ -447,5 +450,5 @@
   <description>Time of the last transition</description>
   <default>
-
+   
    <expression>state_change/getDateTime</expression>
   </default>
