=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/DefaultFieldFilterService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/DefaultFieldFilterService.java 2014-07-18 13:32:19 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/fieldfilter/DefaultFieldFilterService.java 2014-07-18 13:33:31 +0000 @@ -285,6 +285,13 @@ if ( child != null ) { child.setName( fieldKey ); + + // TODO fix ugly hack, will be replaced by custom field serializer/deserializer + if ( child.isSimple() && PeriodType.class.isInstance( (((SimpleNode) child).getValue()) ) ) + { + child = new SimpleNode( child.getName(), ((PeriodType) ((SimpleNode) child).getValue()).getName() ); + } + complexNode.addChild( fieldValue.getPipeline().process( child ) ); } }