=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java	2014-05-21 11:12:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java	2014-06-27 08:04:49 +0000
@@ -67,6 +67,11 @@
     @Override
     public DateUnit toIso( DateUnit dateUnit )
     {
+        if ( dateUnit.isIso8601() )
+        {
+            return dateUnit;
+        }
+
         DateTime dateTime = startIso.toDateTime();
 
         int totalDays = 0;