Index: /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py	(revision 14026)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py	(revision 14027)
@@ -22,4 +22,5 @@
 from zope.component import getUtility, getAdapter
 from zope.i18n import translate
+from hurry.workflow.interfaces import IWorkflowState
 from waeup.kofa.interfaces import (
     IExtFileStore, IFileStoreNameChooser, IKofaUtils)
@@ -28,4 +29,5 @@
 from waeup.kofa.applicants.browser import (
     ApplicantCheckStatusPage, ApplicantBaseDisplayFormPage)
+from waeup.kofa.applicants.workflow import STARTED, PAID
 from waeup.kofa.applicants.viewlets import PDFActionButton
 from waeup.kofa.browser.layout import UtilityView
@@ -300,4 +302,25 @@
     grok.template('applicanteditpage')
 
+    def unremovable(self, ticket):
+        return True
+
+    # AAUE applicants never see the 'Remove Selected Tickets' button.
+    @property
+    def display_actions(self):
+        state = IWorkflowState(self.context).getState()
+        # If the form is unlocked, applicants are allowed to save the form
+        actions = [[_('Save')],]
+        # Only in state started they can also add tickets.
+        if state == STARTED:
+            actions = [[_('Save')], [_('Add online payment ticket'),]]
+        # In state paid, they can submit the data and further add tickets
+        # if the application is special.
+        elif self.context.special and state == PAID:
+            actions = [[_('Save'), _('Finally Submit')],
+                [_('Add online payment ticket'),]]
+        elif state == PAID:
+            actions = [[_('Save'), _('Finally Submit')],]
+        return actions
+
     @property
     def form_fields(self):
Index: /main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py	(revision 14026)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py	(revision 14027)
@@ -51,5 +51,5 @@
         return
 
-    def test_payment_slip_download_warning(self):
+    def test_payment(self):
         configuration = SessionConfiguration()
         configuration.academic_session = session_1
@@ -70,4 +70,7 @@
         self.assertEqual(self.browser.headers['Content-Type'],
                  'application/pdf')
+        # AAUE applicants never see the 'Remove Selected Tickets' button.
+        self.browser.open(self.edit_path)
+        self.assertFalse('Remove' in self.browser.contents)
         return
 
