=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm	2014-06-24 14:23:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm	2014-07-10 07:17:45 +0000
@@ -108,7 +108,7 @@
 				<td>
 					<input type="radio" id='ouMode1' name="ouMode" value="SELECTED" checked> $i18n.getString('selected')
 					<input type="radio" id='ouMode2' name="ouMode" value="CHILDREN"> $i18n.getString('children_only')
-					<input type="radio" id='ouMode3' name="ouMode" value="CHILDREN"> $i18n.getString('all')
+					<input type="radio" id='ouMode3' name="ouMode" value="DESCENDANTS"> $i18n.getString('all')
 				</td>
 			</tr>
 			<tr>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2014-07-08 08:27:29 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js	2014-07-10 07:17:45 +0000
@@ -303,26 +303,22 @@
 
 function exportActitityList( type )
 {
-    var facilityLB = $('input[name=facilityLB]:checked').val();
-    var params = "programId=" + getFieldValue('program');
-
-    params += "&type=xls";
-    params += "&searchTexts=stat_" + getFieldValue('program')
-        + "_" + getFieldValue('startDueDate')
-        + "_" + getFieldValue('endDueDate');
-
-    if( facilityLB == 'selected' ) {
-        params += "_" + getFieldValue('orgunitId');
-    }
-    else if( facilityLB == 'all' ) {
-        params += "_0";
-    }
-    else if( facilityLB == 'childrenOnly' ) {
-        params += "_-1";
-    }
-
-    params += "_false_" + getFieldValue('status');
-    window.location.href = "getActivityPlanRecords.action?" + params;
+	var params = "?ou=" + getFieldValue("orgunitId");
+	params += "&program=" + getFieldValue('program');
+	params += "&ouMode=" + $('input[name=ouMode]:checked').val();
+	params += "&programStatus=ACTIVE";
+	params += "&eventStartDate=" + getFieldValue('startDueDate');
+	params += "&eventEndDate=" + getFieldValue('endDueDate');
+	
+	if(getFieldValue('status')!=''){
+		params += '&eventStatus=' + getFieldValue('status');
+	}
+	
+	$('#attributeIds option').each(function(i, item){
+		params += "&attribute=" + item.value;
+	});
+	
+    window.location.href = "../api/trackedEntityInstances." + type + params;
 }
 
 // --------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2014-07-10 06:49:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2014-07-10 07:17:45 +0000
@@ -17,10 +17,7 @@
 					<a href='javascript:markForFollowup($programStageInstance.programInstance.id, false)' #if( $programStageInstance.programInstance.followup == 'false') class='hidden' #end name='imgMarkFollowup' title='$i18n.getString("imgMarkFollowup")' ><img src='images/risk_small.png'></a>
 					<a href='javascript:markForFollowup($programStageInstance.programInstance.id, true)' #if( $programStageInstance.programInstance.followup == 'true') class='hidden' #end name='imgUnmarkFollowup' title='$i18n.getString("imgMarkFollowup")' ><img src='images/unrisk_small.png'></a>			
 				</td>
-				<td class='coordinates1'>
-					<span class='bold' id="entityInstanceName">$i18n.getString( "attributes" ): </span>
-				</td>
-				<td>$id</td>
+				<td rowspan='2'>$id</td>
 			</tr>
 			<tr><td class='bold coordinates1' style="vertical-align:top">$i18n.getString('program_stage'):</td>
 				<td class='coordinates2'>$programStageInstance.programStage.displayName</td>