Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/export.py
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/export.py	(revision 16871)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/export.py	(revision 16872)
@@ -56,4 +56,6 @@
                 except:
                     pass
+        if name == 'subj_comb' and value is not None:
+            value = value.code
         return super(
             CustomApplicantExporter, self).mangle_value(
Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py	(revision 16871)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py	(revision 16872)
@@ -155,10 +155,4 @@
         )
 
-    #subj_comb = schema.TextLine(
-    #    title = _(u'Subject Combination'),
-    #    required = False,
-    #    readonly = False,
-    #    )
-
     subj_comb = schema.Choice(
         title = _(u'Subject Combination'),
Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/tests/test_browser.py	(revision 16871)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/tests/test_browser.py	(revision 16872)
@@ -96,5 +96,5 @@
         self.tpucontainer.code = u'tpu%s' % session
         self.tpucontainer.prefix = u'tpu'
-        self.tpucontainer.application_category = u'tpu'
+        self.tpucontainer.application_category = u'basic'
         self.tpucontainer.year = session
         self.tpucontainer.application_fee = 300.0
@@ -192,5 +192,5 @@
         
     def test_final_submit_tpu(self):
-        self.certificate.application_category = 'tpu'
+        self.certificate.application_category = 'basic'
         self.certificate.title = 'NCECert1'
         notify(grok.ObjectModifiedEvent(self.certificate))
@@ -236,5 +236,5 @@
         certificate.code = 'CERT2'
         certificate.title = 'NCECert2'
-        certificate.application_category = 'tpu'
+        certificate.application_category = 'basic'
         certificate.start_level = 100
         certificate.end_level = 500
@@ -265,3 +265,2 @@
         self.assertEqual(self.tpuapplicant.state, 'submitted')
         return
-
