Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py	(revision 6299)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py	(revision 6300)
@@ -26,5 +26,5 @@
     start_transition = Transition(
         transition_id = 'start',
-        title = 'Start',
+        title = 'Start application',
         source = INITIALIZED,
         destination = STARTED)
@@ -32,5 +32,5 @@
     submit_transition = Transition(
         transition_id = 'submit',
-        title = 'Submit',
+        title = 'Submit application record',
         source = STARTED,
         destination = SUBMITTED)
@@ -38,12 +38,18 @@
     admit_transition = Transition(
         transition_id = 'admit',
-        title = 'Admit',
+        title = 'Admit applicant',
         source = SUBMITTED,
         destination = ADMITTED)
 
-    defer_transition = Transition(
-        transition_id = 'defer',
-        title = 'Defer',
+    refuse1_transition = Transition(
+        transition_id = 'refuse1',
+        title = 'Refuse application',
         source = SUBMITTED,
+        destination = NOT_ADMITTED)
+
+    refuse2_transition = Transition(
+        transition_id = 'refuse2',
+        title = 'Refuse application',
+        source = ADMITTED,
         destination = NOT_ADMITTED)
 
@@ -54,12 +60,31 @@
         destination = CREATED)
 
-    #final_transition = Transition(
-    #    transition_id = 'finalize',
-    #    title = 'Delete',
-    #    source = ADMITTED,
-    #    destination = None)
+    reset1_transition = Transition(
+        transition_id = 'reset1',
+        title = 'Reset application',
+        source = SUBMITTED,
+        destination = STARTED)
+
+    reset2_transition = Transition(
+        transition_id = 'reset2',
+        title = 'Reset application',
+        source = ADMITTED,
+        destination = STARTED)
+
+    reset3_transition = Transition(
+        transition_id = 'reset3',
+        title = 'Reset application',
+        source = NOT_ADMITTED,
+        destination = STARTED)
+
+    reset4_transition = Transition(
+        transition_id = 'reset4',
+        title = 'Reset application',
+        source = CREATED,
+        destination = STARTED)
 
     return [init_transition, start_transition, submit_transition, admit_transition,
-        defer_transition, create_transition,]
+         create_transition, refuse1_transition, refuse2_transition, reset1_transition,
+         reset2_transition, reset3_transition, reset4_transition]
 
 
@@ -117,5 +142,5 @@
 grok.global_utility(ApplicationWorkflowNullVersions, IWorkflowVersions)
 
-class WorkflowState(grok.Adapter, WorkflowState):
+class ApplicationState(grok.Adapter, WorkflowState):
     """An adapter to adapt Applicant objects to workflow states.
     """
@@ -123,5 +148,5 @@
     grok.provides(IWorkflowState)
     
-class WorkflowInfo(grok.Adapter, WorkflowInfo):
+class ApplicationInfo(grok.Adapter, WorkflowInfo):
     """Adapter to adapt Applicant objects to workflow info objects.
     """
