=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/ChronologyBasedCalendar.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/ChronologyBasedCalendar.java	2014-04-25 06:29:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/ChronologyBasedCalendar.java	2014-04-25 06:37:41 +0000
@@ -105,12 +105,14 @@
     public int isoWeekday( DateUnit dateUnit )
     {
         DateTime dateTime = dateUnit.toDateTime( chronology );
+        dateTime = dateTime.withChronology( ISOChronology.getInstance() );
         return dateTime.getDayOfWeek();
     }
 
     @Override
     public int weekday( DateUnit dateUnit )
     {
-        return isoWeekday( dateUnit );
+        DateTime dateTime = dateUnit.toDateTime( chronology );
+        return dateTime.getDayOfWeek();
     }
 }