=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml	2012-04-26 14:30:09 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml	2012-09-22 14:37:38 +0000
@@ -48,7 +48,7 @@
 
   <cache name="org.hisp.dhis.expression.Expression" maxElementsInMemory="200" />
 
-  <cache name="org.hisp.dhis.validation.ValidationRule" maxElementsInMemory="200" />
+  <cache name="org.hisp.dhis.validation.ValidationRule" maxElementsInMemory="1000" />
 
   <cache name="org.hisp.dhis.validation.ValidationRuleGroup" maxElementsInMemory="50" />
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-09-19 16:14:28 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2012-09-22 14:37:38 +0000
@@ -1235,14 +1235,6 @@
     } );
 }
 
-/**
- * Validates form. First looks for compulsory data element combinations and returns
- * false if violated. Second looks for validation rules and returns false if
- * violated and if completion is only allowed for valid forms. Returns true otherwise.
- * 
- * @param ignoreSuccessfulValidation whether the pop-up should not be skipped if
- *        validation is successful.
- */
 function validate( ignoreSuccessfulValidation, successCallback )
 {
 	var compulsoryCombinationsValid = validateCompulsoryCombinations();