Index: /main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/browser.py
===================================================================
--- /main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/browser.py	(revision 17022)
+++ /main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/browser.py	(revision 17023)
@@ -21,4 +21,5 @@
 from zope.formlib.textwidgets import BytesDisplayWidget
 from zope.component import getUtility
+from hurry.workflow.interfaces import IWorkflowState
 from waeup.kofa.widgets.datewidget import (
     FriendlyDateDisplayWidget,
@@ -33,6 +34,10 @@
     ExportPDFPaymentSlipPage,
     ApplicantBaseDisplayFormPage)
+from waeup.kofa.applicants.workflow import (
+    INITIALIZED, STARTED, PAID, SUBMITTED, 
+    ADMITTED, NOT_ADMITTED, CREATED, PROCESSED)
 from waeup.kofa.students.interfaces import IStudentsUtils
-from waeup.kofa.applicants.interfaces import IApplicantOnlinePayment
+from waeup.kofa.applicants.interfaces import (
+    IApplicantOnlinePayment, IApplicantsUtils)
 from kofacustom.nigeria.applicants.interfaces import INigeriaApplicantOnlinePayment
 from kofacustom.nigeria.applicants.browser import NigeriaExportPDFPaymentSlipPage
@@ -72,4 +77,17 @@
 
     @property
+    def display_actions(self):
+        actions = [[_('Save'), _('Finally Submit')],
+                   [
+                    #_('Add online payment ticket'),
+                    _('Add balance payment ticket'),
+                    _('Remove selected tickets')
+                   ]]
+        applicants_utils = getUtility(IApplicantsUtils)
+        if self.context.state not in applicants_utils.BALANCE_PAYMENT_STATES:
+            actions[1].pop(1)
+        return actions
+
+    @property
     def form_fields(self):
         form_fields = grok.AutoFields(ICustomApplicant)
@@ -85,4 +103,33 @@
     def unremovable(self, ticket):
         return True
+
+    @property
+    def display_actions(self):
+        state = IWorkflowState(self.context).getState()
+        actions = [[_('Save')], 
+                   [
+                    #_('Remove selected tickets')
+                   ]]
+        if state == STARTED:
+            actions = [[_('Save')],
+                [
+                 #_('Add online payment ticket'),
+                 #_('Remove selected tickets')
+                ]]
+        elif self.context.special and state == PAID:
+            actions = [[_('Save'), _('Finally Submit')],
+                [
+                 #_('Add online payment ticket'),
+                 #_('Remove selected tickets')
+                ]]
+        elif state == PAID:
+            actions = [[_('Save'), _('Finally Submit')],
+                [
+                 #_('Remove selected tickets')
+                ]]
+        applicants_utils = getUtility(IApplicantsUtils)
+        if self.context.state in applicants_utils.BALANCE_PAYMENT_STATES:
+            actions[1].append(_('Add balance payment ticket'))
+        return actions
 
     @property
Index: /main/kofacustom.lpng/trunk/src/kofacustom/lpng/interswitch/tests.py
===================================================================
--- /main/kofacustom.lpng/trunk/src/kofacustom/lpng/interswitch/tests.py	(revision 17022)
+++ /main/kofacustom.lpng/trunk/src/kofacustom/lpng/interswitch/tests.py	(revision 17023)
@@ -235,5 +235,5 @@
 
 
-    def test_interswitch_form(self):
+    def disabled_test_interswitch_form(self):
         # Manager can access InterswitchForm
         self.browser.getLink("Pay via Interswitch", index=0).click()
