Index: /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py
===================================================================
--- /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py	(revision 10706)
+++ /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py	(revision 10707)
@@ -35,4 +35,5 @@
     ExportPDFBedTicketSlipPage,
     StudentFilesUploadPage, emit_lock_message)
+from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.students.viewlets import (
     PaymentReceiptActionButton, StudentPassportActionButton)
@@ -215,7 +216,10 @@
     @property
     def target_url(self):
+        # Passport pictures must not be editable if application slip
+        # exists.
         slip = getUtility(IExtFileStore).getFileByContext(
             self.context, 'application_slip')
-        if self.context.state != ADMITTED or slip is not None:
+        PWCHANGE_STATES = getUtility(IStudentsUtils).PWCHANGE_STATES
+        if self.context.state not in PWCHANGE_STATES or slip is not None:
             return ''
         return self.view.url(self.view.context, self.target)
@@ -229,7 +233,10 @@
 
     def update(self):
+        # Passport pictures must not be editable if application slip
+        # exists.
         slip = getUtility(IExtFileStore).getFileByContext(
             self.context, 'application_slip')
-        if self.context.state != ADMITTED or slip is not None:
+        PWCHANGE_STATES = getUtility(IStudentsUtils).PWCHANGE_STATES
+        if self.context.state not in PWCHANGE_STATES or slip is not None:
             emit_lock_message(self)
             return
