Index: /main/kofacustom.edocons/trunk/src/kofacustom/edocons/applicants/browser.py
===================================================================
--- /main/kofacustom.edocons/trunk/src/kofacustom/edocons/applicants/browser.py	(revision 17105)
+++ /main/kofacustom.edocons/trunk/src/kofacustom/edocons/applicants/browser.py	(revision 17106)
@@ -184,13 +184,6 @@
 
     def display_fileupload(self, filename):
-        if filename[1] == 'res_stat' \
-            and self.target is not None \
-            and not self.target.startswith('tsc'):
+        if self.target is not None and not self.target.startswith('tsc'):
             return False
-        if filename[1] == 'testimonial' \
-            and self.target is not None \
-            and not self.target.startswith('tsc'):
-            return False
-        return True
 
     @property
@@ -221,13 +214,6 @@
 
     def display_fileupload(self, filename):
-        if filename[1] == 'res_stat' \
-            and self.target is not None \
-            and not self.target.startswith('tsc'):
+        if self.target is not None and not self.target.startswith('tsc'):
             return False
-        if filename[1] == 'testimonial' \
-            and self.target is not None \
-            and not self.target.startswith('tsc'):
-            return False
-        return True
 
     @property
@@ -261,4 +247,8 @@
             and not store.getFileByContext(self.context, attr=u'res_stat.pdf'):
             return _('No statement of result pdf file uploaded.')
+        if self.target is not None \
+            and self.target.startswith('tscf') \
+            and not store.getFileByContext(self.context, attr=u'not_reg.pdf'):
+            return _('No notification of result pdf file uploaded.')
         #if self.target is not None \
         #    and self.target.startswith('tsc') \
@@ -269,14 +259,17 @@
 class ResultStatement(AdditionalFile):
     grok.name('res_stat')
-
-class NotificationRegistrationForm(AdditionalFile):
-    grok.name('not_reg')      
     
+class Testimonial(AdditionalFile):
+    grok.name('testimonial')
+
+class NotificationResult(AdditionalFile):
+    grok.name('not_res')      
+    
+class DocumentUploadForm(AdditionalFile):
+    grok.name('docupload')
+
 class OtherDocument1(AdditionalFile):
-    grok.name('doc_1')
-
-class OtherDocument2(AdditionalFile):
-    grok.name('doc_2')   
-
-class OtherDocument3(AdditionalFile):
-    grok.name('doc_3')           
+    grok.name('doc_1')   
+
+class OtherDocument4(AdditionalFile):
+    grok.name('doc_2')           
Index: /main/kofacustom.edocons/trunk/src/kofacustom/edocons/applicants/utils.py
===================================================================
--- /main/kofacustom.edocons/trunk/src/kofacustom/edocons/applicants/utils.py	(revision 17105)
+++ /main/kofacustom.edocons/trunk/src/kofacustom/edocons/applicants/utils.py	(revision 17106)
@@ -33,9 +33,10 @@
 
     ADDITIONAL_FILES = (
+                 ('Statement of Result','res_stat'),
                  ('Testimonial','testimonial'),
-                 ('Notification of Registration (optional)','not_reg'),
+                 ('Notification of Result / RN Certificate (compulsory)','not_res'),
+                 ('Document Upload Form to be filled by School (optional)','docupload'),
                  ('Document 1','doc_1'),
                  ('Document 2','doc_2'),
-                 ('Document 3','doc_3'),
                  )
 
