=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java 2012-07-23 17:00:59 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java 2012-07-23 19:02:02 +0000 @@ -374,11 +374,11 @@ */ public List getRewindedRelativePeriods( Integer rewindedPeriods ) { - List periods = getRelativePeriods(); - + List periods = getRelativePeriods(); PeriodType periodType = getHighestFrequencyPeriodType( periods ); - Date rewindedDate = periodType.getRewindedDate( null, rewindedPeriods ); + Date rewindedDate = periodType.getRewindedDate( null, rewindedPeriods ); + rewindedDate = subtractMonth( 1, rewindedDate ); return getRelativePeriods( rewindedDate, null, false ); } @@ -423,7 +423,7 @@ */ public List getRelativePeriods( Date date, I18nFormat format, boolean dynamicNames ) { - date = date == null ? subtractMonth( 1, new Date() ) : subtractMonth( 1, date ); + date = date == null ? subtractMonth( 1, new Date() ) : date; List periods = new ArrayList();