=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java 2015-08-25 14:09:25 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java 2015-08-25 18:37:50 +0000 @@ -783,6 +783,10 @@ { return "executiondate"; } + else if ( ProgramIndicator.VAR_CURRENT_DATE.equals( var ) ) + { + return "'" + DateUtils.getLongDateString() + "'"; + } else if ( ProgramIndicator.VAR_VALUE_COUNT.equals( var ) ) { String sql = "nullif((";