=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-09-24 14:26:12 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-09-24 14:40:12 +0000 @@ -670,6 +670,16 @@ internalValue.setComment( trimToNull( dataValue.getComment() ) ); internalValue.setFollowup( dataValue.getFollowup() ); + String valid = ValidationUtils.dataValueIsValid( internalValue.getValue(), dataElement ); + + boolean zeroInsignificant = ValidationUtils.dataValueIsZeroAndInsignificant( internalValue.getValue(), dataElement ); + + if ( valid != null || zeroInsignificant ) + { + summary.getConflicts().add( new ImportConflict( DataValue.class.getSimpleName(), internalValue.getValue() ) ); + continue; + } + if ( !skipExistingCheck && batchHandler.objectExists( internalValue ) ) { if ( strategy.isCreateAndUpdate() || strategy.isUpdate() )