You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2016/03/09 11:06:30 UTC
[01/10] incubator-fineract git commit: Pentaho reports changes to
work with Drizzle driver
Repository: incubator-fineract
Updated Branches:
refs/heads/develop 6ecbd2812 -> 5a7fbd320
Pentaho reports changes to work with Drizzle driver
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/85a80b5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/85a80b5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/85a80b5e
Branch: refs/heads/develop
Commit: 85a80b5e2e467f0d3cb663604efebd21f034c64d
Parents: df8ef2e
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Wed Feb 10 13:17:11 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Wed Feb 10 13:23:09 2016 +0530
----------------------------------------------------------------------
.../PentahoReportingProcessServiceImpl.java | 21 +++++--------------
.../Active Loan Summary per Branch.prpt | Bin 8686 -> 9151 bytes
.../Active Loans - Details(Pentaho).prpt | Bin 9655 -> 10150 bytes
.../Active Loans - Summary(Pentaho).prpt | Bin 23008 -> 23695 bytes
... Passed Final Maturity Summary(Pentaho).prpt | Bin 9307 -> 9855 bytes
...ve Loans Passed Final Maturity(Pentaho).prpt | Bin 9048 -> 9582 bytes
...tive Loans by Disbursal Period(Pentaho).prpt | Bin 23194 -> 23887 bytes
...ns in last installment Summary(Pentaho).prpt | Bin 9579 -> 10128 bytes
...tive Loans in last installment(Pentaho).prpt | Bin 22860 -> 23552 bytes
.../pentahoReports/Aging Detail(Pentaho).prpt | Bin 8555 -> 9083 bytes
...ng Summary (Arrears in Months)(Pentaho).prpt | Bin 8630 -> 9192 bytes
...ing Summary (Arrears in Weeks)(Pentaho).prpt | Bin 8785 -> 9353 bytes
.../pentahoReports/Balance Outstanding.prpt | Bin 9436 -> 9891 bytes
.../src/main/pentahoReports/Balance Sheet.prpt | Bin 22446 -> 23549 bytes
.../Branch Expected Cash Flow.prpt | Bin 35048 -> 35549 bytes
.../pentahoReports/Client Listing(Pentaho).prpt | Bin 7662 -> 8177 bytes
.../Client Loan Account Schedule.prpt | Bin 13698 -> 14409 bytes
.../Client Loans Listing(Pentaho).prpt | Bin 10456 -> 10948 bytes
.../Client Saving Transactions.prpt | Bin 8451 -> 8950 bytes
.../pentahoReports/Client Savings Summary.prpt | Bin 15945 -> 16637 bytes
.../main/pentahoReports/Collection Report.prpt | Bin 9769 -> 10282 bytes
.../main/pentahoReports/Disbursal Report.prpt | Bin 9334 -> 9770 bytes
...ected Payments By Date - Basic(Pentaho).prpt | Bin 8515 -> 9011 bytes
.../Expected Payments By Date - Formatted.prpt | Bin 35580 -> 36111 bytes
...etween Dates Summary by Office(Pentaho).prpt | Bin 7745 -> 8313 bytes
...isbursed Between Dates Summary(Pentaho).prpt | Bin 7509 -> 8076 bytes
.../pentahoReports/GeneralLedgerReport.prpt | Bin 8548 -> 9036 bytes
.../main/pentahoReports/Income Statement.prpt | Bin 17202 -> 18156 bytes
.../pentahoReports/Loan Account statement.prpt | Bin 7694 -> 8273 bytes
.../Loan Transaction Receipt.prpt | Bin 6795 -> 7314 bytes
...ing Disbursal Summary by Month(Pentaho).prpt | Bin 8131 -> 8691 bytes
...ans Awaiting Disbursal Summary(Pentaho).prpt | Bin 7965 -> 8523 bytes
.../Loans Awaiting Disbursal(Pentaho).prpt | Bin 9048 -> 9591 bytes
.../Loans Pending Approval(Pentaho).prpt | Bin 8800 -> 9348 bytes
.../Obligation Met Loans Details(Pentaho).prpt | Bin 9061 -> 9592 bytes
.../Obligation Met Loans Summary(Pentaho).prpt | Bin 8752 -> 9315 bytes
.../Portfolio at Risk by Branch(Pentaho).prpt | Bin 8671 -> 9220 bytes
.../Portfolio at Risk(Pentaho).prpt | Bin 8469 -> 9025 bytes
.../Rescheduled Loans(Pentaho).prpt | Bin 8415 -> 8960 bytes
.../Saving Account Statement.prpt | Bin 7565 -> 8133 bytes
.../Savings Transaction Receipt.prpt | Bin 6854 -> 7329 bytes
.../pentahoReports/Savings Transactions.prpt | Bin 14997 -> 15703 bytes
.../Staff Assignment History.prpt | Bin 6565 -> 7135 bytes
.../src/main/pentahoReports/Trial Balance.prpt | Bin 7978 -> 8498 bytes
.../TxnRunningBalances(Pentaho).prpt | Bin 8743 -> 9238 bytes
.../Written-Off Loans(Pentaho).prpt | Bin 8739 -> 9275 bytes
46 files changed, 5 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java b/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
index 154fc74..3a8f80a 100644
--- a/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
+++ b/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
@@ -8,14 +8,12 @@ package org.mifosplatform.infrastructure.report.service;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
-import java.sql.Connection;
import java.sql.Date;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import javax.sql.DataSource;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
@@ -24,7 +22,6 @@ import org.apache.fineract.infrastructure.core.api.ApiParameterHelper;
import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant;
import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenantConnection;
import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
-import org.apache.fineract.infrastructure.core.service.RoutingDataSource;
import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil;
import org.apache.fineract.infrastructure.report.annotation.ReportService;
import org.apache.fineract.infrastructure.report.service.ReportingProcessService;
@@ -56,18 +53,16 @@ public class PentahoReportingProcessServiceImpl implements ReportingProcessServi
private final static Logger logger = LoggerFactory.getLogger(PentahoReportingProcessServiceImpl.class);
public static final String MIFOS_BASE_DIR = System.getProperty("user.home") + File.separator + ".mifosx";
- private final DataSource dataSource;
private final PlatformSecurityContext context;
private boolean noPentaho = false;
@Autowired
- public PentahoReportingProcessServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) {
+ public PentahoReportingProcessServiceImpl(final PlatformSecurityContext context) {
// kick off pentaho reports server
ClassicEngineBoot.getInstance().start();
this.noPentaho = false;
this.context = context;
- this.dataSource = dataSource;
}
@Override
@@ -190,13 +185,10 @@ public class PentahoReportingProcessServiceImpl implements ReportingProcessServi
// 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 FineractPlatformTenant tenant = ThreadLocalContextUtil.getTenant();
+ final FineractPlatformTenantConnection tenantConnection = tenant.getConnection();
+
+ final String tenantUrl = tenantConnection.databaseURL();
final String userhierarchy = currentUser.getOffice().getHierarchy();
logger.info("db URL:" + tenantUrl + " userhierarchy:" + userhierarchy);
rptParamValues.put("userhierarchy", userhierarchy);
@@ -205,9 +197,6 @@ public class PentahoReportingProcessServiceImpl implements ReportingProcessServi
logger.info("db URL:" + tenantUrl + " userid:" + userid);
rptParamValues.put("userid", userid);
- final FineractPlatformTenant tenant = ThreadLocalContextUtil.getTenant();
- final FineractPlatformTenantConnection tenantConnection = tenant.getConnection();
-
rptParamValues.put("tenantUrl", tenantUrl);
rptParamValues.put("username", tenantConnection.getSchemaUsername());
rptParamValues.put("password", tenantConnection.getSchemaPassword());
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt b/fineract-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt
index 76af0d3..bc0c368 100644
Binary files a/fineract-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt and b/fineract-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt
index 3429338..91ae1be 100644
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt
index 34bc154..a3b5829 100644
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt
index 0426d38..6b20dbd 100644
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt
index 70da51a..b874416 100644
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt
index 709040f..e6cf011 100644
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt
index d08aeda..102b2c6 100644
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt
index 256450b..a28291f 100644
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt
index c5c1b89..37b9642 100644
Binary files a/fineract-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt
index 581b0a4..a3426f7 100644
Binary files a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt
index 7f2604b..3636609 100644
Binary files a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Balance Outstanding.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Balance Outstanding.prpt b/fineract-provider/src/main/pentahoReports/Balance Outstanding.prpt
index 9fdaf17..7b9f139 100644
Binary files a/fineract-provider/src/main/pentahoReports/Balance Outstanding.prpt and b/fineract-provider/src/main/pentahoReports/Balance Outstanding.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Balance Sheet.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Balance Sheet.prpt b/fineract-provider/src/main/pentahoReports/Balance Sheet.prpt
index eb5ed86..aa0c87d 100644
Binary files a/fineract-provider/src/main/pentahoReports/Balance Sheet.prpt and b/fineract-provider/src/main/pentahoReports/Balance Sheet.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt b/fineract-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt
index 113980a..5fceacc 100644
Binary files a/fineract-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt and b/fineract-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt
index c091452..8cb9cda 100644
Binary files a/fineract-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt b/fineract-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt
index c57cb3d..46c68f3 100644
Binary files a/fineract-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt and b/fineract-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt
index 8f1d7bb..950a5c0 100644
Binary files a/fineract-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Client Saving Transactions.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Saving Transactions.prpt b/fineract-provider/src/main/pentahoReports/Client Saving Transactions.prpt
index e88cd96..f81dfba 100644
Binary files a/fineract-provider/src/main/pentahoReports/Client Saving Transactions.prpt and b/fineract-provider/src/main/pentahoReports/Client Saving Transactions.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Client Savings Summary.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Savings Summary.prpt b/fineract-provider/src/main/pentahoReports/Client Savings Summary.prpt
index 79888b0..ce71719 100644
Binary files a/fineract-provider/src/main/pentahoReports/Client Savings Summary.prpt and b/fineract-provider/src/main/pentahoReports/Client Savings Summary.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Collection Report.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Collection Report.prpt b/fineract-provider/src/main/pentahoReports/Collection Report.prpt
index 5e18785..65c9d97 100644
Binary files a/fineract-provider/src/main/pentahoReports/Collection Report.prpt and b/fineract-provider/src/main/pentahoReports/Collection Report.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Disbursal Report.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Disbursal Report.prpt b/fineract-provider/src/main/pentahoReports/Disbursal Report.prpt
index d871826..a89a1f5 100644
Binary files a/fineract-provider/src/main/pentahoReports/Disbursal Report.prpt and b/fineract-provider/src/main/pentahoReports/Disbursal Report.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt
index 6366070..c6cd898 100644
Binary files a/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt b/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt
index db0e39f..96486c2 100644
Binary files a/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt and b/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt
index ab66914..f4873e0 100644
Binary files a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt
index 976d05e..f5455f9 100644
Binary files a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.prpt b/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.prpt
index 99287cc..46bdf93 100644
Binary files a/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.prpt and b/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Income Statement.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Income Statement.prpt b/fineract-provider/src/main/pentahoReports/Income Statement.prpt
index 22f2e9b..3882aa3 100644
Binary files a/fineract-provider/src/main/pentahoReports/Income Statement.prpt and b/fineract-provider/src/main/pentahoReports/Income Statement.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Loan Account statement.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loan Account statement.prpt b/fineract-provider/src/main/pentahoReports/Loan Account statement.prpt
index ed06b71..e2f4f17 100644
Binary files a/fineract-provider/src/main/pentahoReports/Loan Account statement.prpt and b/fineract-provider/src/main/pentahoReports/Loan Account statement.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt b/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt
index f4b6ad5..f042d46 100644
Binary files a/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt and b/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt
index dd7fbae..d280c26 100644
Binary files a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt
index 0baa288..b7dafb3 100644
Binary files a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt
index 353e8c2..360779e 100644
Binary files a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt
index b7a1329..5998718 100644
Binary files a/fineract-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt
index aec6f96..191b177 100644
Binary files a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt
index 3d22709..b320ac3 100644
Binary files a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt
index 639e0fd..52e7f8a 100644
Binary files a/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt
index 7e68f7e..cc3a0b4 100644
Binary files a/fineract-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt
index 424cdc8..7d335d9 100644
Binary files a/fineract-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Saving Account Statement.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Saving Account Statement.prpt b/fineract-provider/src/main/pentahoReports/Saving Account Statement.prpt
index 4b42b84..7526b60 100644
Binary files a/fineract-provider/src/main/pentahoReports/Saving Account Statement.prpt and b/fineract-provider/src/main/pentahoReports/Saving Account Statement.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt b/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt
index 7eaca7e..bf4cd47 100644
Binary files a/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt and b/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Savings Transactions.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Savings Transactions.prpt b/fineract-provider/src/main/pentahoReports/Savings Transactions.prpt
index fd3eef1..9c73fcd 100644
Binary files a/fineract-provider/src/main/pentahoReports/Savings Transactions.prpt and b/fineract-provider/src/main/pentahoReports/Savings Transactions.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Staff Assignment History.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Staff Assignment History.prpt b/fineract-provider/src/main/pentahoReports/Staff Assignment History.prpt
index d50d971..bdc6413 100644
Binary files a/fineract-provider/src/main/pentahoReports/Staff Assignment History.prpt and b/fineract-provider/src/main/pentahoReports/Staff Assignment History.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Trial Balance.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Trial Balance.prpt b/fineract-provider/src/main/pentahoReports/Trial Balance.prpt
index a04448c..2e79a83 100644
Binary files a/fineract-provider/src/main/pentahoReports/Trial Balance.prpt and b/fineract-provider/src/main/pentahoReports/Trial Balance.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt
index 2aea6c4..a34b26f 100644
Binary files a/fineract-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/85a80b5e/fineract-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt
index 4eee7b8..96e4f36 100644
Binary files a/fineract-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt and b/fineract-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt differ
[08/10] incubator-fineract git commit: Correction in interest
recalculation scheduler job to avoid infinite loop
Posted by na...@apache.org.
Correction in interest recalculation scheduler job to avoid infinite loop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/f4e94676
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/f4e94676
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/f4e94676
Branch: refs/heads/develop
Commit: f4e9467683d127b3246328ae7bae465dec0dc16b
Parents: fc96989
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Wed Mar 2 14:27:14 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Wed Mar 2 15:10:20 2016 +0530
----------------------------------------------------------------------
.../portfolio/loanaccount/service/LoanSchedularServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f4e94676/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java
index 8c5309c..50de5d2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java
@@ -171,6 +171,7 @@ public class LoanSchedularServiceImpl implements LoanSchedularService {
+ realCause.getMessage());
sb.append("Interest recalculation for loans failed for account:").append(loanId).append(" with message ")
.append(realCause.getMessage());
+ numberOfRetries = maxNumberOfRetries + 1;
}
i++;
}
[09/10] incubator-fineract git commit: Merge branch 'develop' into
openmf_develop
Posted by na...@apache.org.
Merge branch 'develop' into openmf_develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/6005dd0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/6005dd0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/6005dd0c
Branch: refs/heads/develop
Commit: 6005dd0c11c2e1fca511c45494600851bedd6a20
Parents: fc96989 6ecbd28
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Wed Mar 9 15:33:49 2016 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Wed Mar 9 15:33:49 2016 +0530
----------------------------------------------------------------------
.../AccountingScenarioIntegrationTest.java | 6 +-
.../integrationtests/FixedDepositTest.java | 331 +++++++++++++---
.../LoanReschedulingWithinCenterTest.java | 392 +++++++++++++++++++
.../integrationtests/RecurringDepositTest.java | 206 +++++++++-
.../SchedulerJobsTestResults.java | 3 +-
.../integrationtests/common/CalendarHelper.java | 41 ++
.../fixeddeposit/FixedDepositAccountHelper.java | 85 ++--
.../fixeddeposit/FixedDepositProductHelper.java | 264 +++++++++++--
.../RecurringDepositAccountHelper.java | 74 +---
.../RecurringDepositProductHelper.java | 262 +++++++++++--
.../api/GlobalConfigurationApiConstant.java | 6 +-
.../data/GlobalConfigurationDataValidator.java | 7 +
.../data/GlobalConfigurationPropertyData.java | 10 +-
.../domain/ConfigurationDomainService.java | 7 +
.../domain/ConfigurationDomainServiceJpa.java | 22 ++
.../domain/GlobalConfigurationProperty.java | 21 +-
.../ConfigurationReadPlatformServiceImpl.java | 8 +-
.../data/CalendarHistoryDataWrapper.java | 61 +++
.../portfolio/calendar/domain/Calendar.java | 21 +-
...arWritePlatformServiceJpaRepositoryImpl.java | 14 +-
.../InterestRateChartApiConstants.java | 10 +-
.../data/InterestRateChartData.java | 65 +--
.../data/InterestRateChartDataValidator.java | 21 +-
.../InterestRateChartSlabDataValidator.java | 69 +++-
.../domain/InterestRateChart.java | 83 +++-
.../domain/InterestRateChartFields.java | 34 +-
.../domain/InterestRateChartSlabComparator.java | 92 +++++
.../domain/InterestRateChartSlabFields.java | 148 ++++++-
.../service/InterestRateChartAssembler.java | 30 +-
...nterestRateChartReadPlatformServiceImpl.java | 27 +-
.../loanaccount/data/ScheduleGeneratorDTO.java | 18 +-
.../portfolio/loanaccount/domain/Loan.java | 26 +-
.../domain/LoanAccountDomainServiceJpa.java | 72 ++--
.../domain/DefaultScheduledDateGenerator.java | 25 +-
.../domain/LoanApplicationTerms.java | 43 +-
.../service/LoanScheduleAssembler.java | 4 +-
...onWritePlatformServiceJpaRepositoryImpl.java | 2 +-
.../loanaccount/service/LoanAssembler.java | 47 +--
.../service/LoanReadPlatformServiceImpl.java | 32 +-
.../service/LoanSchedularServiceImpl.java | 1 +
.../loanaccount/service/LoanUtilService.java | 86 +++-
...anWritePlatformServiceJpaRepositoryImpl.java | 42 +-
.../DepositAccountInterestRateChartData.java | 67 ++--
.../domain/DepositAccountDomainServiceJpa.java | 60 ++-
.../domain/DepositAccountInterestRateChart.java | 5 +
.../savings/domain/DepositProductAssembler.java | 28 +-
.../savings/domain/FixedDepositProduct.java | 2 +-
.../savings/domain/RecurringDepositAccount.java | 34 +-
...nterestRateChartReadPlatformServiceImpl.java | 40 +-
.../V291__organisation_start_date_config.sql | 2 +
.../V292__update_organisation_start_date.sql | 1 +
..._interest_rate_chart_support_for_amounts.sql | 13 +
...ttype_application_forDisbursement_charge.sql | 1 +
53 files changed, 2507 insertions(+), 564 deletions(-)
----------------------------------------------------------------------
[06/10] incubator-fineract git commit: Merge branch 'noticeupdate'
into openmf_develop
Posted by na...@apache.org.
Merge branch 'noticeupdate' into openmf_develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/7e8c166c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/7e8c166c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/7e8c166c
Branch: refs/heads/develop
Commit: 7e8c166c02b4b2c5e1cb7e0dc68d8b87b4fa7067
Parents: 4ed7692 1be4d02
Author: unknown <na...@confluxtechnologies.com>
Authored: Mon Feb 22 17:54:29 2016 +0530
Committer: unknown <na...@confluxtechnologies.com>
Committed: Mon Feb 22 17:54:29 2016 +0530
----------------------------------------------------------------------
Notice.txt | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 122 insertions(+)
----------------------------------------------------------------------
[03/10] incubator-fineract git commit: added Pentaho reports
Posted by na...@apache.org.
added Pentaho reports
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/df8ef2e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/df8ef2e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/df8ef2e8
Branch: refs/heads/develop
Commit: df8ef2e8b6c50846e58b3fc01cffe6d27a987cc1
Parents: bb4799f
Author: pramod <pr...@confluxtechnologies.com>
Authored: Mon Feb 8 18:17:46 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Wed Feb 10 13:23:09 2016 +0530
----------------------------------------------------------------------
fineract-provider/build.gradle | 21 ++
fineract-provider/dependencies.gradle | 16 ++
fineract-provider/dev-dependencies.gradle | 18 +-
.../PentahoReportingProcessServiceImpl.java | 237 +++++++++++++++++++
.../Active Loan Summary per Branch.prpt | Bin 0 -> 8686 bytes
.../Active Loans - Details(Pentaho).prpt | Bin 0 -> 9655 bytes
.../Active Loans - Details.properties | 26 ++
.../Active Loans - Summary(Pentaho).prpt | Bin 0 -> 23008 bytes
.../Active Loans - Summary.properties | 25 ++
... Passed Final Maturity Summary(Pentaho).prpt | Bin 0 -> 9307 bytes
...ans Passed Final Maturity Summary.properties | 25 ++
...ve Loans Passed Final Maturity(Pentaho).prpt | Bin 0 -> 9048 bytes
...ctive Loans Passed Final Maturity.properties | 27 +++
...tive Loans by Disbursal Period(Pentaho).prpt | Bin 0 -> 23194 bytes
.../Active Loans by Disbursal Period.properties | 20 ++
...ns in last installment Summary(Pentaho).prpt | Bin 0 -> 9579 bytes
...Loans in last installment Summary.properties | 24 ++
...tive Loans in last installment(Pentaho).prpt | Bin 0 -> 22860 bytes
.../Active Loans in last installment.properties | 26 ++
.../ActiveLoanSummaryperBranch.properties | 16 ++
.../pentahoReports/Aging Detail(Pentaho).prpt | Bin 0 -> 8555 bytes
.../main/pentahoReports/Aging Detail.properties | 20 ++
...ng Summary (Arrears in Months)(Pentaho).prpt | Bin 0 -> 8630 bytes
...Aging Summary (Arrears in Months).properties | 12 +
...ing Summary (Arrears in Weeks)(Pentaho).prpt | Bin 0 -> 8785 bytes
.../Aging Summary (Arrears in Weeks).properties | 13 +
.../pentahoReports/Balance Outstanding.prpt | Bin 0 -> 9436 bytes
.../src/main/pentahoReports/Balance Sheet.prpt | Bin 0 -> 22446 bytes
.../Branch Expected Cash Flow.prpt | Bin 0 -> 35048 bytes
.../pentahoReports/Client Listing(Pentaho).prpt | Bin 0 -> 7662 bytes
.../pentahoReports/Client Listing.properties | 10 +
.../Client Loan Account Schedule.prpt | Bin 0 -> 13698 bytes
.../Client Loans Listing(Pentaho).prpt | Bin 0 -> 10456 bytes
.../Client Saving Transactions.properties | 19 ++
.../Client Saving Transactions.prpt | Bin 0 -> 8451 bytes
.../Client Saving Transactions_fr.properties | 18 ++
.../pentahoReports/Client Savings Summary.prpt | Bin 0 -> 15945 bytes
.../main/pentahoReports/Collection Report.prpt | Bin 0 -> 9769 bytes
.../pentahoReports/CollectionReport.properties | 20 ++
.../main/pentahoReports/Disbursal Report.prpt | Bin 0 -> 9334 bytes
.../pentahoReports/DisbursalReport.properties | 23 ++
...ected Payments By Date - Basic(Pentaho).prpt | Bin 0 -> 8515 bytes
...Expected Payments By Date - Basic.properties | 20 ++
.../Expected Payments By Date - Formatted.prpt | Bin 0 -> 35580 bytes
...etween Dates Summary by Office(Pentaho).prpt | Bin 0 -> 7745 bytes
...d Between Dates Summary by Office.PROPERTIES | 8 +
...isbursed Between Dates Summary(Pentaho).prpt | Bin 0 -> 7509 bytes
...s Disbursed Between Dates Summary.PROPERTIES | 4 +
.../GeneralLedgerReport.properties | 18 ++
.../pentahoReports/GeneralLedgerReport.prpt | Bin 0 -> 8548 bytes
.../main/pentahoReports/Income Statement.prpt | Bin 0 -> 17202 bytes
.../Loan Account Statement.properties | 20 ++
.../pentahoReports/Loan Account statement.prpt | Bin 0 -> 7694 bytes
.../Loan Transaction Receipt.properties | 42 ++++
.../Loan Transaction Receipt.prpt | Bin 0 -> 6795 bytes
...ing Disbursal Summary by Month(Pentaho).prpt | Bin 0 -> 8131 bytes
...aiting Disbursal Summary by Month.properties | 12 +
...ans Awaiting Disbursal Summary(Pentaho).prpt | Bin 0 -> 7965 bytes
.../Loans Awaiting Disbursal Summary.properties | 13 +
.../Loans Awaiting Disbursal(Pentaho).prpt | Bin 0 -> 9048 bytes
.../Loans Awaiting Disbursal.properties | 24 ++
.../Loans Pending Approval(Pentaho).prpt | Bin 0 -> 8800 bytes
.../Loans Pending Approval.properties | 18 ++
.../Obligation Met Loans Details(Pentaho).prpt | Bin 0 -> 9061 bytes
.../Obligation Met Loans Details.properties | 22 ++
.../Obligation Met Loans Summary(Pentaho).prpt | Bin 0 -> 8752 bytes
.../Obligation Met Loans Summary.properties | 17 ++
.../Portfolio at Risk by Branch(Pentaho).prpt | Bin 0 -> 8671 bytes
.../Portfolio at Risk by Branch.properties | 15 ++
.../Portfolio at Risk(Pentaho).prpt | Bin 0 -> 8469 bytes
.../pentahoReports/Portfolio at Risk.properties | 16 ++
.../Rescheduled Loans(Pentaho).prpt | Bin 0 -> 8415 bytes
.../pentahoReports/Rescheduled Loans.properties | 17 ++
.../Saving Account Statement.properties | 9 +
.../Saving Account Statement.prpt | Bin 0 -> 7565 bytes
.../Saving Transaction.properties | 14 ++
.../Savings Transaction Receipt.properties | 27 +++
.../Savings Transaction Receipt.prpt | Bin 0 -> 6854 bytes
.../pentahoReports/Savings Transactions.prpt | Bin 0 -> 14997 bytes
.../Staff Assignment History.prpt | Bin 0 -> 6565 bytes
.../src/main/pentahoReports/Trial Balance.prpt | Bin 0 -> 7978 bytes
.../TxnRunningBalances(Pentaho).prpt | Bin 0 -> 8743 bytes
.../TxnRunningBalances.properties | 19 ++
.../Written-Off Loans(Pentaho).prpt | Bin 0 -> 8739 bytes
.../pentahoReports/Written-Off Loans.properties | 17 ++
.../balanceOutstanding.properties | 15 ++
.../main/pentahoReports/balanceSheet.properties | 13 +
.../branchExpectedCashFlow.properties | 21 ++
.../clientLoansListing.properties | 43 ++++
.../clientSavingsSummary.properties | 19 ++
.../expectedPaymentsByDate.properties | 23 ++
.../pentahoReports/incomeStatement.properties | 15 ++
.../loanScheduleDetailed.properties | 33 +++
.../loanScheduleDetailed_fr.properties | 33 +++
.../savingsTransactions.properties | 16 ++
.../staff assigment history.properties | 17 ++
.../main/pentahoReports/trialBalance.properties | 14 ++
.../resources/META-INF/spring/appContext.xml | 3 +-
.../src/main/resources/application.properties | 19 --
99 files changed, 1231 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/build.gradle
----------------------------------------------------------------------
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index d104a1f..d508b28 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -45,6 +45,9 @@ group = 'org.apache.fineract'
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)
}
@@ -94,6 +97,11 @@ task dist(type:Zip){
include '**/*'
into('apps')
}
+ from('src/main/pentahoReports/') {
+ fileMode = 0755
+ include '*'
+ into('pentahoReports')
+ }
from('../api-docs/') {
fileMode = 0755
include '*'
@@ -114,7 +122,20 @@ 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)
}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/dependencies.gradle
----------------------------------------------------------------------
diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle
index d8dabd5..610eec0 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -51,6 +51,22 @@ dependencies {
[group: 'org.drizzle.jdbc', name: 'drizzle-jdbc', version: '1.3'],
// [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'],
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/dev-dependencies.gradle
----------------------------------------------------------------------
diff --git a/fineract-provider/dev-dependencies.gradle b/fineract-provider/dev-dependencies.gradle
index 89ffcf1..74e5b37 100644
--- a/fineract-provider/dev-dependencies.gradle
+++ b/fineract-provider/dev-dependencies.gradle
@@ -50,7 +50,23 @@ dependencies {
[group: 'org.drizzle.jdbc', name: 'drizzle-jdbc', version: '1.3'],
[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'],
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java b/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
new file mode 100644
index 0000000..154fc74
--- /dev/null
+++ b/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
@@ -0,0 +1,237 @@
+/**
+ * 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 java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.Date;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javax.sql.DataSource;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.fineract.infrastructure.core.api.ApiParameterHelper;
+import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant;
+import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenantConnection;
+import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
+import org.apache.fineract.infrastructure.core.service.RoutingDataSource;
+import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil;
+import org.apache.fineract.infrastructure.report.annotation.ReportService;
+import org.apache.fineract.infrastructure.report.service.ReportingProcessService;
+import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
+import org.apache.fineract.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;
+import org.springframework.stereotype.Service;
+
+@Service
+@ReportService(type = "Pentaho")
+public class PentahoReportingProcessServiceImpl implements ReportingProcessService {
+
+ private final static Logger logger = LoggerFactory.getLogger(PentahoReportingProcessServiceImpl.class);
+ public static final String MIFOS_BASE_DIR = System.getProperty("user.home") + File.separator + ".mifosx";
+
+ private final DataSource dataSource;
+ private final PlatformSecurityContext context;
+ private boolean noPentaho = false;
+
+ @Autowired
+ public PentahoReportingProcessServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource) {
+ // kick off pentaho reports server
+ ClassicEngineBoot.getInstance().start();
+ this.noPentaho = false;
+
+ this.context = context;
+ this.dataSource = dataSource;
+ }
+
+ @Override
+ public Response processRequest(final String reportName, final MultivaluedMap<String, String> queryParams) {
+
+ final String outputTypeParam = queryParams.getFirst("output-type");
+ final Map<String, String> reportParams = getReportParams(queryParams);
+ final Locale locale = ApiParameterHelper.extractLocale(queryParams);
+
+ 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 = MIFOS_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, reportParams);
+
+ 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<String, String> 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 FineractPlatformTenant tenant = ThreadLocalContextUtil.getTenant();
+ final FineractPlatformTenantConnection 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());
+ }
+ }
+
+ private Map<String, String> getReportParams(final MultivaluedMap<String, String> queryParams) {
+
+ final Map<String, String> reportParams = new HashMap<>();
+ final Set<String> keys = queryParams.keySet();
+ String pKey;
+ String pValue;
+ for (final String k : keys) {
+
+ if (k.startsWith("R_")) {
+ pKey = k.substring(2);
+ pValue = queryParams.get(k).get(0);
+ reportParams.put(pKey, pValue);
+ }
+ }
+ return reportParams;
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt b/fineract-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt
new file mode 100644
index 0000000..76af0d3
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt
new file mode 100644
index 0000000..3429338
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans - Details.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans - Details.properties b/fineract-provider/src/main/pentahoReports/Active Loans - Details.properties
new file mode 100644
index 0000000..5986b16
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Active Loans - Details.properties
@@ -0,0 +1,26 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt
new file mode 100644
index 0000000..34bc154
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans - Summary.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans - Summary.properties b/fineract-provider/src/main/pentahoReports/Active Loans - Summary.properties
new file mode 100644
index 0000000..2b92dbc
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Active Loans - Summary.properties
@@ -0,0 +1,25 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt
new file mode 100644
index 0000000..0426d38
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary.properties b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary.properties
new file mode 100644
index 0000000..6a4e9b4
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary.properties
@@ -0,0 +1,25 @@
+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
+
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt
new file mode 100644
index 0000000..70da51a
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity.properties b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity.properties
new file mode 100644
index 0000000..88cefb1
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity.properties
@@ -0,0 +1,27 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt
new file mode 100644
index 0000000..709040f
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period.properties b/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period.properties
new file mode 100644
index 0000000..f5e48bf
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period.properties
@@ -0,0 +1,20 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt
new file mode 100644
index 0000000..d08aeda
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary.properties b/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary.properties
new file mode 100644
index 0000000..ca21497
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary.properties
@@ -0,0 +1,24 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt
new file mode 100644
index 0000000..256450b
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Active Loans in last installment.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Active Loans in last installment.properties b/fineract-provider/src/main/pentahoReports/Active Loans in last installment.properties
new file mode 100644
index 0000000..00cf44d
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Active Loans in last installment.properties
@@ -0,0 +1,26 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/ActiveLoanSummaryperBranch.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/ActiveLoanSummaryperBranch.properties b/fineract-provider/src/main/pentahoReports/ActiveLoanSummaryperBranch.properties
new file mode 100644
index 0000000..5a8ff11
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/ActiveLoanSummaryperBranch.properties
@@ -0,0 +1,16 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt
new file mode 100644
index 0000000..c5c1b89
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Aging Detail.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Aging Detail.properties b/fineract-provider/src/main/pentahoReports/Aging Detail.properties
new file mode 100644
index 0000000..de8165c
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Aging Detail.properties
@@ -0,0 +1,20 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt
new file mode 100644
index 0000000..581b0a4
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months).properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months).properties b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months).properties
new file mode 100644
index 0000000..c322bf4
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months).properties
@@ -0,0 +1,12 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt
new file mode 100644
index 0000000..7f2604b
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks).properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks).properties b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks).properties
new file mode 100644
index 0000000..5869937
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks).properties
@@ -0,0 +1,13 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Balance Outstanding.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Balance Outstanding.prpt b/fineract-provider/src/main/pentahoReports/Balance Outstanding.prpt
new file mode 100644
index 0000000..9fdaf17
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Balance Outstanding.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Balance Sheet.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Balance Sheet.prpt b/fineract-provider/src/main/pentahoReports/Balance Sheet.prpt
new file mode 100644
index 0000000..eb5ed86
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Balance Sheet.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt b/fineract-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt
new file mode 100644
index 0000000..113980a
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt
new file mode 100644
index 0000000..c091452
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Client Listing.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Listing.properties b/fineract-provider/src/main/pentahoReports/Client Listing.properties
new file mode 100644
index 0000000..623a419
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Client Listing.properties
@@ -0,0 +1,10 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt b/fineract-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt
new file mode 100644
index 0000000..c57cb3d
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt
new file mode 100644
index 0000000..8f1d7bb
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Client Saving Transactions.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Saving Transactions.properties b/fineract-provider/src/main/pentahoReports/Client Saving Transactions.properties
new file mode 100644
index 0000000..b981f9e
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Client Saving Transactions.properties
@@ -0,0 +1,19 @@
+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:
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Client Saving Transactions.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Saving Transactions.prpt b/fineract-provider/src/main/pentahoReports/Client Saving Transactions.prpt
new file mode 100644
index 0000000..e88cd96
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Client Saving Transactions.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties b/fineract-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties
new file mode 100644
index 0000000..e87c594
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties
@@ -0,0 +1,18 @@
+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:
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Client Savings Summary.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Client Savings Summary.prpt b/fineract-provider/src/main/pentahoReports/Client Savings Summary.prpt
new file mode 100644
index 0000000..79888b0
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Client Savings Summary.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Collection Report.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Collection Report.prpt b/fineract-provider/src/main/pentahoReports/Collection Report.prpt
new file mode 100644
index 0000000..5e18785
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Collection Report.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/CollectionReport.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/CollectionReport.properties b/fineract-provider/src/main/pentahoReports/CollectionReport.properties
new file mode 100644
index 0000000..6f23eed
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/CollectionReport.properties
@@ -0,0 +1,20 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Disbursal Report.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Disbursal Report.prpt b/fineract-provider/src/main/pentahoReports/Disbursal Report.prpt
new file mode 100644
index 0000000..d871826
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Disbursal Report.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/DisbursalReport.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/DisbursalReport.properties b/fineract-provider/src/main/pentahoReports/DisbursalReport.properties
new file mode 100644
index 0000000..df864a8
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/DisbursalReport.properties
@@ -0,0 +1,23 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt
new file mode 100644
index 0000000..6366070
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic.properties b/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic.properties
new file mode 100644
index 0000000..b5a620e
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic.properties
@@ -0,0 +1,20 @@
+
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt b/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt
new file mode 100644
index 0000000..db0e39f
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt
new file mode 100644
index 0000000..ab66914
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office.PROPERTIES
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office.PROPERTIES b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office.PROPERTIES
new file mode 100644
index 0000000..d09905b
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office.PROPERTIES
@@ -0,0 +1,8 @@
+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
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt
new file mode 100644
index 0000000..976d05e
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary.PROPERTIES
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary.PROPERTIES b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary.PROPERTIES
new file mode 100644
index 0000000..32d6fce
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary.PROPERTIES
@@ -0,0 +1,4 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.properties b/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.properties
new file mode 100644
index 0000000..908b48f
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.properties
@@ -0,0 +1,18 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.prpt b/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.prpt
new file mode 100644
index 0000000..99287cc
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Income Statement.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Income Statement.prpt b/fineract-provider/src/main/pentahoReports/Income Statement.prpt
new file mode 100644
index 0000000..22f2e9b
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Income Statement.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loan Account Statement.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loan Account Statement.properties b/fineract-provider/src/main/pentahoReports/Loan Account Statement.properties
new file mode 100644
index 0000000..e7113c8
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Loan Account Statement.properties
@@ -0,0 +1,20 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loan Account statement.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loan Account statement.prpt b/fineract-provider/src/main/pentahoReports/Loan Account statement.prpt
new file mode 100644
index 0000000..ed06b71
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Loan Account statement.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.properties b/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.properties
new file mode 100644
index 0000000..f55ed9a
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.properties
@@ -0,0 +1,42 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt b/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt
new file mode 100644
index 0000000..f4b6ad5
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt
new file mode 100644
index 0000000..dd7fbae
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month.properties b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month.properties
new file mode 100644
index 0000000..5751fcf
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month.properties
@@ -0,0 +1,12 @@
+
+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
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt
new file mode 100644
index 0000000..0baa288
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary.properties b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary.properties
new file mode 100644
index 0000000..ddabb80
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary.properties
@@ -0,0 +1,13 @@
+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
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt
new file mode 100644
index 0000000..353e8c2
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal.properties b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal.properties
new file mode 100644
index 0000000..915d7d6
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal.properties
@@ -0,0 +1,24 @@
+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
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt
new file mode 100644
index 0000000..b7a1329
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Loans Pending Approval.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Loans Pending Approval.properties b/fineract-provider/src/main/pentahoReports/Loans Pending Approval.properties
new file mode 100644
index 0000000..bd9e6b4
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Loans Pending Approval.properties
@@ -0,0 +1,18 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt
new file mode 100644
index 0000000..aec6f96
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details.properties b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details.properties
new file mode 100644
index 0000000..b3614e7
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details.properties
@@ -0,0 +1,22 @@
+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
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt
new file mode 100644
index 0000000..3d22709
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary.properties b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary.properties
new file mode 100644
index 0000000..0243333
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary.properties
@@ -0,0 +1,17 @@
+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
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt
new file mode 100644
index 0000000..639e0fd
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch.properties b/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch.properties
new file mode 100644
index 0000000..f845130
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch.properties
@@ -0,0 +1,15 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt
new file mode 100644
index 0000000..7e68f7e
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Portfolio at Risk.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Portfolio at Risk.properties b/fineract-provider/src/main/pentahoReports/Portfolio at Risk.properties
new file mode 100644
index 0000000..653f768
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Portfolio at Risk.properties
@@ -0,0 +1,16 @@
+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
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt
new file mode 100644
index 0000000..424cdc8
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Rescheduled Loans.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Rescheduled Loans.properties b/fineract-provider/src/main/pentahoReports/Rescheduled Loans.properties
new file mode 100644
index 0000000..28c3058
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Rescheduled Loans.properties
@@ -0,0 +1,17 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Saving Account Statement.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Saving Account Statement.properties b/fineract-provider/src/main/pentahoReports/Saving Account Statement.properties
new file mode 100644
index 0000000..24c4500
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Saving Account Statement.properties
@@ -0,0 +1,9 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Saving Account Statement.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Saving Account Statement.prpt b/fineract-provider/src/main/pentahoReports/Saving Account Statement.prpt
new file mode 100644
index 0000000..4b42b84
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Saving Account Statement.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Saving Transaction.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Saving Transaction.properties b/fineract-provider/src/main/pentahoReports/Saving Transaction.properties
new file mode 100644
index 0000000..c4b5451
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Saving Transaction.properties
@@ -0,0 +1,14 @@
+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.
+
[02/10] incubator-fineract git commit: added Pentaho reports
Posted by na...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.properties b/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.properties
new file mode 100644
index 0000000..8d0ba7d
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.properties
@@ -0,0 +1,27 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt b/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt
new file mode 100644
index 0000000..7eaca7e
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Savings Transactions.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Savings Transactions.prpt b/fineract-provider/src/main/pentahoReports/Savings Transactions.prpt
new file mode 100644
index 0000000..fd3eef1
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Savings Transactions.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Staff Assignment History.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Staff Assignment History.prpt b/fineract-provider/src/main/pentahoReports/Staff Assignment History.prpt
new file mode 100644
index 0000000..d50d971
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Staff Assignment History.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Trial Balance.prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Trial Balance.prpt b/fineract-provider/src/main/pentahoReports/Trial Balance.prpt
new file mode 100644
index 0000000..a04448c
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Trial Balance.prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt
new file mode 100644
index 0000000..2aea6c4
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/TxnRunningBalances.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/TxnRunningBalances.properties b/fineract-provider/src/main/pentahoReports/TxnRunningBalances.properties
new file mode 100644
index 0000000..45d459d
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/TxnRunningBalances.properties
@@ -0,0 +1,19 @@
+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
+
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt b/fineract-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt
new file mode 100644
index 0000000..4eee7b8
Binary files /dev/null and b/fineract-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/Written-Off Loans.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/Written-Off Loans.properties b/fineract-provider/src/main/pentahoReports/Written-Off Loans.properties
new file mode 100644
index 0000000..84a7849
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/Written-Off Loans.properties
@@ -0,0 +1,17 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/balanceOutstanding.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/balanceOutstanding.properties b/fineract-provider/src/main/pentahoReports/balanceOutstanding.properties
new file mode 100644
index 0000000..a500ab7
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/balanceOutstanding.properties
@@ -0,0 +1,15 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/balanceSheet.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/balanceSheet.properties b/fineract-provider/src/main/pentahoReports/balanceSheet.properties
new file mode 100644
index 0000000..5fd8cf1
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/balanceSheet.properties
@@ -0,0 +1,13 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/branchExpectedCashFlow.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/branchExpectedCashFlow.properties b/fineract-provider/src/main/pentahoReports/branchExpectedCashFlow.properties
new file mode 100644
index 0000000..0cd5fe3
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/branchExpectedCashFlow.properties
@@ -0,0 +1,21 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/clientLoansListing.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/clientLoansListing.properties b/fineract-provider/src/main/pentahoReports/clientLoansListing.properties
new file mode 100644
index 0000000..fd76bfc
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/clientLoansListing.properties
@@ -0,0 +1,43 @@
+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
+
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/clientSavingsSummary.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/clientSavingsSummary.properties b/fineract-provider/src/main/pentahoReports/clientSavingsSummary.properties
new file mode 100644
index 0000000..b4f9245
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/clientSavingsSummary.properties
@@ -0,0 +1,19 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/expectedPaymentsByDate.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/expectedPaymentsByDate.properties b/fineract-provider/src/main/pentahoReports/expectedPaymentsByDate.properties
new file mode 100644
index 0000000..b28c368
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/expectedPaymentsByDate.properties
@@ -0,0 +1,23 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/incomeStatement.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/incomeStatement.properties b/fineract-provider/src/main/pentahoReports/incomeStatement.properties
new file mode 100644
index 0000000..1fcfad6
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/incomeStatement.properties
@@ -0,0 +1,15 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/loanScheduleDetailed.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/loanScheduleDetailed.properties b/fineract-provider/src/main/pentahoReports/loanScheduleDetailed.properties
new file mode 100644
index 0000000..18f65aa
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/loanScheduleDetailed.properties
@@ -0,0 +1,33 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/loanScheduleDetailed_fr.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/loanScheduleDetailed_fr.properties b/fineract-provider/src/main/pentahoReports/loanScheduleDetailed_fr.properties
new file mode 100644
index 0000000..fd48fb7
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/loanScheduleDetailed_fr.properties
@@ -0,0 +1,33 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/savingsTransactions.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/savingsTransactions.properties b/fineract-provider/src/main/pentahoReports/savingsTransactions.properties
new file mode 100644
index 0000000..a97869e
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/savingsTransactions.properties
@@ -0,0 +1,16 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/staff assigment history.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/staff assigment history.properties b/fineract-provider/src/main/pentahoReports/staff assigment history.properties
new file mode 100644
index 0000000..b099692
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/staff assigment history.properties
@@ -0,0 +1,17 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/pentahoReports/trialBalance.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/pentahoReports/trialBalance.properties b/fineract-provider/src/main/pentahoReports/trialBalance.properties
new file mode 100644
index 0000000..1ab1bc4
--- /dev/null
+++ b/fineract-provider/src/main/pentahoReports/trialBalance.properties
@@ -0,0 +1,14 @@
+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
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/resources/META-INF/spring/appContext.xml
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/META-INF/spring/appContext.xml b/fineract-provider/src/main/resources/META-INF/spring/appContext.xml
index 9984926..f48043c 100644
--- a/fineract-provider/src/main/resources/META-INF/spring/appContext.xml
+++ b/fineract-provider/src/main/resources/META-INF/spring/appContext.xml
@@ -54,7 +54,8 @@
org.apache.fineract.template.*,
org.apache.fineract.template.service.*,
org.apache.fineract.useradministration.*,
- org.apache.fineract.batch">
+ org.apache.fineract.batch,
+ org.mifosplatform.infrastructure.report.service">
<context:exclude-filter expression="org.springframework.stereotype.Controller"
type="annotation" />
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/df8ef2e8/fineract-provider/src/main/resources/application.properties
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/application.properties b/fineract-provider/src/main/resources/application.properties
index 3fd1cb5..adbef74 100644
--- a/fineract-provider/src/main/resources/application.properties
+++ b/fineract-provider/src/main/resources/application.properties
@@ -1,21 +1,2 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
spring.profiles.default=basicauth
\ No newline at end of file
[04/10] incubator-fineract git commit: Merge branch 'jdbcdriver' into
openmf_develop
Posted by na...@apache.org.
Merge branch 'jdbcdriver' into openmf_develop
Conflicts:
fineract-provider/src/main/resources/application.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/e97719d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/e97719d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/e97719d8
Branch: refs/heads/develop
Commit: e97719d8f92f9aeef644e57f4cf6a64c9ed25e3b
Parents: 85a80b5 1c0e550
Author: unknown <na...@confluxtechnologies.com>
Authored: Wed Feb 17 11:16:30 2016 +0530
Committer: unknown <na...@confluxtechnologies.com>
Committed: Wed Feb 17 11:16:30 2016 +0530
----------------------------------------------------------------------
.../properties/basicauth/application.properties | 18 ++++
.../properties/oauth/application.properties | 18 ++++
.../boot/AbstractApplicationConfiguration.java | 2 +
.../core/boot/JDBCDriverConfig.java | 74 ++++++++++++++++
.../core/boot/db/DataSourceConfiguration.java | 9 +-
.../core/boot/db/DataSourceProperties.java | 13 ++-
.../FineractPlatformTenantConnection.java | 6 +-
.../service/TenantDatabaseUpgradeService.java | 11 ++-
.../TomcatJdbcDataSourcePerTenantService.java | 10 ++-
.../data/ResultsetColumnHeaderData.java | 53 ++++++++----
.../portfolio/loanaccount/domain/Loan.java | 91 ++++++++++----------
.../resources/META-INF/spring/jdbc.properties | 23 +++++
.../src/main/resources/application.properties | 18 ++++
13 files changed, 262 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
[10/10] incubator-fineract git commit: Merge branch 'develop' of
https://github.com/openMF/incubator-fineract into openmf_develop
Posted by na...@apache.org.
Merge branch 'develop' of https://github.com/openMF/incubator-fineract into openmf_develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/5a7fbd32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/5a7fbd32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/5a7fbd32
Branch: refs/heads/develop
Commit: 5a7fbd32086908f9914efb29b5cf65dd5b3c747e
Parents: 6005dd0 f4e9467
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Wed Mar 9 15:35:32 2016 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Wed Mar 9 15:35:32 2016 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/10] incubator-fineract git commit: no message
Posted by na...@apache.org.
no message
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/4ed7692a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/4ed7692a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/4ed7692a
Branch: refs/heads/develop
Commit: 4ed7692a00909c5b5cf8dc6838659aebe2b7eb42
Parents: e97719d
Author: unknown <na...@confluxtechnologies.com>
Authored: Wed Feb 17 12:32:19 2016 +0530
Committer: unknown <na...@confluxtechnologies.com>
Committed: Wed Feb 17 12:32:19 2016 +0530
----------------------------------------------------------------------
.../report/service/PentahoReportingProcessServiceImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/4ed7692a/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java b/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
index 3a8f80a..36af4aa 100644
--- a/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
+++ b/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
@@ -19,6 +19,7 @@ import javax.ws.rs.core.Response;
import org.apache.commons.lang.StringUtils;
import org.apache.fineract.infrastructure.core.api.ApiParameterHelper;
+import org.apache.fineract.infrastructure.core.boot.JDBCDriverConfig;
import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant;
import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenantConnection;
import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
@@ -56,6 +57,8 @@ public class PentahoReportingProcessServiceImpl implements ReportingProcessServi
private final PlatformSecurityContext context;
private boolean noPentaho = false;
+ @Autowired private JDBCDriverConfig driverConfig ;
+
@Autowired
public PentahoReportingProcessServiceImpl(final PlatformSecurityContext context) {
// kick off pentaho reports server
@@ -187,8 +190,7 @@ public class PentahoReportingProcessServiceImpl implements ReportingProcessServi
// data scoping
final FineractPlatformTenant tenant = ThreadLocalContextUtil.getTenant();
final FineractPlatformTenantConnection tenantConnection = tenant.getConnection();
-
- final String tenantUrl = tenantConnection.databaseURL();
+ String tenantUrl = driverConfig.constructProtocol(tenantConnection.getSchemaServer(), tenantConnection.getSchemaServerPort(), tenantConnection.getSchemaName()) ;
final String userhierarchy = currentUser.getOffice().getHierarchy();
logger.info("db URL:" + tenantUrl + " userhierarchy:" + userhierarchy);
rptParamValues.put("userhierarchy", userhierarchy);
[07/10] incubator-fineract git commit: Merge branch 'develop' into
openmf_develop
Posted by na...@apache.org.
Merge branch 'develop' into openmf_develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/fc96989b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/fc96989b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/fc96989b
Branch: refs/heads/develop
Commit: fc96989bc20f9ee4745e97bc07fb2daac289c549
Parents: 7e8c166 8d160d3
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Wed Feb 24 12:07:53 2016 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Wed Feb 24 12:07:53 2016 +0530
----------------------------------------------------------------------
CHANGELOG.md | 29 +++++++
api-docs/apiLive.htm | 2 +-
fineract-provider/gradle.properties | 2 +-
.../floatingrates/data/FloatingRateDTO.java | 82 ++++++++++----------
.../data/LoanTermVariationsData.java | 2 +-
.../portfolio/loanaccount/domain/Loan.java | 1 +
6 files changed, 76 insertions(+), 42 deletions(-)
----------------------------------------------------------------------