=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/attributeFormDiv.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/attributeFormDiv.vm	2014-05-22 02:24:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/attributeFormDiv.vm	2014-05-22 08:03:57 +0000
@@ -1,4 +1,11 @@
-#foreach($attribute in $attributes )
+#if($program) 
+	#set($attributes = $program.attributes)
+#end
+
+#foreach($_attribute in $attributes )
+	#if($program) 
+		#set($attribute = $_attribute.attribute)
+	#end
 	#set( $attributeValue = '')
 	<tr>
 		<td class='text-column'><label>$attribute.displayName #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2014-05-06 12:28:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js	2014-05-22 08:03:57 +0000
@@ -202,10 +202,7 @@
 	table += "<table class='listTable' width='100%'>";
 	
 	var idx = 4;
-	if(getFieldValue('ouMode') != 'SELECTED'){
-		var idx = 3;
-	}	
-	else if(getFieldValue('program') != '') {
+	if(getFieldValue('program') != '') {
 		idx = 5;
 	}
 	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2014-05-05 15:31:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js	2014-05-22 08:03:57 +0000
@@ -111,10 +111,7 @@
 	table += "<table class='listTable' width='100%'>";
 	
 	var idx = 4;
-	if(getFieldValue('ouMode') != 'SELECTED'){
-		var idx = 3;
-	}	
-	else if(getFieldValue('program') != '') {
+	if(getFieldValue('program') != '') {
 		idx = 5;
 	}
 	

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/trackedEntityInstance.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/trackedEntityInstance.js	2014-05-06 12:28:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/trackedEntityInstance.js	2014-05-22 08:03:57 +0000
@@ -278,10 +278,7 @@
 	table += "<table class='listTable' width='100%'>";
 	
 	var idx = 4;
-	if(getFieldValue('ouMode') != 'SELECTED'){
-		var idx = 3;
-	}	
-	else if(getFieldValue('program') != '') {
+	if(getFieldValue('program') != '') {
 		idx = 5;
 	}