=== 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	2011-06-02 08:44:31 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2011-06-03 14:19:24 +0000
@@ -314,30 +314,36 @@
 
 function getNextEntryField( field )
 {
-    var fields = $('input[name="entryfield"]');
-
-    var index = field.tabIndex;
-    
-    while (fields[index]) {
-        if (!fields[index].disabled) {
-            return fields[index];
-        }
-        index++;
-    }
+	var index = field.getAttribute( 'tabindex' );
+	
+	field = $( 'input[name="entryfield"][tabindex="' + (++index) + '"]' );
+	
+	while ( field )
+	{
+		if ( field.is( ':disabled' ) || field.is( ':hidden' ) ) {
+			field = $( 'input[name="entryfield"][tabindex="' + (++index) + '"]' );
+		}
+		else {
+			return field;
+		}
+	}
 }
 
 function getPreviousEntryField( field )
 {
-    var fields = $('input[name="entryfield"]');
-    
-    var index = field.tabIndex - 2;
-    
-    while (fields[index]) {
-        if (!fields[index].disabled) {
-            return fields[index];
-        }
-        index--;
-    }
+	var index = field.getAttribute( 'tabindex' );
+	
+	field = $( 'input[name="entryfield"][tabindex="' + (--index) + '"]' );
+	
+	while ( field )
+	{
+		if ( field.is( ':disabled' ) || field.is( ':hidden' ) )	{
+			field = $( 'input[name="entryfield"][tabindex="' + (--index) + '"]' );
+		}
+		else {
+			return field;
+		}
+	}
 }
 
 // -----------------------------------------------------------------------------