Index: /main/waeup.uniben/trunk/src/waeup/uniben/applicants/browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/applicants/browser.py	(revision 17083)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/applicants/browser.py	(revision 17084)
@@ -617,8 +617,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('tsc') \
-        #    and not store.getFileByContext(self.context, attr=u'eligibility.pdf'):
-        #    return _('No eligibility form pdf file uploaded.')
+        if self.target is not None \
+            and self.target.startswith('tsc') \
+            and (not self.context.order or not self.context.charge):
+            return _('Please select Type of Order and Transcript Charge.')
         return False
 
Index: /main/waeup.uniben/trunk/src/waeup/uniben/applicants/interfaces.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/applicants/interfaces.py	(revision 17083)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/applicants/interfaces.py	(revision 17084)
@@ -429,5 +429,5 @@
         source = OrderSource(),
         title = _(u'Type of Order'),
-        required = True,
+        required = False,
         )
 
@@ -444,5 +444,5 @@
         title = _(u'Transcript Charge'),
         source = DestinationCostSource(),
-        required = True,
+        required = False,
         readonly = False,
         )
