=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-07 05:32:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-10-09 02:31:56 +0000
@@ -1169,6 +1169,8 @@
 	if( programId==0){
 		hideById('enrollmentDateTR');
 		hideById('dateOfIncidentTR');
+		disable('enrollmentDateField');
+		disable('dateOfIncidentField');
 	}
 	else{
 		var type = jQuery('#enrollmentDiv [name=programId] option:selected').attr('programType')
@@ -1190,11 +1192,11 @@
 			var displayIncidentDate = jQuery('#enrollmentDiv [name=programId] option:selected').attr('displayIncidentDate');
 			if( displayIncidentDate=='true'){
 				showById('dateOfIncidentTR');
-				enable('enrollmentDateField');
+				enable('dateOfIncidentField');
 			}
 			else{
 				hideById('dateOfIncidentTR');
-				disable('enrollmentDateField');
+				disable('dateOfIncidentField');
 			}
 		}
 		var programId = jQuery('#programEnrollmentSelectDiv [id=programId] option:selected').val();