=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyAprilPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyAprilPeriodType.java	2014-08-29 10:02:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyAprilPeriodType.java	2014-09-17 10:47:53 +0000
@@ -79,6 +79,11 @@
     @Override
     public String getIsoDate( DateTimeUnit dateTimeUnit )
     {
+        if ( dateTimeUnit.isIso8601() )
+        {
+            dateTimeUnit = getCalendar().fromIso( dateTimeUnit );
+        }
+
         switch ( dateTimeUnit.getMonth() )
         {
             case 4:

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyPeriodType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyPeriodType.java	2014-08-29 10:02:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyPeriodType.java	2014-09-17 10:47:53 +0000
@@ -80,6 +80,11 @@
     @Override
     public String getIsoDate( DateTimeUnit dateTimeUnit )
     {
+        if ( dateTimeUnit.isIso8601() )
+        {
+            dateTimeUnit = getCalendar().fromIso( dateTimeUnit );
+        }
+
         switch ( dateTimeUnit.getMonth() )
         {
             case 1: