=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/SaveTableAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/SaveTableAction.java 2012-04-20 07:38:56 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/SaveTableAction.java 2012-05-03 16:08:40 +0000 @@ -293,11 +293,11 @@ this.quartersLastYear = quartersLastYear; } - private boolean last5years; + private boolean last5Years; - public void setLast5years( boolean last5years ) + public void setLast5Years( boolean last5Years ) { - this.last5years = last5years; + this.last5Years = last5Years; } private boolean lastYear; @@ -438,7 +438,7 @@ RelativePeriods relatives = new RelativePeriods( reportingMonth, reportingBimonth, reportingQuarter, lastSixMonth, monthsThisYear, quartersThisYear, thisYear, monthsLastYear, quartersLastYear, lastYear, - last5years, last12Months, false, last4Quarters, last2SixMonths, + last5Years, last12Months, false, last4Quarters, last2SixMonths, thisFinancialYear, lastFinancialYear, last5FinancialYears ); ReportParams reportParams = new ReportParams(); === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm' --- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm 2012-04-20 07:38:56 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm 2012-05-03 16:08:40 +0000 @@ -434,7 +434,7 @@

- +