dhis2-devs team mailing list archive

Thread
Date
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1938: More merge from trunk

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 25 Oct 2010 07:34:22 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx
Merge authors:
  Hieu Duy Dang (hieu-hispvietnam)
  Jan Henrik Øverland (janhenrik-overland)
  Jo Størset (storset)
  Lars <larshelg@larshelg-laptop>
  Mithilesh Kumar Thakur (mithilesh-hisp)...

------------------------------------------------------------
revno: 1938 [merge]
committer: Jo Størset <storset@xxxxxxxxx>
branch nick: cbhis-mobile
timestamp: Fri 2010-10-22 11:27:43 +0530
message:
  More merge from trunk
removed:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/sl_facilities
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/Chart.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/ChartStore.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/PivotTable.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/PivotTableService.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/Report.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/impl/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/api/impl/DefaultPivotTableService.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/CreateChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GenerateChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GetAllChartsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GetChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/GetChartOptionsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/RemoveChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/SaveChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/ValidateChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/action/ViewChartAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/impl/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/chart/impl/DefaultChartService.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/pdf/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/pdf/DataCompletenessPDFGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/util/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/util/OutputGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/completeness/util/OutputGeneratorPipeThread.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/AbstractAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateCustomDataSetReportAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateDataSetReportDataSourceAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GenerateDefaultDataSetReportAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GetAllDataSetsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GetDataSetReportTypeAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/GetViewFormStateAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/NextPeriodsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/PreviewReportAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/PreviousPeriodsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/action/SelectReportAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/Dhis20ReportDataAccess.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/ReportDataAccess.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/dataaccess/ReportDataAccessException.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/CustomDataSetReportGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/DesignGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/GeneratorException.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/JasperDesignGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/JasperReportGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/JasperTabularDesignGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/JasperTabularReportGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/ReportGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/TabularDesignGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/generators/TabularReportGenerator.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/ChartElement.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/Element.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/OrgUnitSpecificElement.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/Report.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/ReportStore.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/ReportStoreException.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/report/XmlReportStore.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/state/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/state/DefaultSelectedStateManager.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/state/SelectedStateManager.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/CollectionMapDataSource.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/FileUtils.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/JRXmlFilter.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/NumberUtils.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/XMLUtils.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/dataset/utils/XmlFilter.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetIndicatorGroupsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetOrganisationUnitLevelsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetPeriodTypesAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/pivottable/action/GetPivotTableAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/progress/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/progress/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/progress/action/GenerateProgressAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/progress/action/GenerateProgressReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/cumulative/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/cumulative/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/cumulative/action/GenerateCumulativeRoutineReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/cumulative/action/GenerateCumulativeRoutineReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/CreateTableAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/GetAllTablesAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/GetReportParamsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/GetStatusAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/GetTableAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/GetTableOptionsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/RemoveTableAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/SaveTableAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/tablecreator/action/ValidateTableAction.java
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/cumulativeRoutineReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForCumRoutineReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForProgressReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/progressReportAnalysisFront.vm
added:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/RatioDataSetCompletenessService.java
  dhis-2/dhis-services/dhis-service-reporting/src/test/resources/i18n_global_fr_FR.properties
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/OrganisationUnitWithCoordinatesFilter.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/uganda.png
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/RemoveMinMaxValueAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseInput.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/responseSuccess.vm
  dhis-2/dhis-web/dhis-web-portal/src/main/resources/org/hisp/dhis/wp/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/GenerateAggregationReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/aggregation/action/GenerateAggregationReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/periodwiseprogress/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/periodwiseprogress/action/
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/periodwiseprogress/action/GeneratePeriodWiseProgressAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/periodwiseprogress/action/GeneratePeriodWiseProgressReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/aggregationReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForAggregationReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForPeriodWiseProgressReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/periodWiseprogressReportAnalysisFront.vm
renamed:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/ObjectiveDataSetCompletenessService.java => dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/CompulsoryDataSetCompletenessService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/SubjectiveDataSetCompletenessService.java => dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/RegistrationDataSetCompletenessService.java
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/PivotDataSetAssociationTable.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitStore.java
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/jdbc/JdbcDataMergeStore.java
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.java
  dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/org/hisp/dhis/reportexcel/excelitem/hibernate/ExcelItem.hbm.xml
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.java
  dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
  dhis-2/dhis-services/dhis-service-mapping/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.hbm.xml
  dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingServiceTest.java
  dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingStoreTest.java
  dhis-2/dhis-services/dhis-service-options/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java
  dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java
  dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManager.java
  dhis-2/dhis-support/dhis-support-hibernate/pom.xml
  dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/StatementBuilder.java
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/DerbyStatementBuilder.java
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/H2StatementBuilder.java
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/MySQLStatementBuilder.java
  dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfoProvider.java
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/jquery.validate.js
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/provider/ReportContentProvider.java
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/GenerateMinMaxValuesAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage/GetDataElementsByZeroIsSignificantAndGroupAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage/UpdateZeroIsSignificantForDataElementsAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/minMaxValidation.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewStatistics.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/ValidateOrganisationUnitAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddOrUpdateMapViewAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitsWithCoordinatesAction.java
  dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapViews.vm
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/pointShapefile.vm
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/polygonShapefile.vm
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/core/GeoStat/Choropleth.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Choropleth.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/mapfish/widgets/geostat/Symbol.js
  dhis-2/dhis-web/dhis-web-portal/src/main/resources/org/hisp/dhis/wp/i18n_module.properties
  dhis-2/dhis-web/dhis-web-portal/src/main/webapp/dhis-web-portal/redirect.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/SaveChartAction.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chart/action/ViewChartAction.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm
  dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportService.java
  local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportType.java
  local/in/dhis-in-services/dhis-in-service-reports/src/main/java/org/hisp/dhis/reports/DefaultReportService.java
  local/in/dhis-in-services/dhis-in-service-reports/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/TwentyPoint/action/GenerateTwentyPointReportsFromAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/AddUserAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/ExportToExcelAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/ExportToExcelAction1.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetDataElementsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetNationalIndicatorReportsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetOrgUnitGroupsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetOrgUnitsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetProgressReportsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/GetReportsAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/action/ReportsHomePageAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/activeplan/action/ActivePlanReportsFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/activeplan/action/ActivePlanReportsResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/advanced/action/GenerateAdvancedReportResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/advanced/action/GenerateAdvancedReportsFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/benificiaryinfo/action/BenificiaryInfoReportsFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/benificiaryinfo/action/BenificiaryInfoReportsResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/datasetlock/action/GenerateDataSetLockReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/datasetlock/action/GenerateDataSetLockReportResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ed/action/EDReportResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/feedback/action/GenerateFeedbackReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/feedback/action/GenerateFeedbackReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/leprosy/action/LeprosyReportFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/linelisting/action/GenerateLinelistingReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/malarya/action/GenerateMalaryaReportFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/orgunitgroupsetreport/action/GenerateOrgunitGroupsetReportsFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/ouwiseprogress/action/GenerateOuWiseProgressReportResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/portal/action/PortalReportsFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/routine/action/GenerateRoutineReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserFormAction.java
  local/in/dhis-web-reports-national/src/main/java/org/hisp/dhis/reports/upward/action/GenerateUpwardReportAnalyserResultAction.java
  local/in/dhis-web-reports-national/src/main/resources/META-INF/dhis/beans.xml
  local/in/dhis-web-reports-national/src/main/resources/struts.xml
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/advancedReportsForm.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/feedbackReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/javascript/reports.js
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/linelstingReportAnalyserFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menu.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForFeedback.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForGOIReports.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForLineListingReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForOuWiseProgress.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/menuWithTreeForRoutineReport.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/ouWiseProgressReportFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/routineReportAnalysisFront.vm
  local/in/dhis-web-reports-national/src/main/webapp/dhis-web-reports/upwardReportAnalysisFront.vm
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/CompulsoryDataSetCompletenessService.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/RegistrationDataSetCompletenessService.java
The size of the diff (49225 lines) is larger than your specified limit of 1000 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