=== modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java' --- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java 2013-12-11 09:01:17 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java 2013-12-11 09:09:47 +0000 @@ -74,8 +74,8 @@ { if(constantService.getConstantByName( TARIFF_SETTING_AUTHORITY) == null) { - tariff_setting_authority = "Level 1"; - List allLevelOrg =new ArrayList(organisationUnitService.getOrganisationUnitsAtLevel(1)) ; + tariff_setting_authority = "Level 3"; + List allLevelOrg =new ArrayList(organisationUnitService.getOrganisationUnitsAtLevel(3)) ; for(OrganisationUnit org : allLevelOrg) { levelOrgUnitIds.add(org.getId()); @@ -84,7 +84,7 @@ else { Constant tariff_authority = constantService.getConstantByName( TARIFF_SETTING_AUTHORITY ); - tariff_setting_authority = "Level "+Integer.parseInt(tariff_authority.getValue()+""); + tariff_setting_authority = "Level "+(int)tariff_authority.getValue(); List allLevelOrg =new ArrayList(organisationUnitService.getOrganisationUnitsAtLevel(Integer.parseInt(tariff_authority.getValue()+""))) ; for(OrganisationUnit org : allLevelOrg) { === modified file 'local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java' --- local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java 2013-12-11 09:01:17 +0000 +++ local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java 2013-12-11 09:09:47 +0000 @@ -86,7 +86,7 @@ public String execute() { - OrganisationUnitGroupSet organisationUnitGroupSet = organisationUnitGroupService.getOrganisationUnitGroupSet(6709); + OrganisationUnitGroupSet organisationUnitGroupSet = organisationUnitGroupService.getOrganisationUnitGroupSet(3); orGroupList = new ArrayList(organisationUnitGroupSet.getOrganisationUnitGroups()) ; selecteddataElement = dataElementService.getDataElementByName(dataElementName); OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit(Integer.parseInt(orgUnitId));