=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-08-01 18:49:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm	2012-08-02 07:00:57 +0000
@@ -1,6 +1,6 @@
 <script type="text/javascript">
    jQuery(document).ready(	function(){
-		datePickerInRange( 'startDate' , 'endDate' );
+		datePickerInRange( 'startDate' , 'endDate' );		
 		disableCriteriaDiv();
 		
 		var standardInterval = 3;
@@ -10,7 +10,7 @@
 		var y = date.getFullYear();
 		var edate= new Date(y, m, d);
 		jQuery('#startDate').datepicker( "setDate" , edate );				
-	});		
+	});
 </script>
 				
 <h3>$i18n.getString( "anonymous_events" ) #openHelp('single_event_without_registration')</h3>
@@ -52,7 +52,7 @@
 					<input type="button" class='large-button' id='removeBtn' value='$i18n.getString( "remove_empty_events" )' onclick="removeEmptyEvents();">
 				</td>
 				<td>
-					<input type="button" class='large-button' value='$i18n.getString( "advanced_search" )' onclick="jQuery('#advanced-search').toggle();">
+					<input type="button" class='large-button' id='advancedBtn' value='$i18n.getString( "advanced_search" )' onclick="jQuery('#advanced-search').toggle();">
 				</td>
 			</tr>
 		</table>

=== 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-08-02 06:16:27 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js	2012-08-02 07:00:57 +0000
@@ -413,15 +413,15 @@
 function enableBtn(){
 	var programIdAddPatient = getFieldValue('programIdAddPatient');
 	if( programIdAddPatient!='' ){
-		enable('listPatientBtn');
-		enable('addPatientBtn');
-		enable('advancedSearchBtn');
+		jQuery('#criteriaDiv :input').each( function( idx, item ){
+			enable(this.id);
+		});
 	}
 	else
 	{
-		disable('listPatientBtn');
-		disable('addPatientBtn');
-		disable('advancedSearchBtn');
+		jQuery('#criteriaDiv :input').each( function( idx, item ){
+			disable(this.id);
+		});
 	}
 }