=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js 2014-11-15 13:26:06 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js 2014-11-26 08:53:22 +0000 @@ -591,7 +591,7 @@ var year = offset + this.calendar.today().year(); var periods = []; - for( var month = 1; month <= this.calendar.monthsInYear(year); month += 2 ) { + for( var month = 1, idx = 1; month <= this.calendar.monthsInYear(year); month += 2, idx++ ) { var startDate = this.calendar.newDate(year, month, 1); var endDate = this.calendar.newDate(startDate).set(month + 1, 'm'); endDate.set(endDate.daysInMonth(month + 1), 'd'); @@ -601,7 +601,7 @@ period['endDate'] = endDate.formatDate(this.format); period['name'] = startDate.formatDate("MM") + ' - ' + endDate.formatDate('MM') + ' ' + year; period['id'] = 'BiMonthly_' + period['startDate']; - period['iso'] = startDate.formatDate("yyyymm") + 'B'; + period['iso'] = startDate.formatDate("yyyy") + '0' + idx + 'B'; period['_startDate'] = this.calendar.newDate(startDate); period['_endDate'] = this.calendar.newDate(endDate);