=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceForm.vm	2014-05-03 04:01:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/trackedEntityInstanceForm.vm	2014-05-22 02:09:49 +0000
@@ -62,7 +62,7 @@
 													 <script type="text/javascript">
 															 datePickerValid( 'attr$attribute.id', false, false );
 													 </script>                    
-											 #elseif( $attribute.valueType == "combo" )  
+											 #elseif( $attribute.valueType == "optionSet" )  
 													 <select id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit" class="{validate:{required:$mandatory }}" >
 															 <option value="">[$i18n.getString( "please_select" )]</option>
 															 #foreach ($option in $attribute.optionSet.options )
@@ -123,7 +123,7 @@
 						<script type="text/javascript">
 							datePickerValid( 'attr$attribute.id', false, false );
 						</script>                    
-					#elseif( $attribute.valueType == "combo" )
+					#elseif( $attribute.valueType == "optionSet" )
 						<select  id="attr$attribute.id"  name="attr$attribute.id" inherit="$!attribute.inherit" class=' #validate( "default"  $mandatory  )' >
 							 <option value="">[$i18n.getString( "please_select" )]</option>
 						#foreach ($option in $attribute.optionSet.options )