=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java 2011-04-11 11:59:53 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java 2011-04-11 12:03:15 +0000 @@ -120,6 +120,8 @@ public List generatePeriods( Period period ) { Calendar cal = createCalendarInstance( period.getStartDate() ); + cal.setMinimalDaysInFirstWeek(4); + cal.setFirstDayOfWeek(Calendar.MONDAY); // --------------------------------------------------------------------- // If the supplied period is the first week of a year where the start