Index: /WAeUP_SRP/base/skins/waeup_academics/getCosCombinedVoc.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_academics/getCosCombinedVoc.py	(revision 2812)
+++ /WAeUP_SRP/base/skins/waeup_academics/getCosCombinedVoc.py	(revision 2812)
@@ -0,0 +1,19 @@
+##parameters=key=None 
+# $Id$
+"""
+Return the combined courses as an vocabulary
+
+"""
+if key is None:
+    l = []
+    for k,v in context.portal_vocabularies.cos.items():
+        l += (k,v),
+    for k,v in context.portal_vocabularies.cos_cest.items():
+        l += (k,v),
+    return l
+for voc in (context.portal_vocabularies.cos,
+            context.portal_vocabularies.cos_cest):
+    title = voc.get(key,None)
+    if title is not None:
+        return title
+return "unknown Course  %s" % key
Index: /WAeUP_SRP/uniben/profiles/default/vocabularies.xml
===================================================================
--- /WAeUP_SRP/uniben/profiles/default/vocabularies.xml	(revision 2811)
+++ /WAeUP_SRP/uniben/profiles/default/vocabularies.xml	(revision 2812)
@@ -31,4 +31,5 @@
  <object name="payment_types" meta_type="CPS Vocabulary"/>
  <object name="payment_status" meta_type="CPS Vocabulary"/>
+ <object name="payment_subjects" meta_type="CPS Vocabulary"/>
  <object name="exam_types" meta_type="CPS Vocabulary"/>
  <object name="pin_prefixes" meta_type="CPS Vocabulary"/>
@@ -43,4 +44,5 @@
  <object name="verdicts" meta_type="CPS Vocabulary"/>
  <object name="global_roles" meta_type="CPS Vocabulary"/>
+ <object name="cos_combined" meta_type="CPS Method Vocabulary"/>
  <object name="cos" meta_type="CPS Vocabulary"/>
  <object name="cos_cest" meta_type="CPS Vocabulary"/>
Index: /WAeUP_SRP/uniben/profiles/default/vocabularies/cos_combined.xml
===================================================================
--- /WAeUP_SRP/uniben/profiles/default/vocabularies/cos_combined.xml	(revision 2812)
+++ /WAeUP_SRP/uniben/profiles/default/vocabularies/cos_combined.xml	(revision 2812)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="vocabulary.xsl"?>
+<object name="cos_combined" meta_type="CPS Method Vocabulary">
+ <property name="title"></property>
+ <property name="title_msgid"></property>
+ <property name="description"></property>
+ <property name="get_vocabulary_method">getCosCombinedVoc</property>
+ <property name="add_empty_key">False</property>
+ <property name="empty_key_pos">first</property>
+ <property name="empty_key_value"></property>
+ <property name="empty_key_value_i18n"></property>
+</object>
