dhis2-devs team mailing list archive

Thread
Date
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11659: Merging CCEM modules from 2.11 to 2.13

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Tue, 13 Aug 2013 12:42:32 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx
------------------------------------------------------------
revno: 11659
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-08-13 13:40:46 +0100
message:
  Merging CCEM modules from 2.11 to 2.13
added:
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeGroup.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeGroupService.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeGroupStore.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/comparator/CatalogTypeAttributeGroupOrderComparator.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeGroup.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeGroupService.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeGroupStore.java
  local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeAttributeGroupService.java
  local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeAttributeGroupStore.java
  local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttributeGroup.hbm.xml
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetCatalogTypeAttributeOptionListAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/AddUpdateEquipmentIcePacksAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadEquipmentIcePacksDataAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowAddEquipmentIcePacksFormAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/ClinicInventoriesAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/EquipmentCatalogsAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/GetFullOrganisationUnitDetailsAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/GetOrganisationUnitDetailsAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/LoadFacilityDataEntryFormAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/SaveFacilityDataValueAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/ShowUpdateFacilityDataEntryFormAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/ShowUpdateOrganisationUnitFormAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/UpdateOrganisationUnitAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/VaccinesCatalogsAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/ValidateOrganisationUnitCodeAction.java
  local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributeListForDisplayAction.java
  local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module_pt_PT.properties
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentIcePacksForm.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogDetails_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalog_List_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportForm.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/clinicInventories.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/clinicInventoriesAndOrgUnitDetails.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/clinicInventoriesMenu.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/css/facilityDataentry.css
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentCatalogs.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentCatalogsMenu.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentDataEntry_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentInstanceList_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentStatusForm_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/facilityDataEntry.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/fullOrganisationUnitDetail.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/images/go.jpg
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/images/u1148_normal.JPG
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/clinicInventories.js
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipmentCatalogs.js
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/facilityDataEntry.js
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/vaccinesCatalogs.js
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jrxmlReportMenu.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/loadDataEntryForm_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/loadEquipmentIcePacksDataForm.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/loadFacilityDataEntryForm.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseCatalogTypeAttributeOption.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseInventoryTypeAttributeListDisplay.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddCatalogForm_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentDetails.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentStatusHistory_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateCatalogForm_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentForm_1.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateOrganisationUnitForm.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/vaccinesCatalogs.vm
  local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/vaccinesCatalogsMenu.vm
  local/in/dhis-web-maintenance-ccem/
  local/in/dhis-web-maintenance-ccem/pom.xml
  local/in/dhis-web-maintenance-ccem/src/
  local/in/dhis-web-maintenance-ccem/src/main/
  local/in/dhis-web-maintenance-ccem/src/main/java/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/action/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/action/ExportToExcelAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/action/GetOrganisationUnitAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/action/NoAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/AddCatalogAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/AddCatalogFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/AddCatalogTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/AddCatalogTypeAttributeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/AddCatalogTypeAttributeGroupAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/AddCatalogTypeAttributeGroupFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/AddCatalogTypeFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/AddColdChainCatalogTypeAttributeForm.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/CatalogListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/CatalogSelectAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/CatalogTypeAttributeGroupListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/CatalogTypeListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/GetCatalogDetailsAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/GetCatalogListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/GetCatalogTypeAttributeDetailsAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/GetCatalogTypeAttributeGroupListSortOrderAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/GetCatalogTypeAttributeListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/GetCatalogTypeAttributeOptionListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/GetCatalogTypeAttributesAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/GetCatalogTypeDetailsAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/GetColdChainCatalogTypeAttributeListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/RemoveCatalogAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/RemoveCatalogTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/RemoveCatalogTypeAttributeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/RemoveCatalogTypeAttributeOptionAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/SaveCatalogTypeAttributeGroupSortOrderAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/ShowAddCatalogFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/ShowCatalogTypeImageAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/ShowImageAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/ShowUpdateCatalogTypeAttributeFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/ShowUploadCatalogImageFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/ShowUploadCatalogTypeImageFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/UpdateCatalogAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/UpdateCatalogFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/UpdateCatalogTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/UpdateCatalogTypeAttributeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/UpdateCatalogTypeFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/UploadCatalogImageAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/UploadCatalogTypeImageAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/ValidateCatalogAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/ValidateCatalogTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/ValidateCatalogTypeAttributeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/action/ValidateCatalogTypeAttributeGroupAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/dataentryform/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/dataentryform/action/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/dataentryform/action/DeleteCatalogDataEntryFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/dataentryform/action/SaveCatalogDataEntryFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/dataentryform/action/ValidateCatalogDataEntryFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/catalog/dataentryform/action/ViewCatalogDataEntryFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/AddEquipmentAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/EquipmentSelectAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/GetEquipmentInstanceDataAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/GetEquipmentInstanceListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/LoadDataEntryFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/LoadNextPrePeriodsAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/LoadPeriodsAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/RemoveEquipmentInstanceAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/SaveEquipmentDataValueAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/ShowAddEquipmentFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/ShowEquipmentDataEntryFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/ShowEquipmentStatusFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/ShowEquipmentStatusHistoryFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/UpdateEquipmentAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/UpdateEquipmentStatusAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/AddInventoryTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/AddInventoryTypeAttributeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/GetDataSetListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/GetInventoryTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/GetInventoryTypeAttributeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/GetInventoryTypeAttributeListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/GetInventoryTypeAttributesAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/GetInventoryTypeListAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/RemoveInventoryTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/RemoveInventoryTypeAttributeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/RemoveInventoryTypeAttributeOptionAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/ShowAddInventoryTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/ShowInventoryTypeDataSetFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/ShowUpdateInventoryTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/ShowUpdateInventoryTypeAttributeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/UpdateInventoryTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/UpdateInventoryTypeAttributeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/UpdateInventoryTypeDataSetAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/ValidateInventoryTypeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/inventory/action/ValidateInventoryTypeAttributeAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/reports/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/reports/action/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/reports/action/CCEMReportPageAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/reports/action/GenerateCCEMReportAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/reports/action/GenerateJRXMLReportAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/action/
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/action/TraferFacilityDataFormAction.java
  local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/action/TraferFacilityDataResultAction.java
  local/in/dhis-web-maintenance-ccem/src/main/resources/
  local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/
  local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/
  local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-maintenance-ccem/src/main/resources/org/
  local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/
  local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/
  local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/
  local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties
  local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module_pt_PT.properties
  local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module_vi_VN.properties
  local/in/dhis-web-maintenance-ccem/src/main/resources/struts.xml
  local/in/dhis-web-maintenance-ccem/src/main/webapp/
  local/in/dhis-web-maintenance-ccem/src/main/webapp/WEB-INF/
  local/in/dhis-web-maintenance-ccem/src/main/webapp/WEB-INF/web.xml
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addCatalogForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addCatalogTypeAttributeGroupForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addCatalogTypeForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addColdChainCatalogTypeAttributeForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addEquipmentForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addInventoryTypeAttributeForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addInventoryTypeForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/catalogDataEntryForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/catalogDetails.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/catalogList.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/catalogTypeAttributeGroupList.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/catalogTypeList.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/catalog_List.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/ccemReportMenu.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/ccemReportOutput.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/ccemReportsPage.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/coldChainCatalogTypeAttribute.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/StylesForTags.css
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/basic.css
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/equipmentDataentry.css
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/example.css
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/ext-all.css
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/style.css
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/customForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/defaultForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentDataEntry.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentInstanceList.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentMenu.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentStatusForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/Ind_Box1.png
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/Period_Box1.png
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/Submit_Box1.png
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/Thumbs.db
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/ajax-loader.gif
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/data_entry.png
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/dataset.png
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/goback.png
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/moveLeft.gif
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/moveRight.gif
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/sort_ascending.png
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/sort_descending.png
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/upload.png
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/images/upload11111.jpg
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/inventoryTypeAttributeList.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/inventoryTypeDataSetForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/inventoryTypeList.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addCatalogTypeAttributeForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addCatalogTypeAttributeGroupForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addCatalogTypeForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addInventoryTypeAttributeForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addInventoryTypeForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/catalog.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/catalogType.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/catalogTypeAttribute.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/catalogTypeAttributeGroup.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/ccemReports.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/equipment.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/equipmentDataEntry.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/exporting.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/ext-all.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/highcharts.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/inventoryType.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/inventoryTypeAttribute.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/transferFacilityData.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateCatalogForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateCatalogTypeAttributeForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateCatalogTypeForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateInventoryTypeAttributeForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateInventoryTypeDataSetForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateInventoryTypeForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/uploadCatalogImageForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/uploadCatalogTypeImageForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/viewCatalogTypeDataEntryForm.js
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jrxmlReportMenu.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jrxmlReportsPage.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonCatalog.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonCatalogType.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonCatalogTypeAttribute.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonCatalogTypeAttributes.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonDataSetList.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonInventoryType.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonInventoryTypeAttribute.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonInventoryTypeAttributes.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonPeriods.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/loadDataEntryForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/menu.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseCatalogTypeAttributeOption.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseCatalogTypeAttributes.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseInventoryTypeAttributes.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseMetaData.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseUplodCatalogTypeImageStatus.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseUplodImageStatus.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseVoid.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/selectCatalog.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/selectEquipment.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/showAddCatalogForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/showEquipmentData.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/showEquipmentStatusHistory.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/sortCatalogTypeAttributeGroupForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/transferFacilityDataForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/transferFacilityDataResult.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateCatalogForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateCatalogTypeAttibuteForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateCatalogTypeForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateEquipmentForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateInventoryTypeAttibuteForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateInventoryTypeForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/uploadCatalogImageForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/uploadCatalogTypeImageForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/viewCatalogDataEntryForm.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/welcome.vm
  local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/xmlCatalogTypeAttributes.vm
The size of the diff (32211 lines) is larger than your specified limit of 5000 lines

--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription