Index: /WAeUP_SRP/fceokene/profiles/default/layouts/application_manage.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/layouts/application_manage.xml	(revision 2814)
+++ /WAeUP_SRP/fceokene/profiles/default/layouts/application_manage.xml	(revision 2815)
@@ -662,5 +662,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -683,5 +683,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -704,5 +704,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -726,5 +726,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
Index: /WAeUP_SRP/fceokene/profiles/default/layouts/import_application.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/layouts/import_application.xml	(revision 2814)
+++ /WAeUP_SRP/fceokene/profiles/default/layouts/import_application.xml	(revision 2815)
@@ -569,5 +569,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -589,5 +589,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -609,5 +609,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
@@ -629,5 +629,5 @@
     <property name="hidden_readonly_layout_modes"/>
     <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
+    <property name="vocabulary">cos_combined</property>
     <property name="css_class_expr">string:row</property>
   </widget>
Index: /WAeUP_SRP/fceokene/waeup_custom/getCosCombinedVoc.py
===================================================================
--- /WAeUP_SRP/fceokene/waeup_custom/getCosCombinedVoc.py	(revision 2815)
+++ /WAeUP_SRP/fceokene/waeup_custom/getCosCombinedVoc.py	(revision 2815)
@@ -0,0 +1,16 @@
+##parameters=key=None
+# $Id: getCosCombinedVoc.py 2814 2007-11-28 12:26:51Z henrik $
+"""
+Return the combined courses as an vocabulary
+
+"""
+if key is None:
+    l = []
+    for k,v in context.portal_vocabularies.cos.items():
+        l += (k,v),
+    return l
+for voc in (context.portal_vocabularies.cos,):
+    title = voc.get(key,None)
+    if title is not None:
+        return title
+return "unknown course  %s" % key
