=== 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 2011-01-25 14:49:09 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-02-14 04:25:57 +0000 @@ -21,6 +21,13 @@ var organisationUnitId = getFieldValue( 'organisationUnitId' ); field.style.backgroundColor = COLOR_YELLOW; + + if ( isZeroNumber( field.value ) && significantZeros.indexOf( dataElementId ) == -1 ) + { + // If value is 0 and zero is not significant for data element, then skip value + + field.value = ''; + } if ( field.value && field.value != '' ) { @@ -45,14 +52,7 @@ { window.alert( i18n_value_must_negative_number + '\n\n' + dataElementName ); return alertField( field ); - } - else if ( isZeroNumber( field.value ) && significantZeros.indexOf( dataElementId ) == -1 ) - { - // If value is 0 and zero is not significant for data element, then skip value - - field.style.backgroundColor = COLOR_GREEN; - return; - } + } else { var minString = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].min' ).innerHTML;