=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java 2011-02-16 13:25:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java 2011-02-18 12:21:57 +0000 @@ -551,12 +551,14 @@ private void convertColumnNames( DataBrowserTable dataBrowserTable ) { allColumnsConverted = dataBrowserTable.getColumns(); - PeriodType monthlyPeriodType = periodService.getPeriodTypeByName( MonthlyPeriodType.NAME ); + + PeriodType periodType = periodService.getPeriodTypeByName( periodTypeId ); for ( MetaValue col : allColumnsConverted ) - { - col.setName( dataBrowserService.convertDate( monthlyPeriodType, col.getName(), format ) ); - } + { + col.setName( dataBrowserService.convertDate( periodType, col.getName(), format ) ); + } } + }