diff --git a/mifosng-provider/build.gradle b/mifosng-provider/build.gradle index 4ff144f12..60fc05237 100644 --- a/mifosng-provider/build.gradle +++ b/mifosng-provider/build.gradle @@ -45,9 +45,6 @@ group = 'org.mifosplatform' repositories { jcenter() - maven { - url "http://nexus.pentaho.org/content/repositories/pentaho-public-release-repos/" - } // mavenLocal() // useful for local dev using MariaDB4j SNAPSHOTs (not needed for real-world non-SNAPHOT builds) } @@ -97,11 +94,6 @@ task dist(type:Zip){ include '**/*' into('apps') } - from('src/main/pentahoReports/') { - fileMode = 0755 - include '*' - into('pentahoReports') - } from('../api-docs/') { fileMode = 0755 include '*' @@ -122,20 +114,7 @@ task dist(type:Zip){ into(baseName + '-' + version) } -task deployPentahoReports() { - def pentahoReportDir = System.properties['user.home'] + System.properties['file.separator'] + '.mifosx' + System.properties['file.separator'] + 'pentahoReports' - copy { - from "src/main/pentahoReports" - into pentahoReportDir - } - - doLast { - println ':deployPentahoReports - moving pentaho reports under: ' + pentahoReportDir - } -} - war { - it.dependsOn deployPentahoReports war.finalizedBy(bootRepackage) } diff --git a/mifosng-provider/dependencies.gradle b/mifosng-provider/dependencies.gradle index cd7273207..c5f328a32 100644 --- a/mifosng-provider/dependencies.gradle +++ b/mifosng-provider/dependencies.gradle @@ -50,22 +50,6 @@ dependencies { [group: 'mysql', name: 'mysql-connector-java', version: '5.1.27'], // [group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: tomcatVersion], - [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-classic-core', version: '3.9.1.1'], - [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-classic-extensions', version: '3.9.1-GA'], - [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-classic-extensions-scripting', version: '3.9.1-GA'], - [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-wizard-core', version: '3.9.1-GA'], - [group: 'pentaho-report-designer', name: 'pentaho-reporting-engine-wizard-xul', version: '3.9.1-GA'], - - [group: 'pentaho-library', name: 'libbase', version: '1.2.8'], - [group: 'pentaho-library',name: 'libdocbundle', version: '1.2.8'], - [group: 'pentaho-library',name: 'libfonts', version: '1.2.8'], - [group: 'pentaho-library',name: 'libformat', version: '1.2.8'], - [group: 'pentaho-library',name: 'libformula', version: '1.2.8'], - [group: 'pentaho-library',name: 'libloader', version: '1.2.8'], - [group: 'pentaho-library',name: 'librepository', version: '1.2.8'], - [group: 'pentaho-library',name: 'libserializer', version: '1.2.8'], - [group: 'pentaho-library',name: 'libsparkline', version: '1.2.8'], - [group: 'pentaho-library',name: 'libxml', version: '1.2.8'], [group: 'org.apache.poi',name: 'poi', version: '3.9'], [group: 'org.apache.poi',name: 'poi-ooxml', version: '3.9'], diff --git a/mifosng-provider/dev-dependencies.gradle b/mifosng-provider/dev-dependencies.gradle index 05dd8dc6f..bcbbcac07 100644 --- a/mifosng-provider/dev-dependencies.gradle +++ b/mifosng-provider/dev-dependencies.gradle @@ -49,23 +49,7 @@ dependencies { [group: 'mysql', name: 'mysql-connector-java', version: '5.1.27'], [group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: tomcatVersion], - [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-classic-core', version: '3.9.1.1'], - [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-classic-extensions', version: '3.9.1-GA'], - [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-classic-extensions-scripting', version: '3.9.1-GA'], - [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-wizard-core', version: '3.9.1-GA'], - [group: 'pentaho-report-designer', name: 'pentaho-reporting-engine-wizard-xul', version: '3.9.1-GA'], - - [group: 'pentaho-library', name: 'libbase', version: '1.2.8'], - [group: 'pentaho-library',name: 'libdocbundle', version: '1.2.8'], - [group: 'pentaho-library',name: 'libfonts', version: '1.2.8'], - [group: 'pentaho-library',name: 'libformat', version: '1.2.8'], - [group: 'pentaho-library',name: 'libformula', version: '1.2.8'], - [group: 'pentaho-library',name: 'libloader', version: '1.2.8'], - [group: 'pentaho-library',name: 'librepository', version: '1.2.8'], - [group: 'pentaho-library',name: 'libserializer', version: '1.2.8'], - [group: 'pentaho-library',name: 'libsparkline', version: '1.2.8'], - [group: 'pentaho-library',name: 'libxml', version: '1.2.8'], - + [group: 'org.apache.poi',name: 'poi', version: '3.9'], [group: 'org.apache.poi',name: 'poi-ooxml', version: '3.9'], [group: 'org.apache.poi',name: 'poi-ooxml-schemas', version: '3.9'], diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/api/RunreportsApiResource.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/api/RunreportsApiResource.java index 3d773cbd3..1b35b507c 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/api/RunreportsApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/api/RunreportsApiResource.java @@ -7,7 +7,6 @@ package org.mifosplatform.infrastructure.dataqueries.api; import java.io.File; import java.util.HashMap; -import java.util.Locale; import java.util.Map; import java.util.Set; @@ -30,6 +29,8 @@ import org.mifosplatform.infrastructure.dataqueries.data.GenericResultsetData; import org.mifosplatform.infrastructure.dataqueries.data.ReportData; import org.mifosplatform.infrastructure.dataqueries.service.GenericDataService; import org.mifosplatform.infrastructure.dataqueries.service.ReadReportingService; +import org.mifosplatform.infrastructure.report.provider.ReportingProcessServiceProvider; +import org.mifosplatform.infrastructure.report.service.ReportingProcessService; import org.mifosplatform.infrastructure.security.exception.NoAuthorizationException; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; import org.mifosplatform.useradministration.domain.AppUser; @@ -46,14 +47,17 @@ public class RunreportsApiResource { private final ToApiJsonSerializer toApiJsonSerializer; private final ReadReportingService readExtraDataAndReportingService; private final GenericDataService genericDataService; + private final ReportingProcessServiceProvider reportingProcessServiceProvider; @Autowired public RunreportsApiResource(final PlatformSecurityContext context, final ReadReportingService readExtraDataAndReportingService, - final GenericDataService genericDataService, final ToApiJsonSerializer toApiJsonSerializer) { + final GenericDataService genericDataService, final ToApiJsonSerializer toApiJsonSerializer, + final ReportingProcessServiceProvider reportingProcessServiceProvider) { this.context = context; this.readExtraDataAndReportingService = readExtraDataAndReportingService; this.genericDataService = genericDataService; this.toApiJsonSerializer = toApiJsonSerializer; + this.reportingProcessServiceProvider = reportingProcessServiceProvider; } @GET @@ -74,12 +78,9 @@ public class RunreportsApiResource { String parameterTypeValue = null; if (!parameterType) { parameterTypeValue = "report"; - if (this.readExtraDataAndReportingService.getReportType(reportName).equalsIgnoreCase("Pentaho")) { - final Map reportParams = getReportParams(queryParams, true); - final Locale locale = ApiParameterHelper.extractLocale(queryParams); - return this.readExtraDataAndReportingService.processPentahoRequest(reportName, queryParams.getFirst("output-type"), - reportParams, locale); - } + String reportType = this.readExtraDataAndReportingService.getReportType(reportName); + ReportingProcessService reportingProcessService = this.reportingProcessServiceProvider.findReportingProcessService(reportType); + if (reportingProcessService != null) { return reportingProcessService.processRequest(reportName, queryParams); } } else { parameterTypeValue = "parameter"; } @@ -87,7 +88,7 @@ public class RunreportsApiResource { // PDF format if (exportPdf) { - final Map reportParams = getReportParams(queryParams, false); + final Map reportParams = getReportParams(queryParams); final String pdfFileName = this.readExtraDataAndReportingService .retrieveReportPDF(reportName, parameterTypeValue, reportParams); @@ -102,7 +103,7 @@ public class RunreportsApiResource { } if (!exportCsv) { - final Map reportParams = getReportParams(queryParams, false); + final Map reportParams = getReportParams(queryParams); final GenericResultsetData result = this.readExtraDataAndReportingService.retrieveGenericResultset(reportName, parameterTypeValue, reportParams); @@ -124,7 +125,7 @@ public class RunreportsApiResource { } // CSV Export - final Map reportParams = getReportParams(queryParams, false); + final Map reportParams = getReportParams(queryParams); final StreamingOutput result = this.readExtraDataAndReportingService .retrieveReportCSV(reportName, parameterTypeValue, reportParams); @@ -143,7 +144,7 @@ public class RunreportsApiResource { } } - private Map getReportParams(final MultivaluedMap queryParams, final Boolean isPentaho) { + private Map getReportParams(final MultivaluedMap queryParams) { final Map reportParams = new HashMap<>(); final Set keys = queryParams.keySet(); @@ -152,12 +153,7 @@ public class RunreportsApiResource { for (final String k : keys) { if (k.startsWith("R_")) { - if (isPentaho) { - pKey = k.substring(2); - } else { - pKey = "${" + k.substring(2) + "}"; - } - + pKey = "${" + k.substring(2) + "}"; pValue = queryParams.get(k).get(0); reportParams.put(pKey, pValue); } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingService.java index 62c1bb572..2cf2398ec 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingService.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingService.java @@ -6,10 +6,8 @@ package org.mifosplatform.infrastructure.dataqueries.service; import java.util.Collection; -import java.util.Locale; import java.util.Map; -import javax.ws.rs.core.Response; import javax.ws.rs.core.StreamingOutput; import org.mifosplatform.infrastructure.dataqueries.data.GenericResultsetData; @@ -22,8 +20,6 @@ public interface ReadReportingService { GenericResultsetData retrieveGenericResultset(String name, String type, Map extractedQueryParams); - Response processPentahoRequest(String reportName, String outputType, Map queryParams, Locale locale); - String retrieveReportPDF(String name, String type, Map extractedQueryParams); String getReportType(String reportName); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java index 7c134b629..2f36c41cb 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadReportingServiceImpl.java @@ -6,34 +6,24 @@ package org.mifosplatform.infrastructure.dataqueries.service; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.sql.Connection; -import java.sql.Date; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Set; import javax.sql.DataSource; -import javax.ws.rs.core.Response; import javax.ws.rs.core.StreamingOutput; -import org.apache.commons.lang.StringUtils; import org.mifosplatform.infrastructure.core.domain.JdbcSupport; -import org.mifosplatform.infrastructure.core.domain.MifosPlatformTenant; -import org.mifosplatform.infrastructure.core.domain.MifosPlatformTenantConnection; import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException; import org.mifosplatform.infrastructure.core.service.RoutingDataSource; -import org.mifosplatform.infrastructure.core.service.ThreadLocalContextUtil; import org.mifosplatform.infrastructure.dataqueries.data.GenericResultsetData; import org.mifosplatform.infrastructure.dataqueries.data.ReportData; import org.mifosplatform.infrastructure.dataqueries.data.ReportParameterData; @@ -44,20 +34,6 @@ import org.mifosplatform.infrastructure.dataqueries.exception.ReportNotFoundExce import org.mifosplatform.infrastructure.documentmanagement.contentrepository.FileSystemContentRepository; import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext; import org.mifosplatform.useradministration.domain.AppUser; -import org.pentaho.reporting.engine.classic.core.ClassicEngineBoot; -import org.pentaho.reporting.engine.classic.core.DefaultReportEnvironment; -import org.pentaho.reporting.engine.classic.core.MasterReport; -import org.pentaho.reporting.engine.classic.core.ReportProcessingException; -import org.pentaho.reporting.engine.classic.core.modules.output.pageable.pdf.PdfReportUtil; -import org.pentaho.reporting.engine.classic.core.modules.output.table.csv.CSVReportUtil; -import org.pentaho.reporting.engine.classic.core.modules.output.table.html.HtmlReportUtil; -import org.pentaho.reporting.engine.classic.core.modules.output.table.xls.ExcelReportUtil; -import org.pentaho.reporting.engine.classic.core.parameters.ParameterDefinitionEntry; -import org.pentaho.reporting.engine.classic.core.parameters.ReportParameterDefinition; -import org.pentaho.reporting.engine.classic.core.util.ReportParameterValues; -import org.pentaho.reporting.libraries.resourceloader.Resource; -import org.pentaho.reporting.libraries.resourceloader.ResourceException; -import org.pentaho.reporting.libraries.resourceloader.ResourceManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -80,14 +56,10 @@ public class ReadReportingServiceImpl implements ReadReportingService { private final DataSource dataSource; private final PlatformSecurityContext context; private final GenericDataService genericDataService; - private boolean noPentaho = false; @Autowired public ReadReportingServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, final GenericDataService genericDataService) { - // kick off pentaho reports server - ClassicEngineBoot.getInstance().start(); - this.noPentaho = false; this.context = context; this.dataSource = dataSource; @@ -223,7 +195,7 @@ public class ReadReportingServiceImpl implements ReadReportingService { final SqlRowSet rs = this.jdbcTemplate.queryForRowSet(inputSqlWrapped); - if (rs.next()) { return rs.getString("the_sql"); } + if (rs.next() && rs.getString("the_sql") != null) { return rs.getString("the_sql"); } throw new ReportNotFoundException(inputSql); } @@ -240,151 +212,6 @@ public class ReadReportingServiceImpl implements ReadReportingService { throw new ReportNotFoundException(sql); } - @Override - public Response processPentahoRequest(final String reportName, final String outputTypeParam, final Map queryParams, - final Locale locale) { - - String outputType = "HTML"; - if (StringUtils.isNotBlank(outputTypeParam)) { - outputType = outputTypeParam; - } - - if (!(outputType.equalsIgnoreCase("HTML") || outputType.equalsIgnoreCase("PDF") || outputType.equalsIgnoreCase("XLS") - || outputType.equalsIgnoreCase("XLSX") || outputType.equalsIgnoreCase("CSV"))) { throw new PlatformDataIntegrityException( - "error.msg.invalid.outputType", "No matching Output Type: " + outputType); } - - if (this.noPentaho) { throw new PlatformDataIntegrityException("error.msg.no.pentaho", "Pentaho is not enabled", - "Pentaho is not enabled"); } - - final String reportPath = FileSystemContentRepository.MIFOSX_BASE_DIR + File.separator + "pentahoReports" + File.separator - + reportName + ".prpt"; - logger.info("Report path: " + reportPath); - - // load report definition - final ResourceManager manager = new ResourceManager(); - manager.registerDefaults(); - Resource res; - - try { - res = manager.createDirectly(reportPath, MasterReport.class); - final MasterReport masterReport = (MasterReport) res.getResource(); - final DefaultReportEnvironment reportEnvironment = (DefaultReportEnvironment) masterReport.getReportEnvironment(); - if (locale != null) { - reportEnvironment.setLocale(locale); - } - addParametersToReport(masterReport, queryParams); - - final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - if ("PDF".equalsIgnoreCase(outputType)) { - PdfReportUtil.createPDF(masterReport, baos); - return Response.ok().entity(baos.toByteArray()).type("application/pdf").build(); - } - - if ("XLS".equalsIgnoreCase(outputType)) { - ExcelReportUtil.createXLS(masterReport, baos); - return Response.ok().entity(baos.toByteArray()).type("application/vnd.ms-excel") - .header("Content-Disposition", "attachment;filename=" + reportName.replaceAll(" ", "") + ".xls").build(); - } - - if ("XLSX".equalsIgnoreCase(outputType)) { - ExcelReportUtil.createXLSX(masterReport, baos); - return Response.ok().entity(baos.toByteArray()).type("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") - .header("Content-Disposition", "attachment;filename=" + reportName.replaceAll(" ", "") + ".xlsx").build(); - } - - if ("CSV".equalsIgnoreCase(outputType)) { - CSVReportUtil.createCSV(masterReport, baos, "UTF-8"); - return Response.ok().entity(baos.toByteArray()).type("text/csv") - .header("Content-Disposition", "attachment;filename=" + reportName.replaceAll(" ", "") + ".csv").build(); - } - - if ("HTML".equalsIgnoreCase(outputType)) { - HtmlReportUtil.createStreamHTML(masterReport, baos); - return Response.ok().entity(baos.toByteArray()).type("text/html").build(); - } - } catch (final ResourceException e) { - throw new PlatformDataIntegrityException("error.msg.reporting.error", e.getMessage()); - } catch (final ReportProcessingException e) { - throw new PlatformDataIntegrityException("error.msg.reporting.error", e.getMessage()); - } catch (final IOException e) { - throw new PlatformDataIntegrityException("error.msg.reporting.error", e.getMessage()); - } - - throw new PlatformDataIntegrityException("error.msg.invalid.outputType", "No matching Output Type: " + outputType); - } - - private void addParametersToReport(final MasterReport report, final Map queryParams) { - - final AppUser currentUser = this.context.authenticatedUser(); - - try { - - final ReportParameterValues rptParamValues = report.getParameterValues(); - final ReportParameterDefinition paramsDefinition = report.getParameterDefinition(); - - /* - * only allow integer, long, date and string parameter types and - * assume all mandatory - could go more detailed like Pawel did in - * Mifos later and could match incoming and pentaho parameters - * better... currently assuming they come in ok... and if not an - * error - */ - for (final ParameterDefinitionEntry paramDefEntry : paramsDefinition.getParameterDefinitions()) { - final String paramName = paramDefEntry.getName(); - if (!((paramName.equals("tenantUrl")) || (paramName.equals("userhierarchy") || (paramName.equals("username")) || (paramName - .equals("password") || (paramName.equals("userid")))))) { - logger.info("paramName:" + paramName); - final String pValue = queryParams.get(paramName); - if (StringUtils.isBlank(pValue)) { throw new PlatformDataIntegrityException("error.msg.reporting.error", - "Pentaho Parameter: " + paramName + " - not Provided"); } - - final Class clazz = paramDefEntry.getValueType(); - logger.info("addParametersToReport(" + paramName + " : " + pValue + " : " + clazz.getCanonicalName() + ")"); - if (clazz.getCanonicalName().equalsIgnoreCase("java.lang.Integer")) { - rptParamValues.put(paramName, Integer.parseInt(pValue)); - } else if (clazz.getCanonicalName().equalsIgnoreCase("java.lang.Long")) { - rptParamValues.put(paramName, Long.parseLong(pValue)); - } else if (clazz.getCanonicalName().equalsIgnoreCase("java.sql.Date")) { - rptParamValues.put(paramName, Date.valueOf(pValue)); - } else { - rptParamValues.put(paramName, pValue); - } - } - - } - - // tenant database name and current user's office hierarchy - // passed as parameters to allow multitenant penaho reporting - // and - // data scoping - final Connection connection = this.dataSource.getConnection(); - String tenantUrl; - try { - tenantUrl = connection.getMetaData().getURL(); - } finally { - connection.close(); - } - final String userhierarchy = currentUser.getOffice().getHierarchy(); - logger.info("db URL:" + tenantUrl + " userhierarchy:" + userhierarchy); - rptParamValues.put("userhierarchy", userhierarchy); - - final Long userid = currentUser.getId(); - logger.info("db URL:" + tenantUrl + " userid:" + userid); - rptParamValues.put("userid", userid); - - final MifosPlatformTenant tenant = ThreadLocalContextUtil.getTenant(); - final MifosPlatformTenantConnection tenantConnection = tenant.getConnection(); - - rptParamValues.put("tenantUrl", tenantUrl); - rptParamValues.put("username", tenantConnection.getSchemaUsername()); - rptParamValues.put("password", tenantConnection.getSchemaPassword()); - } catch (final Exception e) { - logger.error("error.msg.reporting.error:" + e.getMessage()); - throw new PlatformDataIntegrityException("error.msg.reporting.error", e.getMessage()); - } - } - @Override public String retrieveReportPDF(final String reportName, final String type, final Map queryParams) { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/report/annotation/ReportService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/report/annotation/ReportService.java new file mode 100644 index 000000000..f802812aa --- /dev/null +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/report/annotation/ReportService.java @@ -0,0 +1,18 @@ +package org.mifosplatform.infrastructure.report.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +@Documented +public @interface ReportService { + + /** + * @return the type of the report + */ + String type(); +} diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/report/provider/ReportingProcessServiceProvider.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/report/provider/ReportingProcessServiceProvider.java new file mode 100644 index 000000000..73eac72f7 --- /dev/null +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/report/provider/ReportingProcessServiceProvider.java @@ -0,0 +1,61 @@ +package org.mifosplatform.infrastructure.report.provider; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.lang3.ArrayUtils; +import org.mifosplatform.infrastructure.report.annotation.ReportService; +import org.mifosplatform.infrastructure.report.service.ReportingProcessService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Component; + +@Component +@Scope("singleton") +public class ReportingProcessServiceProvider implements ApplicationContextAware { + + private static final Logger LOGGER = LoggerFactory.getLogger(ReportingProcessServiceProvider.class); + + private ApplicationContext applicationContext; + + Map reportingProcessServices = null; + + ReportingProcessServiceProvider() { + super(); + } + + public ReportingProcessService findReportingProcessService(final String reportType) { + if (this.reportingProcessServices.containsKey(reportType)) { return (ReportingProcessService) this.applicationContext + .getBean(this.reportingProcessServices.get(reportType)); } + return null; + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + this.applicationContext = applicationContext; + this.initializeRegistry(); + } + + private void initializeRegistry() { + if (this.reportingProcessServices == null) { + this.reportingProcessServices = new HashMap<>(); + + final String[] reportServiceBeans = this.applicationContext.getBeanNamesForAnnotation(ReportService.class); + if (ArrayUtils.isNotEmpty(reportServiceBeans)) { + for (final String reportName : reportServiceBeans) { + LOGGER.info("Register report service '" + reportName + "' ..."); + final ReportService service = this.applicationContext.findAnnotationOnBean(reportName, ReportService.class); + try { + this.reportingProcessServices.put(service.type(), reportName); + } catch (final Throwable th) { + LOGGER.error("Unable to register reporting service '" + reportName + "'!", th); + } + } + } + } + } +} diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/report/service/ReportingProcessService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/report/service/ReportingProcessService.java new file mode 100644 index 000000000..422f58e13 --- /dev/null +++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/report/service/ReportingProcessService.java @@ -0,0 +1,15 @@ +/** + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + */ +package org.mifosplatform.infrastructure.report.service; + +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.Response; + +public interface ReportingProcessService { + + Response processRequest(String reportName, MultivaluedMap queryParams); + +} \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt b/mifosng-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt deleted file mode 100644 index 76af0d36d..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt deleted file mode 100644 index 342933820..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans - Details.properties b/mifosng-provider/src/main/pentahoReports/Active Loans - Details.properties deleted file mode 100644 index 5986b16e0..000000000 --- a/mifosng-provider/src/main/pentahoReports/Active Loans - Details.properties +++ /dev/null @@ -1,26 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.loan.Officer=Loan Officer -label.column.client=Client -label.column.Loan.Account.No=Loan Account No. -label.column.Product=Product -label.column.Fund=Fund -label.column.Loan.Amount=Loan Amount -label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate -label.column.Disbursed.Date=Disbursed Date -label.column.Expected.Matured.On=Expected Matured On -label.column.Principal.Repaid=Principal Repaid -label.column.Principal.Outstanding=Principal Outstanding -label.column.Principal.Overdue=Principal Overdue -label.column.Interest.Repaid=Interest Repaid -label.column.Interest.Outstanding=Interest Outstanding -label.column.Interest.Overdue=Interest Overdue -label.column.Fees.Repaid=Fees Repaid -label.column.Fees.Outstanding=Fees Outstanding -label.column.Fees.Overdue=Fees Overdue -label.column.Penalties.Repaid=Penalties Repaid -label.column.Penalties.Outstanding=Penalties Outstanding -label.column.Penalties.Overdue=Penalties Overdue -label.groupby.Branch=Branch -label.title.Active.Loans.Details=Active Loans - Details -lable.group.tolat=Total diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt deleted file mode 100644 index 34bc1543d..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans - Summary.properties b/mifosng-provider/src/main/pentahoReports/Active Loans - Summary.properties deleted file mode 100644 index 2b92dbc90..000000000 --- a/mifosng-provider/src/main/pentahoReports/Active Loans - Summary.properties +++ /dev/null @@ -1,25 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.No.of.Clients=No. of Clients -label.column.No.Active.Loans=No. Active Loans -label.column.No.of.Loans.in.Arrears=No. of Loans in Arrears -label.column.Total.Loans.Disbursed=Total Loans Disbursed -label.column.Principal.Repaid=Principal Repaid -label.column.Principal.Outstanding=Principal Outstanding -label.column.Principal.Overdue=Principal Overdue -label.column.Total.Interest=Total Interest -label.column.Interest.Repaid=Interest Repaid -label.column.Interest.Outstanding=Interest Outstanding -label.column.Interest.Overdue=Interest Overdue -label.column.Total.Fees=Total Fees -label.column.Fees.Repaid=Fees Repaid -label.column.Fees.Outstanding=Fees Outstanding -label.column.Fees.Overdue=Fees Overdue -label.column.Total.Penalties=Total Penalties -label.column.Penalties.Repaid=Penalties Repaid -label.column.Penalties.Outstanding=Penalties Outstanding -label.column.Penalties.Overdue=Penalties Overdue -label.column.Portfolio.at.Risk%=Portfolio at Risk % -label.groupby.column.Branch=Branch - -label.title.Active.Loans.Details=Active Loan-Summary \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt deleted file mode 100644 index 0426d38ab..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary.properties b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary.properties deleted file mode 100644 index 6a4e9b41e..000000000 --- a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary.properties +++ /dev/null @@ -1,25 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.No.of.Clients=No. of Clients -label.column.No.Active.Loans=No. Active Loans -label.column.No.of.Loans.in.Arrears=No. of Loans in Arrears -label.column.Total.Loans.Disbursed=Total Loans Disbursed -label.column.Principal.Repaid=Principal Repaid -label.column.Principal.Outstanding=Principal Outstanding -label.column.Principal.Overdue=Principal Overdue -label.column.Total.Interest=Total Interest -label.column.Interest.Repaid=Interest Repaid -label.column.Interest.Outstanding=Interest Outstanding -label.column.Interest.Overdue=Interest Overdue -label.column.Total.Fees=Total Fees -label.column.Fees.Repaid=Fees Repaid -label.column.Fees.Outstanding=Fees Outstanding -label.column.Fees.Overdue=Fees Overdue -label.column.Total.Penalties=Total Penalties -label.column.Penalties.Repaid=Penalties Repaid -label.column.Penalties.Outstanding=Penalties Outstanding -label.column.Penalties.Overdue=Penalties Overdue -label.column.Portfolio.at.Risk%=Portfolio at Risk % -lable.title.Active.Loans.Passed.Final.Maturity.Summary=Active Loans Passed Final Maturity Summary - - diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt deleted file mode 100644 index 70da51a00..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity.properties b/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity.properties deleted file mode 100644 index 88cefb1df..000000000 --- a/mifosng-provider/src/main/pentahoReports/Active Loans Passed Final Maturity.properties +++ /dev/null @@ -1,27 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.Loan.Officer=Loan Officer -label.column.Client=Client -label.column.Loan.Account.No=Loan Account No. -label.column.Product=Product -label.column.Fund=Fund -label.column.Loan.Amount=Loan Amount -label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate -label.column.Disbursed.Date=Disbursed Date -label.column.Expected.Matured.On=Expected Matured On -label.column.Principal.Repaid=Principal Repaid -label.column.Principal.Outstanding=Principal Outstanding -label.column.Principal.Overdue=Principal Overdue -label.column.Interest.Repaid=Interest Repaid -label.column.Interest.Outstanding=Interest Outstanding -label.column.Interest.Overdue=Interest Overdue -label.column.Fees.Repaid=Fees Repaid -label.column.Fees.Outstanding=Fees Outstanding -label.column.Fees.Overdue=Fees Overdue -label.column.Penalties.Repaid=Penalties Repaid -label.column.Penalties.Outstanding=Penalties Outstanding -label.column.Penalties.Overdue=Penalties Overdue - -lable.title.Active.Loans.Passed.Final.Maturity=Active Loans Passed Final Maturity - -lable.title.group.Branch=Branch \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt deleted file mode 100644 index 709040ff3..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period.properties b/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period.properties deleted file mode 100644 index f5e48bf96..000000000 --- a/mifosng-provider/src/main/pentahoReports/Active Loans by Disbursal Period.properties +++ /dev/null @@ -1,20 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.Client.Account.No=Client Account No -label.column.Client=Client -label.column.Loan.Account.No=Loan Account No -label.column.Product=Product -label.column.Fund=Fund -label.column.Loan.Principal.Amount=Loan Principal Amount -label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate -label.column.Disbursed.Date=Disbursed Date -label.column.Total.Loan(P+I+F+Pen)=Total Loan (P+I+F+Pen) -label.column.Total.Repaid(P+I+F+Pen)=Total Repaid (P+I+F+Pen) -label.column.Loan.Officer=Loan Officer -label.title.Active.Loans.by.Disbursal.Period=Active Loans by Disbursal Period -lable.grouptotal.by.date=Total -lable.grouptotal.by.Branch= Branch Total -label.groupby.column.Disbursed.Date=Disbursed Date -label.groupby.column.Branch=Branch -lable.title.Disbursal.Period.from=Disbursal Period from -lable.title.Disbursal.Period.to=To \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt deleted file mode 100644 index d08aeda0c..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary.properties b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary.properties deleted file mode 100644 index ca2149778..000000000 --- a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment Summary.properties +++ /dev/null @@ -1,24 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.No.of.Clients=No. of Clients -label.column.No.Active.Loans=No. Active Loans -label.column.No.of.Loans.in.Arrears=No. of Loans in Arrears -label.column.Total.Loans.Disbursed=Total Loans Disbursed -label.column.Principal.Repaid=Principal Repaid -label.column.Principal.Outstanding=Principal Outstanding -label.column.Principal.Overdue=Principal Overdue -label.column.Total.Interest=Total Interest -label.column.Interest.Repaid=Interest Repaid -label.column.Interest.Outstanding=Interest Outstanding -label.column.Interest.Overdue=Interest Overdue -label.column.Total.Fees=Total Fees -label.column.Fees.Repaid=Fees Repaid -label.column.Fees.Outstanding=Fees Outstanding -label.column.Fees.Overdue=Fees Overdue -label.column.Total.Penalties=Total Penalties -label.column.Penalties.Repaid=Penalties Repaid -label.column.Penalties.Outstanding=Penalties Outstanding -label.column.Penalties.Overdue=Penalties Overdue -label.column.Portfolio.at.Risk%=Portfolio at Risk % -label.groupby.column.Branch=Branch -lable.title.Active.Loans.In.Last.Installment.Summary=Active Loans In Last Installment Summary diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt deleted file mode 100644 index 256450bf6..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment.properties b/mifosng-provider/src/main/pentahoReports/Active Loans in last installment.properties deleted file mode 100644 index 00cf44d31..000000000 --- a/mifosng-provider/src/main/pentahoReports/Active Loans in last installment.properties +++ /dev/null @@ -1,26 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.Loan.Officer=Loan Officer -label.column.Client.Account.No=Client Account No -label.column.Client=Client -label.column.Loan.Account.No=Loan Account No -label.column.Product=Product -label.column.Fund=Fund -label.column.Loan.Amount=Loan Amount -label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate -label.column.Disbursed=Disbursed -label.column.Expected.Matured.On=Expected Matured On -label.column.Principal.Repaid=Principal Repaid -label.column.Principal.Outstanding=Principal Outstanding -label.column.Principal.Overdue=Principal Overdue -label.column.Interest.Repaid=Interest Repaid -label.column.Interest.Outstanding=Interest Outstanding -label.column.Interest.Overdue=Interest Overdue -label.column.Fees.Repaid=Fees Repaid -label.column.Fees.Outstanding=Fees Outstanding -label.column.Fees.Overdue=Fees Overdue -label.column.Penalties.Repaid=Penalties Repaid -label.column.Penalties.Outstanding=Penalties Outstanding -label.column.Penalties.Overdue=Penalties Overdue -label.groupby.column.Branch=Branch -lable.title.Active.Loans.In.Last.Installment=Active Loans In Last Installment diff --git a/mifosng-provider/src/main/pentahoReports/ActiveLoanSummaryperBranch.properties b/mifosng-provider/src/main/pentahoReports/ActiveLoanSummaryperBranch.properties deleted file mode 100644 index 5a8ff11b6..000000000 --- a/mifosng-provider/src/main/pentahoReports/ActiveLoanSummaryperBranch.properties +++ /dev/null @@ -1,16 +0,0 @@ -active_loan_summery.=Active Loan Summary per Branch -branch.=Branch -centers.=No of Centers -groups.=No of Groups -clients.=No of Clients -activeloan.=No of Active Loan -loanarrears.=No of Loan in Arrears -disbursed.=Total Loans Disbursed -principalrepaid.=Total Principal Repaid -interestrepaid.=Total Interest Repaid -principaloutstand.=Total Principal Outstanding -interestoutstand.=Total Interest Outstanding -amountarreas.=Amount in Arrears -total.=Total -PrintedBy\:=Printed By : -On\:=On : \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt deleted file mode 100644 index c5c1b8974..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Aging Detail.properties b/mifosng-provider/src/main/pentahoReports/Aging Detail.properties deleted file mode 100644 index de8165c28..000000000 --- a/mifosng-provider/src/main/pentahoReports/Aging Detail.properties +++ /dev/null @@ -1,20 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.Client.Account.No=Client Account No. -label.column.Client.Name=Client Name -label.column.Account.Number=Account Number -label.column.Loan.Amount=Loan Amount -label.column.Original.Principal=Original Principal -label.column.Original.Interest=Original Interest -label.column.Principal.Paid=Principal Paid -label.column.Interest.Paid=Interest Paid -label.column.Principal.Overdue=Principal Overdue -label.column.Interest.Overdue=Interest Overdue -label.column.Days.in.Arrears=Days in Arrears -label.column.Weeks.In.Arrears.Band=Weeks In Arrears Band -label.column.Days.in.Arrears.Band=Days in Arrears Band - - -lable.title.Aging.Detail=Aging Detail - -lable.title.group.Branch=Branch diff --git a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt deleted file mode 100644 index 581b0a4b6..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months).properties b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months).properties deleted file mode 100644 index c322bf4e9..000000000 --- a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Months).properties +++ /dev/null @@ -1,12 +0,0 @@ -label.column.currency=currency -label.column.Days.In.Arrears=Days In Arrears -label.column.No.Of.Loans=No Of Loans -label.column.Original.Principal=Original Principal -label.column.Original.Interest=Original Interest -label.column.Principal.Paid=Principal Paid -label.column.Interest.Paid=Interest Paid -label.column.Principal.Overdue=Principal Overdue -label.column.Interest.Overdue=Interest Overdue -lable.title.Aging.Summary.Months=Aging Summary (Arrears in Months) - -lable.title.group.Branch=Branch diff --git a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt deleted file mode 100644 index 7f2604b4d..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks).properties b/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks).properties deleted file mode 100644 index 58699376c..000000000 --- a/mifosng-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks).properties +++ /dev/null @@ -1,13 +0,0 @@ -label.column.Currency=Currency -label.column.Weeks.In.Arrears=Weeks In Arrears(Up To) -label.column.N.Of.Loans=No Of Loans -label.column.Original.Principal=Original Principal -label.column.Original.Interest=Original Interest -label.column.Principal.Paid=Principal Paid -label.column.Interest.Paid=Interest Paid -label.column.Principal.Overdue=Principal Overdue -label.column.Interest.Overdue=Interest Overdue - -lable.title.Aging.Summary.in.Weeks=Aging Summary (Arrears in Weeks) - -lable.title.group.Branch=Branch diff --git a/mifosng-provider/src/main/pentahoReports/Balance Outstanding.prpt b/mifosng-provider/src/main/pentahoReports/Balance Outstanding.prpt deleted file mode 100644 index 9fdaf17a9..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Balance Outstanding.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt b/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt deleted file mode 100644 index eb5ed8665..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Balance Sheet.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt b/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt deleted file mode 100644 index 113980aa7..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt deleted file mode 100644 index c09145276..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Listing.properties b/mifosng-provider/src/main/pentahoReports/Client Listing.properties deleted file mode 100644 index 623a41955..000000000 --- a/mifosng-provider/src/main/pentahoReports/Client Listing.properties +++ /dev/null @@ -1,10 +0,0 @@ -label.column.ID=ID -label.column.Office/Branch=Office/Branch -label.column.Client.Account.No=Client Account No. -label.column.Name=Name -label.column.Status=Status -label.column.Activation=Activation -label.column.External.Id=External Id - -lable.title.Client.Listing=Client Listing -lable.title.group.Branch=Branch diff --git a/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt b/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt deleted file mode 100644 index c57cb3d17..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt deleted file mode 100644 index 8f1d7bbc9..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.properties b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.properties deleted file mode 100644 index b981f9ecf..000000000 --- a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.properties +++ /dev/null @@ -1,19 +0,0 @@ -label.column.Transaction.ID=Transaction ID -label.column.Transaction.Date=Transaction Date -label.column.Transaction.Type=Transaction Type -label.column.Debit=Debit -label.column.Credit=Credit -label.column.Balance=Balance -label.column.Reversed=Reversed -lable.title.Saving.Transaction=Client Saving Transaction -lable.title.Transaction.from=From : -lable.title.Saving.Transaction.To= To : -lable.title.Client.Name=Client Name -lable.title.Savings.Account.Name/No=Account Name/No -lable.title.Branch=Branch -lable.title.Staff=Staff -lable.title.Interest=Interest Rate -lable.title.Balance=Balance -PrintedBy\:=Printed by: -On\:=On: - diff --git a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt deleted file mode 100644 index e88cd9669..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties deleted file mode 100644 index e87c59448..000000000 --- a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties +++ /dev/null @@ -1,18 +0,0 @@ -label.column.Transaction.ID=Transaction Id -label.column.Transaction.Date=Date de transaction -label.column.Transaction.Type=Type de transaction -label.column.Debit=Débit -label.column.Credit=Crédit -label.column.Balance=Solde -label.column.Reversed=Reversed -lable.title.Transaction.from=À partir de la date : -lable.title.Saving.Transaction.To= Jusqu’à la date : -lable.title.Client.Name=Client Nom -lable.title.Savings.Account.Name/No=Account Name/No -lable.title.Branch=Branch -lable.title.Staff=Staff -lable.title.Interest=Interest Rate -lable.title.Balance=Balance -PrintedBy\:=Printed by: -On\:=On: - diff --git a/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt b/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt deleted file mode 100755 index 79888b06f..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Collection Report.prpt b/mifosng-provider/src/main/pentahoReports/Collection Report.prpt deleted file mode 100644 index 5e1878572..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Collection Report.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/CollectionReport.properties b/mifosng-provider/src/main/pentahoReports/CollectionReport.properties deleted file mode 100644 index 6f23eede7..000000000 --- a/mifosng-provider/src/main/pentahoReports/CollectionReport.properties +++ /dev/null @@ -1,20 +0,0 @@ -collection.=Collection Report -receipt.=Receipt No -group.=Group Name -client.=Clients Name -loanAccNo.=Loan Account No -pricAmt.=Principal Amount -intAmt.=Interest Amount -totalAmt.=Total Receipt Amount -feeAmt.=Fees -penaltyAmt.=Penalty -others.=Others -mifos.=Mifos User -actdate.=Action Date -created.=Created Date -office.=Branch : -ondate.=From : -todate.=To : -PrintedBy\:=Printed by: -On\:=On: -center\:=Center : \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Disbursal Report.prpt b/mifosng-provider/src/main/pentahoReports/Disbursal Report.prpt deleted file mode 100644 index d8718266e..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Disbursal Report.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/DisbursalReport.properties b/mifosng-provider/src/main/pentahoReports/DisbursalReport.properties deleted file mode 100644 index df864a834..000000000 --- a/mifosng-provider/src/main/pentahoReports/DisbursalReport.properties +++ /dev/null @@ -1,23 +0,0 @@ -disbursalReport=Disbursal Report -receiptNo=Receipt No: -phoneNo=Phone No: -accountId=Account ID: -clientGroup=Client/Group -loanAmount=Loan Amount -disbDate=Disbursed Date -loanType=Loan Type -loanOfficer=Loan Officer -PrintedBy\:=Printed By : -On\:=On : -center\:=Center : -centerName=Center Name -groupName=Group Name -disbursedAmount=Disbursed Amount -clientName=Client Name -serviceTax=Service Tax -annualSubscription=Annual Subscription -processingFees=Processing Fees -disbursedDate=Disbursed Date -createdDate=Created Date -mifosUser=Mifos User -fees=Fees \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt deleted file mode 100644 index 6366070b2..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Basic.properties b/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Basic.properties deleted file mode 100644 index b5a620e91..000000000 --- a/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Basic.properties +++ /dev/null @@ -1,20 +0,0 @@ - -label.column.Office=Office -label.column.Loan.Officer=Loan Officer -label.column.Client.Account.Number=Client Account Number -label.column.Name=Name -label.column.Product=Product -label.column.Loan.Account.Number=Loan Account Number -label.column.Due.Date=Due Date -label.column.Installment=Installment -label.column.Currency=Currency -label.column.Principal.Due=Principal Due -label.column.Interest.Due=Interest Due -label.column.Fees.Due=Fees Due -label.column.Penalty.Due=Penalty Due -label.column.Total.Due=Total Due -label.column.Total.Overdue=Total Overdue - - -lable.title.Expected.Payments.By.Date.Basic=Expected Payments By Date - Basic -lable.title.group.Branch=Branch diff --git a/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt b/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt deleted file mode 100644 index db0e39fc9..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt deleted file mode 100644 index ab66914dd..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office.PROPERTIES b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office.PROPERTIES deleted file mode 100644 index d09905ba3..000000000 --- a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office.PROPERTIES +++ /dev/null @@ -1,8 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Fund=Fund -label.column.Currency=Currency -label.column.Disbursed.amount=Disbursed_amount - - -lable.title.Funds.Disbursed.Between.Dates.Summary.by.Office=Funds Disbursed Between Dates Summary by Office - diff --git a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt deleted file mode 100644 index 976d05e56..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary.PROPERTIES b/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary.PROPERTIES deleted file mode 100644 index 32d6fceb9..000000000 --- a/mifosng-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary.PROPERTIES +++ /dev/null @@ -1,4 +0,0 @@ -label.column.Fund=Fund -label.column.Currency=Currency -label.column.disbursed_amount=disbursed_amount -lable.title.Funds.Disbursed.Between.Dates.Summary=Funds Disbursed Between Dates Summary diff --git a/mifosng-provider/src/main/pentahoReports/GeneralLedgerReport.properties b/mifosng-provider/src/main/pentahoReports/GeneralLedgerReport.properties deleted file mode 100644 index 225f51e28..000000000 --- a/mifosng-provider/src/main/pentahoReports/GeneralLedgerReport.properties +++ /dev/null @@ -1,18 +0,0 @@ -lable.detail.Vch_No_Unit=Vch No./Unit -lable.detail.AC.code=GL Code -lable.detail.Account_Description=Account Description -lable.detail.Narration=Description -lable.detail.Debits=Debits -lable.detail.Credits=Credits -lable.detail.Opening_Balance=BALANCE BROUGHT FORWARD (b/f) -lable.detail.Day_Total=Day Total -lable.detail.Closing_Balance=Closing Balance -lable.detail.date=Date -lable.detail.Cash_Book_From=Ledger Report From Date : -lable.detail.Run_Date=Run Date : -lable.detail.Cash_Code= Ledger Account : -lable.header=GENERAL LEDGER REPORT -lable.page=Page No -lable.detail.AfterTxn=Balance -lable.detail.office = Office : -lable.detail.todate = To Date : \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/GeneralLedgerReport.prpt b/mifosng-provider/src/main/pentahoReports/GeneralLedgerReport.prpt deleted file mode 100644 index 99287cc19..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/GeneralLedgerReport.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Income Statement.prpt b/mifosng-provider/src/main/pentahoReports/Income Statement.prpt deleted file mode 100644 index 22f2e9b63..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Income Statement.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Loan Account Statement.properties b/mifosng-provider/src/main/pentahoReports/Loan Account Statement.properties deleted file mode 100644 index e7113c879..000000000 --- a/mifosng-provider/src/main/pentahoReports/Loan Account Statement.properties +++ /dev/null @@ -1,20 +0,0 @@ -Loan_Account_Statement.=Loan Account Statement -Date.=Date -type.=Type -disbur.=Disbursement -repayment.=Repayment -contra.=Contra -waiveint=WaiveInterest -repaydisbur=Repayment At Disburesement -writeoff.=Write-off -marked_resch.=Marked for Rescheduling -recover.=Recover Repayment -waive_cha.=Waive Charges -apply_char.=Apply charges -apply_int.=Apply Interest -description.=Description -amount.=Amount -principal.=Principal -interest.=Interest -recepit_no.=Recepit No -paymentype.=Payment Type \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Loan Account statement.prpt b/mifosng-provider/src/main/pentahoReports/Loan Account statement.prpt deleted file mode 100644 index ed06b710c..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Loan Account statement.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Loan Transaction Receipt.properties b/mifosng-provider/src/main/pentahoReports/Loan Transaction Receipt.properties deleted file mode 100644 index f55ed9afa..000000000 --- a/mifosng-provider/src/main/pentahoReports/Loan Transaction Receipt.properties +++ /dev/null @@ -1,42 +0,0 @@ -title.Loan.Transaction.Receipt=Receipt -label.ClientName=Client Name: -label.ClientAccountNumber=Client Account Number: -label.ProductName=Client Account Title: -label.Operation=Operation: -label.Operation.Deposit=Deposit -label.Operation.Withdrawal=Withdrawal -label.Operation.Amount=Amount: -label.Operation.Amount.InFigures=In Figures: -label.Operation.Amount.InWords=In Words: -label.Operation.Description=Description: -label.receipt.text1=Your account has been -label.receipt.credited=credited -label.receipt.debited=debited -label.receipt.text2= with -label.receipt.text.dot=. -label.receipt.ClientName=Client Name and Signature -label.receipt.TxnDateTime=Date and Time of Transaction: -label.receipt.Operator=Cashier Name: -label.receipt.TxnID=Transaction ID: -txn_type.1=Disbursement -txn_type.2=Repayment -txn_type.3=Contra -txn_type.4=Waive Interest -txn_type.5=Repayment At Disbursement -txn_type.6=Write-Off -txn_type.7=Marked for Rescheduling -txn_type.8=Recovery Repayment -txn_type.9=Waive Charges -txn_type.10=Apply Charges -txn_type.11=Apply Interest -accounting_txn_type.1=debited -accounting_txn_type.2=credited -accounting_txn_type.3=contra-ed -accounting_txn_type.4=credited -accounting_txn_type.5=credited -accounting_txn_type.6=credited -accounting_txn_type.7=credited -accounting_txn_type.8=debited -accounting_txn_type.9=credited -accounting_txn_type.10=debitd -accounting_txn_type.11=debited \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt b/mifosng-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt deleted file mode 100644 index f4b6ad562..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt deleted file mode 100644 index dd7fbaecf..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month.properties b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month.properties deleted file mode 100644 index 5751fcf5f..000000000 --- a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month.properties +++ /dev/null @@ -1,12 +0,0 @@ - -label.column.Office/Branch=Office/Branch -label.column.Product=Product -label.column.Currency=Currency - -label.column.Year=Year -label.column.Month=Month -label.column.Principal=Principal - -lable.title.Loans.Awaiting.Disbursal.Summary.by.Month=Loans Awaiting Disbursal Summary by Month -lable.Group.title.Branch=Branch - diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt deleted file mode 100644 index 0baa28881..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary.properties b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary.properties deleted file mode 100644 index ddabb80d6..000000000 --- a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary.properties +++ /dev/null @@ -1,13 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Product=Product -label.column.Currency=Currency -label.column.Fund=Fund -label.column.Principal=Principal -lable.title.Loans.Awaiting.Disbursal.Summary=Loans Awaiting Disbursal Summary -lable.Group.title.Branch=Branch - - - - - - diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt deleted file mode 100644 index 353e8c203..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal.properties b/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal.properties deleted file mode 100644 index 915d7d6df..000000000 --- a/mifosng-provider/src/main/pentahoReports/Loans Awaiting Disbursal.properties +++ /dev/null @@ -1,24 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Client.Account.No=Client Account No -label.column.Name=Name -label.column.Loan.Account.No=Loan Account No. -label.column.Product=Product -label.column.Fund=Fund -label.column.Currency=Currency -label.column.Principal=Principal -label.column.Term.Frequency=Term Frequency -label.column.Term.Frequency.Period=Term Frequency Period -label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate -label.column.Approved=Approved -label.column.Days.to.Disbursal=Days to Disbursal -label.column.Expected.Disbursal=Expected Disbursal -label.column.Loan.Purpose=Loan Purpose -label.column.Loan.Officer=Loan Officer -label.group.title.Branch.Name=Branch Name - - -lable.title.Loans.Awaiting.Disbursal=Loans Awaiting Disbursal - - - - diff --git a/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt deleted file mode 100644 index b7a13299e..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Loans Pending Approval.properties b/mifosng-provider/src/main/pentahoReports/Loans Pending Approval.properties deleted file mode 100644 index bd9e6b4d8..000000000 --- a/mifosng-provider/src/main/pentahoReports/Loans Pending Approval.properties +++ /dev/null @@ -1,18 +0,0 @@ -label.column.Branch/Office=Branch/Office -label.column.Client.Account.No=Client Account No. -label.column.Client.Name=Client Name -label.column.Currency=Currency -label.column.Product=Product -label.column.Loan.Account.No=Loan Account No. -label.column.Loan.Amount=Loan Amount -label.column.Term.Frequency=Term Frequency -label.column.Term.Frequency.Period=Term Frequency Period -label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate -label.column.Days.Pending.Approval=Days Pending Approval -label.column.Loan.Purpose=Loan Purpose -label.column.Loan.Officer=Loan Officer - -label.group.title.Branch.Name=Branch Name - - -lable.title.Loans.Pending.Approval=Loans Pending Approval diff --git a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt deleted file mode 100644 index aec6f96ea..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details.properties b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details.properties deleted file mode 100644 index b3614e77e..000000000 --- a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Details.properties +++ /dev/null @@ -1,22 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.Client.Account.No=Client Account No. -label.column.Client=Client -label.column.Loan.Account.No=Loan Account No. -label.column.Product=Product -label.column.Fund=Fund -label.column.Loan.Amount=Loan Amount -label.column.Total.Repaid=Total Repaid -label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate -label.column.Disbursed=Disbursed -label.column.Closed=Closed -label.column.Principal.Repaid=Principal Repaid -label.column.Interest.Repaid=Interest Repaid -label.column.Fees.Repaid=Fees Repaid -label.column.Penalties.Repaid=Penalties Repaid -label.column.Loan.Officer=Loan Officer -label.group.title.Branch.Name=Branch Name - - -lable.title.Obligation.Met.Loans.Details=Obligation Met Loans Details - diff --git a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt deleted file mode 100644 index 3d2270971..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary.properties b/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary.properties deleted file mode 100644 index 0243333a9..000000000 --- a/mifosng-provider/src/main/pentahoReports/Obligation Met Loans Summary.properties +++ /dev/null @@ -1,17 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.No.of.Clients=No. of Clients -label.column.Total.Loan.Amount=Total Loan Amount -label.column.Total.Principal.Repaid=Total Principal Repaid -label.column.Total.Interest.Repaid=Total Interest Repaid -label.column.Total.Fees.Repaid=Total Fees Repaid -label.column.Total.Penalties.Repaid=Total Penalties Repaid -label.column.Total.Interest.Waived=Total Interest Waived -label.column.Total.Fees.Waived=Total Fees Waived -label.column.Total.Penalties.Waived=Total Penalties Waived -label.group.title.Branch=Branch -label.column. - - -lable.title.Obligation.Met.Loans.Summary=Obligation Met Loans Summary - diff --git a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt deleted file mode 100644 index 639e0fdf7..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch.properties b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch.properties deleted file mode 100644 index f845130a6..000000000 --- a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk by Branch.properties +++ /dev/null @@ -1,15 +0,0 @@ -label.group.title.Branch=Branch -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.Principal.Outstanding=Principal Outstanding -label.column.Principal.Overdue=Principal Overdue -label.column.Interest.Outstanding=Interest Outstanding -label.column.Interest.Overdue=Interest Overdue -label.column.Fees.Outstanding=Fees Outstanding -label.column.Fees.Overdue=Fees Overdue -label.column.Penalties.Outstanding=Penalties Outstanding -label.column.Penalties.Overdue=Penalties Overdue - - - -lable.title.Portfolio.At.Risk.By.Branch=Portfolio At Risk By Branch diff --git a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt deleted file mode 100644 index 7e68f7ef5..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk.properties b/mifosng-provider/src/main/pentahoReports/Portfolio at Risk.properties deleted file mode 100644 index 653f768f3..000000000 --- a/mifosng-provider/src/main/pentahoReports/Portfolio at Risk.properties +++ /dev/null @@ -1,16 +0,0 @@ -label.column.Currency=Currency -label.column.Principal.Outstanding=Principal Outstanding -label.column.Principal.Overdue=Principal Overdue -label.column.Interest.Outstanding=Interest Outstanding -label.column.Interest.Overdue=Interest Overdue -label.column.Fees.Outstanding=Fees Outstanding -label.column.Fees.Overdue=Fees Overdue -label.column.Penalties.Outstanding=Penalties Outstanding -label.column.Penalties.Overdue=Penalties Overdue -label.column.Portfolio.at.Risk.per=Portfolio at Risk % - -label.group.title.Branch=Branch -lable.title.Portfolio.at.Risk=Portfolio at Risk - - - diff --git a/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt deleted file mode 100644 index 424cdc8cd..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Rescheduled Loans.properties b/mifosng-provider/src/main/pentahoReports/Rescheduled Loans.properties deleted file mode 100644 index 28c305833..000000000 --- a/mifosng-provider/src/main/pentahoReports/Rescheduled Loans.properties +++ /dev/null @@ -1,17 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.Client.Account.No=Client Account No. -label.column.Client.Name=Client Name -label.column.Loan.AccountNo=Loan Account No. -label.column.Product.Name=Product Name -label.column.Disbursed.Date=Disbursed Date -label.column.Written.Off.date=Written Off date -label.column.Loan.Amount=Loan Amount -label.column.Rescheduled.Principal=Rescheduled Principal -label.column.Rescheduled.Interest=Rescheduled Interest -label.column.Rescheduled.Fees=Rescheduled Fees -label.column.Rescheduled.Penalties=Rescheduled Penalties -label.column.Reason.For.Rescheduling=Reason For Rescheduling -label.columnLoan.Officer.Name=Loan Officer Name -label.group.title.Branch=Branch -lable.title.Rescheduled.Loans=Rescheduled Loans diff --git a/mifosng-provider/src/main/pentahoReports/Saving Account Statement.properties b/mifosng-provider/src/main/pentahoReports/Saving Account Statement.properties deleted file mode 100644 index 24c4500fa..000000000 --- a/mifosng-provider/src/main/pentahoReports/Saving Account Statement.properties +++ /dev/null @@ -1,9 +0,0 @@ -Saving_Account_Statement.=Saving Account Statement -date.=Date -transaction_type=Transaction type -receipt_number=Receipt no -Description.=Description -Credited.=Credited -Debited.=Debited -Balance.=Balance -transaction.=Patment Type \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Saving Account Statement.prpt b/mifosng-provider/src/main/pentahoReports/Saving Account Statement.prpt deleted file mode 100644 index 4b42b844d..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Saving Account Statement.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Saving Transaction.properties b/mifosng-provider/src/main/pentahoReports/Saving Transaction.properties deleted file mode 100644 index c4b5451f5..000000000 --- a/mifosng-provider/src/main/pentahoReports/Saving Transaction.properties +++ /dev/null @@ -1,14 +0,0 @@ -label.column.Transaction.ID=Transaction ID -label.column.Transaction.Date=Transaction Date -label.column.Transaction.Type=Transaction Type -label.column.Debit=Debit -label.column.Credit=Credit -label.column.Balance=Balance -label.column.Reversed=Reversed -lable.title.Saving.Transaction=Client Saving Transaction -lable.title.Transaction.from=Transaction From : -lable.title.Saving.Transaction.To= To : -lable.title.Client.Name=Client Name : -lable.title.Savings.Account.Name/No=Account Name/No. : -lable.title. - diff --git a/mifosng-provider/src/main/pentahoReports/Savings Transaction Receipt.properties b/mifosng-provider/src/main/pentahoReports/Savings Transaction Receipt.properties deleted file mode 100644 index 8d0ba7da7..000000000 --- a/mifosng-provider/src/main/pentahoReports/Savings Transaction Receipt.properties +++ /dev/null @@ -1,27 +0,0 @@ -title.Saving.Transaction.Receipt=Receipt -label.ClientName=Client Name: -label.ClientAccountNumber=Client Account Number: -label.ProductName=Client Account Title: -label.Operation=Operation: -label.Operation.Deposit=Deposit -label.Operation.Withdrawal=Withdrawal -label.Operation.Amount=Amount: -label.Operation.Amount.InFigures=In Figures: -label.Operation.Amount.InWords=In Words: -label.Operation.Description=Description: -label.receipt.text1=Your account has been -label.receipt.credited=credited -label.receipt.credited=debited -label.receipt.text2= with -label.receipt.text.dot=. -label.receipt.ClientName=Client Name and Signature -label.receipt.TxnDateTime=Date and Time of Transaction: -label.receipt.Operator=Cashier Name: -label.receipt.TxnID=Transaction ID: -txn_type.1=Deposit -txn_type.2=Withdrawal -txn_type.3=Interest Posting -accounting_txn_type.1=credited -accounting_txn_type.2=debited -accounting_txn_type.3=credited -test.msg=Your Account has been $(acc_txn_type) with $(txn_amount, number, "#,###.##") \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt b/mifosng-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt deleted file mode 100644 index 7eaca7e61..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Savings Transactions.prpt b/mifosng-provider/src/main/pentahoReports/Savings Transactions.prpt deleted file mode 100755 index fd3eef1f1..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Savings Transactions.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Staff Assignment History.prpt b/mifosng-provider/src/main/pentahoReports/Staff Assignment History.prpt deleted file mode 100644 index d50d97169..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Staff Assignment History.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Trial Balance.prpt b/mifosng-provider/src/main/pentahoReports/Trial Balance.prpt deleted file mode 100644 index a04448c07..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Trial Balance.prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt deleted file mode 100644 index 2aea6c425..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/TxnRunningBalances.properties b/mifosng-provider/src/main/pentahoReports/TxnRunningBalances.properties deleted file mode 100644 index 45d459d02..000000000 --- a/mifosng-provider/src/main/pentahoReports/TxnRunningBalances.properties +++ /dev/null @@ -1,19 +0,0 @@ -label.column.Transaction.Date=Transaction Date -label.column.Transaction.Type=Transaction Type -label.column.Office=Office -label.column.Loan.Officer=Loan Officer -label.column.Loan.Account.No=Loan Account No -label.column.Loan.Product=Loan Product -label.column.Currency=Currency -label.column.Client.Account.No=Client Account No -label.column.Client=Client -label.column.Amount=Amount -label.column.Principal=Principal -label.column.Interest=Interest -label.column.Outstanding.Principal=Outstanding Principal -label.column.Interest.Income=Interest Income -label.column.Principal.Write.Off=Principal Write Off -label.group.title.Branch=Branch -lable.title.Transaction.Running.Balances=Transaction Running Balances - - diff --git a/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt b/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt deleted file mode 100644 index 4eee7b8be..000000000 Binary files a/mifosng-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt and /dev/null differ diff --git a/mifosng-provider/src/main/pentahoReports/Written-Off Loans.properties b/mifosng-provider/src/main/pentahoReports/Written-Off Loans.properties deleted file mode 100644 index 84a78493d..000000000 --- a/mifosng-provider/src/main/pentahoReports/Written-Off Loans.properties +++ /dev/null @@ -1,17 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Currency=Currency -label.column.Client.Account.No=Client Account No. -label.column.Client.Name=Client Name -label.column.Loan.Account.No.=Loan Account No. -label.column.Product.Name=Product Name -label.column.Disbursed.Date=Disbursed Date -label.column.Written.Off.date=Written Off date -label.column.Loan.Amount=Loan Amount -label.column.Written.Off.Principal=Written-Off Principal -label.column.Written.Off.Interest=Written-Off Interest -label.column.Written.Off.Fees=Written-Off Fees -label.column.Written.Off.Penalties=Written-Off Penalties -label.column.Reason.For.Write.Off=Reason For Write-Off -label.column.Loan.Officer.Name=Loan Officer Name -label.group.title.Branch=Branch -label.title.Written.Off.Loans=Written-Off Loans diff --git a/mifosng-provider/src/main/pentahoReports/balanceOutstanding.properties b/mifosng-provider/src/main/pentahoReports/balanceOutstanding.properties deleted file mode 100644 index a500ab758..000000000 --- a/mifosng-provider/src/main/pentahoReports/balanceOutstanding.properties +++ /dev/null @@ -1,15 +0,0 @@ -balanceOutstanding=Balance Outstanding -accountId=Account ID: -clientGroup=Client/Group -loanAmount=Loan Amount -balance=Balance -loanStatus=Loan Status -disbDate=Disbursed Date -gender=Gender -loanType=Loan Type -fundSource=Fund Source -loanOfficer=Loan Officer -PrintedBy\:=Printed By : -On\:=On : -center\:=Center : -loanpurpose.=Loan Purpose \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/balanceSheet.properties b/mifosng-provider/src/main/pentahoReports/balanceSheet.properties deleted file mode 100644 index 5fd8cf174..000000000 --- a/mifosng-provider/src/main/pentahoReports/balanceSheet.properties +++ /dev/null @@ -1,13 +0,0 @@ -balanceSheet=Balance Sheet -glcode=GL CODE -name=Name -balance=Balance -assets=Assets -totalAssets=Total Assets : -liability=Liabilities -totalLiabilities=Total Liabilities : -equity=Equities -totalEquities=Total Equities : -branchName=Branch : -asOn=As On : -retainedEarnings=Retained Earnings diff --git a/mifosng-provider/src/main/pentahoReports/branchExpectedCashFlow.properties b/mifosng-provider/src/main/pentahoReports/branchExpectedCashFlow.properties deleted file mode 100644 index 0cd5fe3c9..000000000 --- a/mifosng-provider/src/main/pentahoReports/branchExpectedCashFlow.properties +++ /dev/null @@ -1,21 +0,0 @@ -BranchExpectedCashFlow=Branch Expected Cash Flow -From=From : -To=To: -Office=Office: -Currency=Currency : -Date=Date -ExpectedCashIn=Expected Cash In -ExpectedCashOut=Expected Cash Out -Principle=Principle -Interest=Interest -ClientFees=CLient Fees -LoanFees=Loan Fees -Penalty=Penalty -LoanDisbursals=Loan Disbursals -NetExpectedCashOut=Net Expected Cash Out -Total=Total : -PrintedBy\:=Printed by: -On\:=On: -MFIName\:=MFI Name: -Page=Page -VersionAt=Version 1.3.1 \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/clientLoansListing.properties b/mifosng-provider/src/main/pentahoReports/clientLoansListing.properties deleted file mode 100644 index fd76bfc40..000000000 --- a/mifosng-provider/src/main/pentahoReports/clientLoansListing.properties +++ /dev/null @@ -1,43 +0,0 @@ -label.column.Office/Branch=Office/Branch -label.column.Client.Account.No=Client Account No. -label.column.Name=Name -label.column.Client.Status=Client Status -label.column.Loan.Officer=Loan Officer -label.column.Loan.Account.No=Loan Account No. -label.column.External.Id=External Id -label.column.Loan=Loan -label.column.Status=Status -label.column.Fund=Fund -label.column.Loan.Purpose=Loan Purpose -label.column.Currency=Currency -label.column.principal_amount=principal_amount -label.column.Arrears.Tolerance.Amount=Arrears Tolerance Amount -label.column.principal_amount=principal_amount -label.column.Annual_Nominal.Interest_Rate=Annual_Nominal Interest_Rate -label.column.Nominal.Interest.Rate.Per.Period=Nominal Interest Rate Per Period -label.column.Interest.Rate.Frequency=Interest Rate Frequency -label.column.Interest.Method=Interest Method -label.column.Interest.Calculated.in.Period=Interest Calculated in Period -label.column.Term.Frequency=Term Frequency -label.column.Term.Frequency.Period=Term Frequency Period -label.column.Repayment.Frequency=Repayment Frequency -label.column.Repayment.Frequency.Period=Repayment Frequency Period -label.column.Amortization=Amortization -label.column.Total.Charges.Due.At.Disbursement=Total Charges Due At Disbursement -label.column.Submitted=Submitted -label.column.Approved=Approved -label.column.Expected.Disbursal=Expected Disbursal -label.column.Expected.First.Repayment=Expected First Repayment -label.column.Interest.Calculated.From=Interest Calculated From -label.column.Disbursed=Disbursed -label.column.Expected.Maturity=Expected Maturity -label.column.Matured.On=Matured On -label.column.Closed=Closed -label.column.Rejected=Rejected -label.column.Rescheduled=Rescheduled -label.column.Withdrawn=Withdrawn -label.column.Written.Off=Written Off -label.column. -label.groupby.Branch=Branch -label.title.Client.Loans.Listing=Client Loans Listing - diff --git a/mifosng-provider/src/main/pentahoReports/clientSavingsSummary.properties b/mifosng-provider/src/main/pentahoReports/clientSavingsSummary.properties deleted file mode 100755 index b4f924511..000000000 --- a/mifosng-provider/src/main/pentahoReports/clientSavingsSummary.properties +++ /dev/null @@ -1,19 +0,0 @@ -clientSavingsSummary=Client Savings Summary -transactionDate=Transaction Date -details=Details -totalDebits=Total Debits -totalCredits=Total Credits -withdrawal=Withdrawal -balance=Balance -balancebf=Balance B/F -From=From : -To=To: -PrintedBy\:=Printed by: -On\:=On: -MFIName\:=MFI Name: -Page=Page -VersionAt=Version 1.3.1 -accountNo=Account No: -clientName=Client Name -product=Product -Total=Total : \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/expectedPaymentsByDate.properties b/mifosng-provider/src/main/pentahoReports/expectedPaymentsByDate.properties deleted file mode 100644 index b28c368b1..000000000 --- a/mifosng-provider/src/main/pentahoReports/expectedPaymentsByDate.properties +++ /dev/null @@ -1,23 +0,0 @@ -ExpectedPaymentsByDate=Expected Payments By Date -From=From : -To=To: -Office=Office : -DueDate=Due Date : -ClientName=Client Name -LoanAccountNo=Loan Account No: -Product=Product -Installment=Installment -Date=Date -Principal=Principal -LoanOfficer=Loan Officer -Interest=Interest -FeesDue=Fees Due -PenaltyDue=Penalty Due -TotalDue=Total Due -TotalOverDue=Total Over Due -Total=Total : -PrintedBy\:=Printed by: -On\:=On: -MFIName\:=MFI Name: -Page=Page -VersionAt=Version 1.3.1 \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/incomeStatement.properties b/mifosng-provider/src/main/pentahoReports/incomeStatement.properties deleted file mode 100644 index 1fcfad6d7..000000000 --- a/mifosng-provider/src/main/pentahoReports/incomeStatement.properties +++ /dev/null @@ -1,15 +0,0 @@ -incomeStatement=Income Statement -glcode=GL CODE -name=Name -balance=Balance -income=Income -totalIncome=Total Income : -expenses=Expenses -totalExpenses=Total Expenses : -netIncome=Net Income : -branchName=Branch : -period=Period: -to=To -PrintedBy\:=Printed by: -On\:=On: -Page=Page \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/loanScheduleDetailed.properties b/mifosng-provider/src/main/pentahoReports/loanScheduleDetailed.properties deleted file mode 100644 index 18f65aafb..000000000 --- a/mifosng-provider/src/main/pentahoReports/loanScheduleDetailed.properties +++ /dev/null @@ -1,33 +0,0 @@ -loanAccountSchedule=Loan Account Schedule -Office=Office : -LoanOfficer=Loan Officer : -ClientName=Client Name : -FileID=File ID : -LoanAccountNumber=Loan Account Number : -LoanAmount=Loan Amount : -DisbursalDate=Disbursal Date : -NoOfInstallments=Number Of Installments : -InterestRate=Interest Rate : -Installment=Installment -Currency=Currency : -PrincipleDue=Principle Due -InterestDue=Interest Due -FeesDue=Fees Due -PenaltyDue=Penalty Due -TotalDue=Total Due -DateExpected=Date Expected -Status=Status -Total=Total : -ActivityDetails=Activity Details -Date=Date -Comment=Comment -Principle=Principle -Interest=Interest -Fees=Fees -Penalty=Penalty -TotalPaid=Total Paid -TotalOutstanding=Total Outstanding -PrintedBy\:=Printed by: -On\:=On: -MFIName\:=MFI Name: -Page=Page \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/loanScheduleDetailed_fr.properties b/mifosng-provider/src/main/pentahoReports/loanScheduleDetailed_fr.properties deleted file mode 100644 index fd48fb736..000000000 --- a/mifosng-provider/src/main/pentahoReports/loanScheduleDetailed_fr.properties +++ /dev/null @@ -1,33 +0,0 @@ -loanAccountSchedule=Loan Account Schedule -Office=Bureau : -LoanOfficer=Agent de crédit : -ClientName=Client Name : -FileID=File ID : -LoanAccountNumber=Compte de prêt# : -LoanAmount=Loan Amount : -DisbursalDate=Décaisser Date : -NoOfInstallments=Number Of Installments : -InterestRate=Interest Rate : -Installment=Installment -Currency=la devise : -PrincipleDue=Capital dû -InterestDue=Intérêts dus -FeesDue=Fees Due -PenaltyDue=Penalty Due -TotalDue=Total dû -DateExpected=Date Expected -Status=Status -Total=Total : -ActivityDetails=Activity Details -Date=Date -Comment=Commentaire -Principle=Capital -Interest=Intérêt -Fees=Frais -Penalty=Pénalité -TotalPaid=Total Payé -TotalOutstanding=Total Impayé -PrintedBy\:=Printed by: -On\:=On: -MFIName\:=MFI Name: -Page=Page \ No newline at end of file diff --git a/mifosng-provider/src/main/pentahoReports/savingsTransactions.properties b/mifosng-provider/src/main/pentahoReports/savingsTransactions.properties deleted file mode 100755 index a97869e2a..000000000 --- a/mifosng-provider/src/main/pentahoReports/savingsTransactions.properties +++ /dev/null @@ -1,16 +0,0 @@ -savingsTransactions=Savings Transactions -transactionDate=Transaction Date -details=Details -deposit=Deposit -withdrawal=Withdrawal -balance=Balance -From=From : -To=To: -PrintedBy\:=Printed by: -On\:=On: -MFIName\:=MFI Name: -Page=Page -VersionAt=Version 1.3.1 -accountNo=Account No: -clientName=Client Name -product=Product diff --git a/mifosng-provider/src/main/pentahoReports/staff assigment history.properties b/mifosng-provider/src/main/pentahoReports/staff assigment history.properties deleted file mode 100644 index b099692e9..000000000 --- a/mifosng-provider/src/main/pentahoReports/staff assigment history.properties +++ /dev/null @@ -1,17 +0,0 @@ -label.detail.center_name=Centers -label.detail.staff_id=Staff Id -label.detail.staff_name=Staff Name -label.detail.from_date=From -label.detail.assigned_on=Assigned On -label.detail.assigned_by=Assigned By -label.detail.unassigned_on=Unassigned On -label.detail.unassigned_by=Unassigned By -label.detail.to=To -label.detail. -label.detail. -label.detail. -label.detail. -label.detail. -label.detail. -label.detail. -head=Staff Assignmet History diff --git a/mifosng-provider/src/main/pentahoReports/trialBalance.properties b/mifosng-provider/src/main/pentahoReports/trialBalance.properties deleted file mode 100644 index 1ab1bc42d..000000000 --- a/mifosng-provider/src/main/pentahoReports/trialBalance.properties +++ /dev/null @@ -1,14 +0,0 @@ -trialBalance=Trial Balance -openingBalance=Opening Balance -transactions=Transactions -debit=Debit -credit=Credit -branchName=Branch : -glcode=GL CODE -name=Name -total=Total : -PrintedBy\:=Printed by: -On\:=On: -Page=Page -period=Period: -to=To \ No newline at end of file