=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-06-23 11:05:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm	2012-06-24 01:28:50 +0000
@@ -1,7 +1,6 @@
 <script>
 	jQuery("#entryFormContainer").ready(function(){
 		setFieldValue('programStageId', "$!programStageInstance.programStage.id");
-		setFieldValue('programId', "$!programStageInstance.programStage.program.id");
 		#if( $!programStageInstance.programStage.program.type=="3" && $!programStageInstance.completed=='true')
 			hideById('entryFormContainer');
 		#elseif( $programStageInstance )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-06-23 11:05:13 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js	2012-06-24 01:28:50 +0000
@@ -418,7 +418,6 @@
 			}
 			else
 			{
-				showEnrolmentField();
 				var type = jQuery('#programEnrollmentSelectDiv [name=programId] option:selected').attr('type');
 					
 				if( type=='2')

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-06-18 04:21:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm	2012-06-24 01:28:50 +0000
@@ -189,11 +189,14 @@
 		#if( $hasDataEntry == 'true' )
 			showSelectedDataRecoding( getFieldValue('patientId') );
 		#else
-			var disabled = $( ".selector" ).tabs( "option", "disabled" );
 			$( "#tabs" ).tabs( "option", "disabled", [2] );
 			$("#tabs").tabs("remove", 2);
 		#end
 		
+		#if( $programInstance.program.type!='1' )
+			$("#tabs").tabs("remove", 1);
+		#end
+		
 		#if( $identifierTypes.size() > 0 || $noGroupAttributes.size() > 0 || $attributeGroups.size() > 0 )
 			$( "#tabs" ).tabs( "option", "selected", 0 );
 		#else