=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java	2014-06-28 17:56:14 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java	2014-10-10 20:13:34 +0000
@@ -41,7 +41,6 @@
 
 public class OrgUnitTest
 {
-
     @Test
     public void testSerialization()
         throws IOException
@@ -95,6 +94,5 @@
 
         assertEquals( unit.getName(), unit2.getName() );
         assertEquals( unit.getId(), unit2.getId() );
-
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java	2014-06-28 17:56:14 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java	2014-10-10 20:13:34 +0000
@@ -44,7 +44,6 @@
 
 public class OrgUnitsTest
 {
-
     @Test
     public void testSerialization()
         throws IOException
@@ -67,7 +66,6 @@
         MobileOrgUnitLinks unit2 = unitList.get( 0 );
         assertEquals( unit.getName(), unit2.getName() );
         assertEquals( unit.getId(), unit2.getId() );
-
     }
 
     private MobileOrgUnitLinks createOrgUnit()

=== removed directory 'dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/service'
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js	2014-10-09 13:04:02 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js	2014-10-10 20:13:34 +0000
@@ -83,7 +83,7 @@
 		var key = $( this ).attr( 'id' );
 		var entryFieldId = key.substring( 0, key.indexOf( '-' ) );
 		
-		if ( de && $( this ).attr( 'value' ) && de == entryFieldId )
+		if ( de && de == entryFieldId && $( this ).attr( 'value' ) )
 		{
 			sum += new Number( $( this ).attr( 'value' ) );
 		}