=== 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 02:57:58 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2011-06-02 03:07:52 +0000
@@ -332,18 +332,21 @@
 
 function getPreviousEntryField( field )
 {
-    var fields = $('input[name="entryfield"]');
-    
-    var index = field.tabIndex - 2;
-    
-    while (fields[index]) {
-        if (!fields[index].disabled) {
-            return fields[index];
-        }
-        index--;
-    }
+	if ( field )
+	{
+		var index = field.getAttribute( 'tabindex' );
+		field = $('input[tabindex="'+(--index)+'"]');
+		
+		while ( field )
+		{
+			if ( field.is(':disabled') || field.is(':hidden') )
+			{
+				field = $('input[tabindex="'+(--index)+'"]');
+			}
+			else return field;
+		}
+	}
 }
-
 // -----------------------------------------------------------------------------
 // Data completeness
 // -----------------------------------------------------------------------------