=== 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	2014-03-20 13:58:41 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-03-20 13:59:53 +0000
@@ -1262,8 +1262,6 @@
 
     getAndInsertDataValues();
     displayEntryFormCompleted();
-
-    $('document').trigger('dhis2.de.event.dataValuesLoaded');
 }
 
 function getAndInsertDataValues()
@@ -1321,11 +1319,12 @@
 	    success: function( json ) // online
 	    {
 	    	insertDataValues( json );
-        },
-        complete: function()
-        {
-	    	$( '.indicator' ).attr( 'readonly', 'readonly' );	    	
-        }
+      },
+      complete: function()
+      {
+        $( '.indicator' ).attr( 'readonly', 'readonly' );
+        $('document').trigger('dhis2.de.event.dataValuesLoaded');
+      }
 	} );
 }