=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java	2015-02-02 13:06:15 +0000
@@ -147,7 +147,7 @@
 
         return arrays;
     }
-
+    
     public List<DataElementCategoryOptionCombo> generateOptionCombosList()
     {
         List<DataElementCategoryOptionCombo> list = new ArrayList<>();
@@ -215,10 +215,16 @@
         return name.toString();
     }
 
-    //TODO update category option -> category option combo association
     public void generateOptionCombos()
     {
         this.optionCombos = new HashSet<>( generateOptionCombosList() );
+        for (DataElementCategoryOptionCombo optionCombo : optionCombos)
+        {
+            for (DataElementCategoryOption categoryOption : optionCombo.getCategoryOptions())
+            {
+                categoryOption.addCategoryOptionCombo(optionCombo);
+            }
+        }
     }
 
     public boolean hasOptionCombos()