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:48:11 UTC
[1/2] incubator-fineract git commit: pentaho removal Revert "Merge
branch 'develop' into openmf_develop"
Repository: incubator-fineract
Updated Branches:
refs/heads/develop 2a1f634d7 -> f367fadd0
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 8d0ba7d..0000000
--- a/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-title.Saving.Transaction.Receipt=Receipt
-label.ClientName=Client Name:
-label.ClientAccountNumber=Client Account Number:
-label.ProductName=Client Account Title:
-label.Operation=Operation:
-label.Operation.Deposit=Deposit
-label.Operation.Withdrawal=Withdrawal
-label.Operation.Amount=Amount:
-label.Operation.Amount.InFigures=In Figures:
-label.Operation.Amount.InWords=In Words:
-label.Operation.Description=Description:
-label.receipt.text1=Your account has been
-label.receipt.credited=credited
-label.receipt.credited=debited
-label.receipt.text2= with
-label.receipt.text.dot=.
-label.receipt.ClientName=Client Name and Signature
-label.receipt.TxnDateTime=Date and Time of Transaction:
-label.receipt.Operator=Cashier Name:
-label.receipt.TxnID=Transaction ID:
-txn_type.1=Deposit
-txn_type.2=Withdrawal
-txn_type.3=Interest Posting
-accounting_txn_type.1=credited
-accounting_txn_type.2=debited
-accounting_txn_type.3=credited
-test.msg=Your Account has been $(acc_txn_type) with $(txn_amount, number, "#,###.##")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index bf4cd47..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Savings Transaction Receipt.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 9c73fcd..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Savings Transactions.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index bdc6413..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Staff Assignment History.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 2e79a83..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Trial Balance.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index a34b26f..0000000
Binary files a/fineract-provider/src/main/pentahoReports/TxnRunningBalances(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 45d459d..0000000
--- a/fineract-provider/src/main/pentahoReports/TxnRunningBalances.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-label.column.Transaction.Date=Transaction Date
-label.column.Transaction.Type=Transaction Type
-label.column.Office=Office
-label.column.Loan.Officer=Loan Officer
-label.column.Loan.Account.No=Loan Account No
-label.column.Loan.Product=Loan Product
-label.column.Currency=Currency
-label.column.Client.Account.No=Client Account No
-label.column.Client=Client
-label.column.Amount=Amount
-label.column.Principal=Principal
-label.column.Interest=Interest
-label.column.Outstanding.Principal=Outstanding Principal
-label.column.Interest.Income=Interest Income
-label.column.Principal.Write.Off=Principal Write Off
-label.group.title.Branch=Branch
-lable.title.Transaction.Running.Balances=Transaction Running Balances
-
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 96e4f36..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Written-Off Loans(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 84a7849..0000000
--- a/fineract-provider/src/main/pentahoReports/Written-Off Loans.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.Client.Account.No=Client Account No.
-label.column.Client.Name=Client Name
-label.column.Loan.Account.No.=Loan Account No.
-label.column.Product.Name=Product Name
-label.column.Disbursed.Date=Disbursed Date
-label.column.Written.Off.date=Written Off date
-label.column.Loan.Amount=Loan Amount
-label.column.Written.Off.Principal=Written-Off Principal
-label.column.Written.Off.Interest=Written-Off Interest
-label.column.Written.Off.Fees=Written-Off Fees
-label.column.Written.Off.Penalties=Written-Off Penalties
-label.column.Reason.For.Write.Off=Reason For Write-Off
-label.column.Loan.Officer.Name=Loan Officer Name
-label.group.title.Branch=Branch
-label.title.Written.Off.Loans=Written-Off Loans
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index a500ab7..0000000
--- a/fineract-provider/src/main/pentahoReports/balanceOutstanding.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-balanceOutstanding=Balance Outstanding
-accountId=Account ID:
-clientGroup=Client/Group
-loanAmount=Loan Amount
-balance=Balance
-loanStatus=Loan Status
-disbDate=Disbursed Date
-gender=Gender
-loanType=Loan Type
-fundSource=Fund Source
-loanOfficer=Loan Officer
-PrintedBy\:=Printed By :
-On\:=On :
-center\:=Center :
-loanpurpose.=Loan Purpose
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 5fd8cf1..0000000
--- a/fineract-provider/src/main/pentahoReports/balanceSheet.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-balanceSheet=Balance Sheet
-glcode=GL CODE
-name=Name
-balance=Balance
-assets=Assets
-totalAssets=Total Assets :
-liability=Liabilities
-totalLiabilities=Total Liabilities :
-equity=Equities
-totalEquities=Total Equities :
-branchName=Branch :
-asOn=As On :
-retainedEarnings=Retained Earnings
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 0cd5fe3..0000000
--- a/fineract-provider/src/main/pentahoReports/branchExpectedCashFlow.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-BranchExpectedCashFlow=Branch Expected Cash Flow
-From=From :
-To=To:
-Office=Office:
-Currency=Currency :
-Date=Date
-ExpectedCashIn=Expected Cash In
-ExpectedCashOut=Expected Cash Out
-Principle=Principle
-Interest=Interest
-ClientFees=CLient Fees
-LoanFees=Loan Fees
-Penalty=Penalty
-LoanDisbursals=Loan Disbursals
-NetExpectedCashOut=Net Expected Cash Out
-Total=Total :
-PrintedBy\:=Printed by:
-On\:=On:
-MFIName\:=MFI Name:
-Page=Page
-VersionAt=Version 1.3.1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index fd76bfc..0000000
--- a/fineract-provider/src/main/pentahoReports/clientLoansListing.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Client.Account.No=Client Account No.
-label.column.Name=Name
-label.column.Client.Status=Client Status
-label.column.Loan.Officer=Loan Officer
-label.column.Loan.Account.No=Loan Account No.
-label.column.External.Id=External Id
-label.column.Loan=Loan
-label.column.Status=Status
-label.column.Fund=Fund
-label.column.Loan.Purpose=Loan Purpose
-label.column.Currency=Currency
-label.column.principal_amount=principal_amount
-label.column.Arrears.Tolerance.Amount=Arrears Tolerance Amount
-label.column.principal_amount=principal_amount
-label.column.Annual_Nominal.Interest_Rate=Annual_Nominal Interest_Rate
-label.column.Nominal.Interest.Rate.Per.Period=Nominal Interest Rate Per Period
-label.column.Interest.Rate.Frequency=Interest Rate Frequency
-label.column.Interest.Method=Interest Method
-label.column.Interest.Calculated.in.Period=Interest Calculated in Period
-label.column.Term.Frequency=Term Frequency
-label.column.Term.Frequency.Period=Term Frequency Period
-label.column.Repayment.Frequency=Repayment Frequency
-label.column.Repayment.Frequency.Period=Repayment Frequency Period
-label.column.Amortization=Amortization
-label.column.Total.Charges.Due.At.Disbursement=Total Charges Due At Disbursement
-label.column.Submitted=Submitted
-label.column.Approved=Approved
-label.column.Expected.Disbursal=Expected Disbursal
-label.column.Expected.First.Repayment=Expected First Repayment
-label.column.Interest.Calculated.From=Interest Calculated From
-label.column.Disbursed=Disbursed
-label.column.Expected.Maturity=Expected Maturity
-label.column.Matured.On=Matured On
-label.column.Closed=Closed
-label.column.Rejected=Rejected
-label.column.Rescheduled=Rescheduled
-label.column.Withdrawn=Withdrawn
-label.column.Written.Off=Written Off
-label.column.
-label.groupby.Branch=Branch
-label.title.Client.Loans.Listing=Client Loans Listing
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index b4f9245..0000000
--- a/fineract-provider/src/main/pentahoReports/clientSavingsSummary.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-clientSavingsSummary=Client Savings Summary
-transactionDate=Transaction Date
-details=Details
-totalDebits=Total Debits
-totalCredits=Total Credits
-withdrawal=Withdrawal
-balance=Balance
-balancebf=Balance B/F
-From=From :
-To=To:
-PrintedBy\:=Printed by:
-On\:=On:
-MFIName\:=MFI Name:
-Page=Page
-VersionAt=Version 1.3.1
-accountNo=Account No:
-clientName=Client Name
-product=Product
-Total=Total :
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index b28c368..0000000
--- a/fineract-provider/src/main/pentahoReports/expectedPaymentsByDate.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-ExpectedPaymentsByDate=Expected Payments By Date
-From=From :
-To=To:
-Office=Office :
-DueDate=Due Date :
-ClientName=Client Name
-LoanAccountNo=Loan Account No:
-Product=Product
-Installment=Installment
-Date=Date
-Principal=Principal
-LoanOfficer=Loan Officer
-Interest=Interest
-FeesDue=Fees Due
-PenaltyDue=Penalty Due
-TotalDue=Total Due
-TotalOverDue=Total Over Due
-Total=Total :
-PrintedBy\:=Printed by:
-On\:=On:
-MFIName\:=MFI Name:
-Page=Page
-VersionAt=Version 1.3.1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 1fcfad6..0000000
--- a/fineract-provider/src/main/pentahoReports/incomeStatement.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-incomeStatement=Income Statement
-glcode=GL CODE
-name=Name
-balance=Balance
-income=Income
-totalIncome=Total Income :
-expenses=Expenses
-totalExpenses=Total Expenses :
-netIncome=Net Income :
-branchName=Branch :
-period=Period:
-to=To
-PrintedBy\:=Printed by:
-On\:=On:
-Page=Page
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 18f65aa..0000000
--- a/fineract-provider/src/main/pentahoReports/loanScheduleDetailed.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-loanAccountSchedule=Loan Account Schedule
-Office=Office :
-LoanOfficer=Loan Officer :
-ClientName=Client Name :
-FileID=File ID :
-LoanAccountNumber=Loan Account Number :
-LoanAmount=Loan Amount :
-DisbursalDate=Disbursal Date :
-NoOfInstallments=Number Of Installments :
-InterestRate=Interest Rate :
-Installment=Installment
-Currency=Currency :
-PrincipleDue=Principle Due
-InterestDue=Interest Due
-FeesDue=Fees Due
-PenaltyDue=Penalty Due
-TotalDue=Total Due
-DateExpected=Date Expected
-Status=Status
-Total=Total :
-ActivityDetails=Activity Details
-Date=Date
-Comment=Comment
-Principle=Principle
-Interest=Interest
-Fees=Fees
-Penalty=Penalty
-TotalPaid=Total Paid
-TotalOutstanding=Total Outstanding
-PrintedBy\:=Printed by:
-On\:=On:
-MFIName\:=MFI Name:
-Page=Page
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index fd48fb7..0000000
--- a/fineract-provider/src/main/pentahoReports/loanScheduleDetailed_fr.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-loanAccountSchedule=Loan Account Schedule
-Office=Bureau :
-LoanOfficer=Agent de crédit :
-ClientName=Client Name :
-FileID=File ID :
-LoanAccountNumber=Compte de prêt# :
-LoanAmount=Loan Amount :
-DisbursalDate=Décaisser Date :
-NoOfInstallments=Number Of Installments :
-InterestRate=Interest Rate :
-Installment=Installment
-Currency=la devise :
-PrincipleDue=Capital dû
-InterestDue=Intérêts dus
-FeesDue=Fees Due
-PenaltyDue=Penalty Due
-TotalDue=Total dû
-DateExpected=Date Expected
-Status=Status
-Total=Total :
-ActivityDetails=Activity Details
-Date=Date
-Comment=Commentaire
-Principle=Capital
-Interest=Intérêt
-Fees=Frais
-Penalty=Pénalité
-TotalPaid=Total Payé
-TotalOutstanding=Total Impayé
-PrintedBy\:=Printed by:
-On\:=On:
-MFIName\:=MFI Name:
-Page=Page
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index a97869e..0000000
--- a/fineract-provider/src/main/pentahoReports/savingsTransactions.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-savingsTransactions=Savings Transactions
-transactionDate=Transaction Date
-details=Details
-deposit=Deposit
-withdrawal=Withdrawal
-balance=Balance
-From=From :
-To=To:
-PrintedBy\:=Printed by:
-On\:=On:
-MFIName\:=MFI Name:
-Page=Page
-VersionAt=Version 1.3.1
-accountNo=Account No:
-clientName=Client Name
-product=Product
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index b099692..0000000
--- a/fineract-provider/src/main/pentahoReports/staff assigment history.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-label.detail.center_name=Centers
-label.detail.staff_id=Staff Id
-label.detail.staff_name=Staff Name
-label.detail.from_date=From
-label.detail.assigned_on=Assigned On
-label.detail.assigned_by=Assigned By
-label.detail.unassigned_on=Unassigned On
-label.detail.unassigned_by=Unassigned By
-label.detail.to=To
-label.detail.
-label.detail.
-label.detail.
-label.detail.
-label.detail.
-label.detail.
-label.detail.
-head=Staff Assignmet History
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 1ab1bc4..0000000
--- a/fineract-provider/src/main/pentahoReports/trialBalance.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-trialBalance=Trial Balance
-openingBalance=Opening Balance
-transactions=Transactions
-debit=Debit
-credit=Credit
-branchName=Branch :
-glcode=GL CODE
-name=Name
-total=Total :
-PrintedBy\:=Printed by:
-On\:=On:
-Page=Page
-period=Period:
-to=To
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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 f48043c..9984926 100644
--- a/fineract-provider/src/main/resources/META-INF/spring/appContext.xml
+++ b/fineract-provider/src/main/resources/META-INF/spring/appContext.xml
@@ -54,8 +54,7 @@
org.apache.fineract.template.*,
org.apache.fineract.template.service.*,
org.apache.fineract.useradministration.*,
- org.apache.fineract.batch,
- org.mifosplatform.infrastructure.report.service">
+ org.apache.fineract.batch">
<context:exclude-filter expression="org.springframework.stereotype.Controller"
type="annotation" />
[2/2] incubator-fineract git commit: pentaho removal Revert "Merge
branch 'develop' into openmf_develop"
Posted by na...@apache.org.
pentaho removal Revert "Merge branch 'develop' into openmf_develop"
This reverts commit 6005dd0c11c2e1fca511c45494600851bedd6a20, reversing
changes made to 6ecbd28121f5fb20781c4a7f1135223d94364eab.
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/f367fadd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/f367fadd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/f367fadd
Branch: refs/heads/develop
Commit: f367fadd06b49fbf534458ac74328df3a0938478
Parents: 2a1f634
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Wed Mar 9 16:16:51 2016 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Wed Mar 9 16:16:51 2016 +0530
----------------------------------------------------------------------
fineract-provider/build.gradle | 21 --
fineract-provider/dependencies.gradle | 16 --
fineract-provider/dev-dependencies.gradle | 18 +-
.../PentahoReportingProcessServiceImpl.java | 228 -------------------
.../Active Loan Summary per Branch.prpt | Bin 9151 -> 0 bytes
.../Active Loans - Details(Pentaho).prpt | Bin 10150 -> 0 bytes
.../Active Loans - Details.properties | 26 ---
.../Active Loans - Summary(Pentaho).prpt | Bin 23695 -> 0 bytes
.../Active Loans - Summary.properties | 25 --
... Passed Final Maturity Summary(Pentaho).prpt | Bin 9855 -> 0 bytes
...ans Passed Final Maturity Summary.properties | 25 --
...ve Loans Passed Final Maturity(Pentaho).prpt | Bin 9582 -> 0 bytes
...ctive Loans Passed Final Maturity.properties | 27 ---
...tive Loans by Disbursal Period(Pentaho).prpt | Bin 23887 -> 0 bytes
.../Active Loans by Disbursal Period.properties | 20 --
...ns in last installment Summary(Pentaho).prpt | Bin 10128 -> 0 bytes
...Loans in last installment Summary.properties | 24 --
...tive Loans in last installment(Pentaho).prpt | Bin 23552 -> 0 bytes
.../Active Loans in last installment.properties | 26 ---
.../ActiveLoanSummaryperBranch.properties | 16 --
.../pentahoReports/Aging Detail(Pentaho).prpt | Bin 9083 -> 0 bytes
.../main/pentahoReports/Aging Detail.properties | 20 --
...ng Summary (Arrears in Months)(Pentaho).prpt | Bin 9192 -> 0 bytes
...Aging Summary (Arrears in Months).properties | 12 -
...ing Summary (Arrears in Weeks)(Pentaho).prpt | Bin 9353 -> 0 bytes
.../Aging Summary (Arrears in Weeks).properties | 13 --
.../pentahoReports/Balance Outstanding.prpt | Bin 9891 -> 0 bytes
.../src/main/pentahoReports/Balance Sheet.prpt | Bin 23549 -> 0 bytes
.../Branch Expected Cash Flow.prpt | Bin 35549 -> 0 bytes
.../pentahoReports/Client Listing(Pentaho).prpt | Bin 8177 -> 0 bytes
.../pentahoReports/Client Listing.properties | 10 -
.../Client Loan Account Schedule.prpt | Bin 14409 -> 0 bytes
.../Client Loans Listing(Pentaho).prpt | Bin 10948 -> 0 bytes
.../Client Saving Transactions.properties | 19 --
.../Client Saving Transactions.prpt | Bin 8950 -> 0 bytes
.../Client Saving Transactions_fr.properties | 18 --
.../pentahoReports/Client Savings Summary.prpt | Bin 16637 -> 0 bytes
.../main/pentahoReports/Collection Report.prpt | Bin 10282 -> 0 bytes
.../pentahoReports/CollectionReport.properties | 20 --
.../main/pentahoReports/Disbursal Report.prpt | Bin 9770 -> 0 bytes
.../pentahoReports/DisbursalReport.properties | 23 --
...ected Payments By Date - Basic(Pentaho).prpt | Bin 9011 -> 0 bytes
...Expected Payments By Date - Basic.properties | 20 --
.../Expected Payments By Date - Formatted.prpt | Bin 36111 -> 0 bytes
...etween Dates Summary by Office(Pentaho).prpt | Bin 8313 -> 0 bytes
...d Between Dates Summary by Office.PROPERTIES | 8 -
...isbursed Between Dates Summary(Pentaho).prpt | Bin 8076 -> 0 bytes
...s Disbursed Between Dates Summary.PROPERTIES | 4 -
.../GeneralLedgerReport.properties | 18 --
.../pentahoReports/GeneralLedgerReport.prpt | Bin 9036 -> 0 bytes
.../main/pentahoReports/Income Statement.prpt | Bin 18156 -> 0 bytes
.../Loan Account Statement.properties | 20 --
.../pentahoReports/Loan Account statement.prpt | Bin 8273 -> 0 bytes
.../Loan Transaction Receipt.properties | 42 ----
.../Loan Transaction Receipt.prpt | Bin 7314 -> 0 bytes
...ing Disbursal Summary by Month(Pentaho).prpt | Bin 8691 -> 0 bytes
...aiting Disbursal Summary by Month.properties | 12 -
...ans Awaiting Disbursal Summary(Pentaho).prpt | Bin 8523 -> 0 bytes
.../Loans Awaiting Disbursal Summary.properties | 13 --
.../Loans Awaiting Disbursal(Pentaho).prpt | Bin 9591 -> 0 bytes
.../Loans Awaiting Disbursal.properties | 24 --
.../Loans Pending Approval(Pentaho).prpt | Bin 9348 -> 0 bytes
.../Loans Pending Approval.properties | 18 --
.../Obligation Met Loans Details(Pentaho).prpt | Bin 9592 -> 0 bytes
.../Obligation Met Loans Details.properties | 22 --
.../Obligation Met Loans Summary(Pentaho).prpt | Bin 9315 -> 0 bytes
.../Obligation Met Loans Summary.properties | 17 --
.../Portfolio at Risk by Branch(Pentaho).prpt | Bin 9220 -> 0 bytes
.../Portfolio at Risk by Branch.properties | 15 --
.../Portfolio at Risk(Pentaho).prpt | Bin 9025 -> 0 bytes
.../pentahoReports/Portfolio at Risk.properties | 16 --
.../Rescheduled Loans(Pentaho).prpt | Bin 8960 -> 0 bytes
.../pentahoReports/Rescheduled Loans.properties | 17 --
.../Saving Account Statement.properties | 9 -
.../Saving Account Statement.prpt | Bin 8133 -> 0 bytes
.../Saving Transaction.properties | 14 --
.../Savings Transaction Receipt.properties | 27 ---
.../Savings Transaction Receipt.prpt | Bin 7329 -> 0 bytes
.../pentahoReports/Savings Transactions.prpt | Bin 15703 -> 0 bytes
.../Staff Assignment History.prpt | Bin 7135 -> 0 bytes
.../src/main/pentahoReports/Trial Balance.prpt | Bin 8498 -> 0 bytes
.../TxnRunningBalances(Pentaho).prpt | Bin 9238 -> 0 bytes
.../TxnRunningBalances.properties | 19 --
.../Written-Off Loans(Pentaho).prpt | Bin 9275 -> 0 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 +-
98 files changed, 2 insertions(+), 1222 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/fineract-provider/build.gradle
----------------------------------------------------------------------
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index d508b28..d104a1f 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -45,9 +45,6 @@ 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)
}
@@ -97,11 +94,6 @@ task dist(type:Zip){
include '**/*'
into('apps')
}
- from('src/main/pentahoReports/') {
- fileMode = 0755
- include '*'
- into('pentahoReports')
- }
from('../api-docs/') {
fileMode = 0755
include '*'
@@ -122,20 +114,7 @@ task dist(type:Zip){
into(baseName + '-' + version)
}
-task deployPentahoReports() {
- def pentahoReportDir = System.properties['user.home'] + System.properties['file.separator'] + '.mifosx' + System.properties['file.separator'] + 'pentahoReports'
- copy {
- from "src/main/pentahoReports"
- into pentahoReportDir
- }
-
- doLast {
- println ':deployPentahoReports - moving pentaho reports under: ' + pentahoReportDir
- }
-}
-
war {
- it.dependsOn deployPentahoReports
war.finalizedBy(bootRepackage)
}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/fineract-provider/dependencies.gradle
----------------------------------------------------------------------
diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle
index 610eec0..d8dabd5 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -51,22 +51,6 @@ 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/f367fadd/fineract-provider/dev-dependencies.gradle
----------------------------------------------------------------------
diff --git a/fineract-provider/dev-dependencies.gradle b/fineract-provider/dev-dependencies.gradle
index 74e5b37..89ffcf1 100644
--- a/fineract-provider/dev-dependencies.gradle
+++ b/fineract-provider/dev-dependencies.gradle
@@ -50,23 +50,7 @@ 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/f367fadd/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
deleted file mode 100644
index 36af4aa..0000000
--- a/fineract-provider/src/main/java/org/mifosplatform/infrastructure/report/service/PentahoReportingProcessServiceImpl.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * 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.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-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.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;
-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 PlatformSecurityContext context;
- private boolean noPentaho = false;
-
- @Autowired private JDBCDriverConfig driverConfig ;
-
- @Autowired
- public PentahoReportingProcessServiceImpl(final PlatformSecurityContext context) {
- // kick off pentaho reports server
- ClassicEngineBoot.getInstance().start();
- this.noPentaho = false;
-
- this.context = context;
- }
-
- @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 FineractPlatformTenant tenant = ThreadLocalContextUtil.getTenant();
- final FineractPlatformTenantConnection tenantConnection = tenant.getConnection();
- 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);
-
- final Long userid = currentUser.getId();
- logger.info("db URL:" + tenantUrl + " userid:" + userid);
- rptParamValues.put("userid", userid);
-
- 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/f367fadd/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
deleted file mode 100644
index bc0c368..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Active Loan Summary per Branch.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 91ae1be..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans - Details(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 5986b16..0000000
--- a/fineract-provider/src/main/pentahoReports/Active Loans - Details.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.loan.Officer=Loan Officer
-label.column.client=Client
-label.column.Loan.Account.No=Loan Account No.
-label.column.Product=Product
-label.column.Fund=Fund
-label.column.Loan.Amount=Loan Amount
-label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
-label.column.Disbursed.Date=Disbursed Date
-label.column.Expected.Matured.On=Expected Matured On
-label.column.Principal.Repaid=Principal Repaid
-label.column.Principal.Outstanding=Principal Outstanding
-label.column.Principal.Overdue=Principal Overdue
-label.column.Interest.Repaid=Interest Repaid
-label.column.Interest.Outstanding=Interest Outstanding
-label.column.Interest.Overdue=Interest Overdue
-label.column.Fees.Repaid=Fees Repaid
-label.column.Fees.Outstanding=Fees Outstanding
-label.column.Fees.Overdue=Fees Overdue
-label.column.Penalties.Repaid=Penalties Repaid
-label.column.Penalties.Outstanding=Penalties Outstanding
-label.column.Penalties.Overdue=Penalties Overdue
-label.groupby.Branch=Branch
-label.title.Active.Loans.Details=Active Loans - Details
-lable.group.tolat=Total
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index a3b5829..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans - Summary(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 2b92dbc..0000000
--- a/fineract-provider/src/main/pentahoReports/Active Loans - Summary.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.No.of.Clients=No. of Clients
-label.column.No.Active.Loans=No. Active Loans
-label.column.No.of.Loans.in.Arrears=No. of Loans in Arrears
-label.column.Total.Loans.Disbursed=Total Loans Disbursed
-label.column.Principal.Repaid=Principal Repaid
-label.column.Principal.Outstanding=Principal Outstanding
-label.column.Principal.Overdue=Principal Overdue
-label.column.Total.Interest=Total Interest
-label.column.Interest.Repaid=Interest Repaid
-label.column.Interest.Outstanding=Interest Outstanding
-label.column.Interest.Overdue=Interest Overdue
-label.column.Total.Fees=Total Fees
-label.column.Fees.Repaid=Fees Repaid
-label.column.Fees.Outstanding=Fees Outstanding
-label.column.Fees.Overdue=Fees Overdue
-label.column.Total.Penalties=Total Penalties
-label.column.Penalties.Repaid=Penalties Repaid
-label.column.Penalties.Outstanding=Penalties Outstanding
-label.column.Penalties.Overdue=Penalties Overdue
-label.column.Portfolio.at.Risk%=Portfolio at Risk %
-label.groupby.column.Branch=Branch
-
-label.title.Active.Loans.Details=Active Loan-Summary
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 6b20dbd..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 6a4e9b4..0000000
--- a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity Summary.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.No.of.Clients=No. of Clients
-label.column.No.Active.Loans=No. Active Loans
-label.column.No.of.Loans.in.Arrears=No. of Loans in Arrears
-label.column.Total.Loans.Disbursed=Total Loans Disbursed
-label.column.Principal.Repaid=Principal Repaid
-label.column.Principal.Outstanding=Principal Outstanding
-label.column.Principal.Overdue=Principal Overdue
-label.column.Total.Interest=Total Interest
-label.column.Interest.Repaid=Interest Repaid
-label.column.Interest.Outstanding=Interest Outstanding
-label.column.Interest.Overdue=Interest Overdue
-label.column.Total.Fees=Total Fees
-label.column.Fees.Repaid=Fees Repaid
-label.column.Fees.Outstanding=Fees Outstanding
-label.column.Fees.Overdue=Fees Overdue
-label.column.Total.Penalties=Total Penalties
-label.column.Penalties.Repaid=Penalties Repaid
-label.column.Penalties.Outstanding=Penalties Outstanding
-label.column.Penalties.Overdue=Penalties Overdue
-label.column.Portfolio.at.Risk%=Portfolio at Risk %
-lable.title.Active.Loans.Passed.Final.Maturity.Summary=Active Loans Passed Final Maturity Summary
-
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index b874416..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 88cefb1..0000000
--- a/fineract-provider/src/main/pentahoReports/Active Loans Passed Final Maturity.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.Loan.Officer=Loan Officer
-label.column.Client=Client
-label.column.Loan.Account.No=Loan Account No.
-label.column.Product=Product
-label.column.Fund=Fund
-label.column.Loan.Amount=Loan Amount
-label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
-label.column.Disbursed.Date=Disbursed Date
-label.column.Expected.Matured.On=Expected Matured On
-label.column.Principal.Repaid=Principal Repaid
-label.column.Principal.Outstanding=Principal Outstanding
-label.column.Principal.Overdue=Principal Overdue
-label.column.Interest.Repaid=Interest Repaid
-label.column.Interest.Outstanding=Interest Outstanding
-label.column.Interest.Overdue=Interest Overdue
-label.column.Fees.Repaid=Fees Repaid
-label.column.Fees.Outstanding=Fees Outstanding
-label.column.Fees.Overdue=Fees Overdue
-label.column.Penalties.Repaid=Penalties Repaid
-label.column.Penalties.Outstanding=Penalties Outstanding
-label.column.Penalties.Overdue=Penalties Overdue
-
-lable.title.Active.Loans.Passed.Final.Maturity=Active Loans Passed Final Maturity
-
-lable.title.group.Branch=Branch
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index e6cf011..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index f5e48bf..0000000
--- a/fineract-provider/src/main/pentahoReports/Active Loans by Disbursal Period.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.Client.Account.No=Client Account No
-label.column.Client=Client
-label.column.Loan.Account.No=Loan Account No
-label.column.Product=Product
-label.column.Fund=Fund
-label.column.Loan.Principal.Amount=Loan Principal Amount
-label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
-label.column.Disbursed.Date=Disbursed Date
-label.column.Total.Loan(P+I+F+Pen)=Total Loan (P+I+F+Pen)
-label.column.Total.Repaid(P+I+F+Pen)=Total Repaid (P+I+F+Pen)
-label.column.Loan.Officer=Loan Officer
-label.title.Active.Loans.by.Disbursal.Period=Active Loans by Disbursal Period
-lable.grouptotal.by.date=Total
-lable.grouptotal.by.Branch= Branch Total
-label.groupby.column.Disbursed.Date=Disbursed Date
-label.groupby.column.Branch=Branch
-lable.title.Disbursal.Period.from=Disbursal Period from
-lable.title.Disbursal.Period.to=To
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 102b2c6..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index ca21497..0000000
--- a/fineract-provider/src/main/pentahoReports/Active Loans in last installment Summary.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.No.of.Clients=No. of Clients
-label.column.No.Active.Loans=No. Active Loans
-label.column.No.of.Loans.in.Arrears=No. of Loans in Arrears
-label.column.Total.Loans.Disbursed=Total Loans Disbursed
-label.column.Principal.Repaid=Principal Repaid
-label.column.Principal.Outstanding=Principal Outstanding
-label.column.Principal.Overdue=Principal Overdue
-label.column.Total.Interest=Total Interest
-label.column.Interest.Repaid=Interest Repaid
-label.column.Interest.Outstanding=Interest Outstanding
-label.column.Interest.Overdue=Interest Overdue
-label.column.Total.Fees=Total Fees
-label.column.Fees.Repaid=Fees Repaid
-label.column.Fees.Outstanding=Fees Outstanding
-label.column.Fees.Overdue=Fees Overdue
-label.column.Total.Penalties=Total Penalties
-label.column.Penalties.Repaid=Penalties Repaid
-label.column.Penalties.Outstanding=Penalties Outstanding
-label.column.Penalties.Overdue=Penalties Overdue
-label.column.Portfolio.at.Risk%=Portfolio at Risk %
-label.groupby.column.Branch=Branch
-lable.title.Active.Loans.In.Last.Installment.Summary=Active Loans In Last Installment Summary
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index a28291f..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Active Loans in last installment(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 00cf44d..0000000
--- a/fineract-provider/src/main/pentahoReports/Active Loans in last installment.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.Loan.Officer=Loan Officer
-label.column.Client.Account.No=Client Account No
-label.column.Client=Client
-label.column.Loan.Account.No=Loan Account No
-label.column.Product=Product
-label.column.Fund=Fund
-label.column.Loan.Amount=Loan Amount
-label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
-label.column.Disbursed=Disbursed
-label.column.Expected.Matured.On=Expected Matured On
-label.column.Principal.Repaid=Principal Repaid
-label.column.Principal.Outstanding=Principal Outstanding
-label.column.Principal.Overdue=Principal Overdue
-label.column.Interest.Repaid=Interest Repaid
-label.column.Interest.Outstanding=Interest Outstanding
-label.column.Interest.Overdue=Interest Overdue
-label.column.Fees.Repaid=Fees Repaid
-label.column.Fees.Outstanding=Fees Outstanding
-label.column.Fees.Overdue=Fees Overdue
-label.column.Penalties.Repaid=Penalties Repaid
-label.column.Penalties.Outstanding=Penalties Outstanding
-label.column.Penalties.Overdue=Penalties Overdue
-label.groupby.column.Branch=Branch
-lable.title.Active.Loans.In.Last.Installment=Active Loans In Last Installment
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 5a8ff11..0000000
--- a/fineract-provider/src/main/pentahoReports/ActiveLoanSummaryperBranch.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-active_loan_summery.=Active Loan Summary per Branch
-branch.=Branch
-centers.=No of Centers
-groups.=No of Groups
-clients.=No of Clients
-activeloan.=No of Active Loan
-loanarrears.=No of Loan in Arrears
-disbursed.=Total Loans Disbursed
-principalrepaid.=Total Principal Repaid
-interestrepaid.=Total Interest Repaid
-principaloutstand.=Total Principal Outstanding
-interestoutstand.=Total Interest Outstanding
-amountarreas.=Amount in Arrears
-total.=Total
-PrintedBy\:=Printed By :
-On\:=On :
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 37b9642..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Aging Detail(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index de8165c..0000000
--- a/fineract-provider/src/main/pentahoReports/Aging Detail.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.Client.Account.No=Client Account No.
-label.column.Client.Name=Client Name
-label.column.Account.Number=Account Number
-label.column.Loan.Amount=Loan Amount
-label.column.Original.Principal=Original Principal
-label.column.Original.Interest=Original Interest
-label.column.Principal.Paid=Principal Paid
-label.column.Interest.Paid=Interest Paid
-label.column.Principal.Overdue=Principal Overdue
-label.column.Interest.Overdue=Interest Overdue
-label.column.Days.in.Arrears=Days in Arrears
-label.column.Weeks.In.Arrears.Band=Weeks In Arrears Band
-label.column.Days.in.Arrears.Band=Days in Arrears Band
-
-
-lable.title.Aging.Detail=Aging Detail
-
-lable.title.group.Branch=Branch
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index a3426f7..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months)(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index c322bf4..0000000
--- a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Months).properties
+++ /dev/null
@@ -1,12 +0,0 @@
-label.column.currency=currency
-label.column.Days.In.Arrears=Days In Arrears
-label.column.No.Of.Loans=No Of Loans
-label.column.Original.Principal=Original Principal
-label.column.Original.Interest=Original Interest
-label.column.Principal.Paid=Principal Paid
-label.column.Interest.Paid=Interest Paid
-label.column.Principal.Overdue=Principal Overdue
-label.column.Interest.Overdue=Interest Overdue
-lable.title.Aging.Summary.Months=Aging Summary (Arrears in Months)
-
-lable.title.group.Branch=Branch
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 3636609..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks)(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 5869937..0000000
--- a/fineract-provider/src/main/pentahoReports/Aging Summary (Arrears in Weeks).properties
+++ /dev/null
@@ -1,13 +0,0 @@
-label.column.Currency=Currency
-label.column.Weeks.In.Arrears=Weeks In Arrears(Up To)
-label.column.N.Of.Loans=No Of Loans
-label.column.Original.Principal=Original Principal
-label.column.Original.Interest=Original Interest
-label.column.Principal.Paid=Principal Paid
-label.column.Interest.Paid=Interest Paid
-label.column.Principal.Overdue=Principal Overdue
-label.column.Interest.Overdue=Interest Overdue
-
-lable.title.Aging.Summary.in.Weeks=Aging Summary (Arrears in Weeks)
-
-lable.title.group.Branch=Branch
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 7b9f139..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Balance Outstanding.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index aa0c87d..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Balance Sheet.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 5fceacc..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Branch Expected Cash Flow.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 8cb9cda..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Client Listing(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 623a419..0000000
--- a/fineract-provider/src/main/pentahoReports/Client Listing.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-label.column.ID=ID
-label.column.Office/Branch=Office/Branch
-label.column.Client.Account.No=Client Account No.
-label.column.Name=Name
-label.column.Status=Status
-label.column.Activation=Activation
-label.column.External.Id=External Id
-
-lable.title.Client.Listing=Client Listing
-lable.title.group.Branch=Branch
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 46c68f3..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Client Loan Account Schedule.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 950a5c0..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Client Loans Listing(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index b981f9e..0000000
--- a/fineract-provider/src/main/pentahoReports/Client Saving Transactions.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-label.column.Transaction.ID=Transaction ID
-label.column.Transaction.Date=Transaction Date
-label.column.Transaction.Type=Transaction Type
-label.column.Debit=Debit
-label.column.Credit=Credit
-label.column.Balance=Balance
-label.column.Reversed=Reversed
-lable.title.Saving.Transaction=Client Saving Transaction
-lable.title.Transaction.from=From :
-lable.title.Saving.Transaction.To= To :
-lable.title.Client.Name=Client Name
-lable.title.Savings.Account.Name/No=Account Name/No
-lable.title.Branch=Branch
-lable.title.Staff=Staff
-lable.title.Interest=Interest Rate
-lable.title.Balance=Balance
-PrintedBy\:=Printed by:
-On\:=On:
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index f81dfba..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Client Saving Transactions.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index e87c594..0000000
--- a/fineract-provider/src/main/pentahoReports/Client Saving Transactions_fr.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-label.column.Transaction.ID=Transaction Id
-label.column.Transaction.Date=Date de transaction
-label.column.Transaction.Type=Type de transaction
-label.column.Debit=Débit
-label.column.Credit=Crédit
-label.column.Balance=Solde
-label.column.Reversed=Reversed
-lable.title.Transaction.from=À partir de la date :
-lable.title.Saving.Transaction.To= Jusqu’à la date :
-lable.title.Client.Name=Client Nom
-lable.title.Savings.Account.Name/No=Account Name/No
-lable.title.Branch=Branch
-lable.title.Staff=Staff
-lable.title.Interest=Interest Rate
-lable.title.Balance=Balance
-PrintedBy\:=Printed by:
-On\:=On:
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index ce71719..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Client Savings Summary.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 65c9d97..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Collection Report.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 6f23eed..0000000
--- a/fineract-provider/src/main/pentahoReports/CollectionReport.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-collection.=Collection Report
-receipt.=Receipt No
-group.=Group Name
-client.=Clients Name
-loanAccNo.=Loan Account No
-pricAmt.=Principal Amount
-intAmt.=Interest Amount
-totalAmt.=Total Receipt Amount
-feeAmt.=Fees
-penaltyAmt.=Penalty
-others.=Others
-mifos.=Mifos User
-actdate.=Action Date
-created.=Created Date
-office.=Branch :
-ondate.=From :
-todate.=To :
-PrintedBy\:=Printed by:
-On\:=On:
-center\:=Center :
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index a89a1f5..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Disbursal Report.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index df864a8..0000000
--- a/fineract-provider/src/main/pentahoReports/DisbursalReport.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-disbursalReport=Disbursal Report
-receiptNo=Receipt No:
-phoneNo=Phone No:
-accountId=Account ID:
-clientGroup=Client/Group
-loanAmount=Loan Amount
-disbDate=Disbursed Date
-loanType=Loan Type
-loanOfficer=Loan Officer
-PrintedBy\:=Printed By :
-On\:=On :
-center\:=Center :
-centerName=Center Name
-groupName=Group Name
-disbursedAmount=Disbursed Amount
-clientName=Client Name
-serviceTax=Service Tax
-annualSubscription=Annual Subscription
-processingFees=Processing Fees
-disbursedDate=Disbursed Date
-createdDate=Created Date
-mifosUser=Mifos User
-fees=Fees
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index c6cd898..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index b5a620e..0000000
--- a/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Basic.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-
-label.column.Office=Office
-label.column.Loan.Officer=Loan Officer
-label.column.Client.Account.Number=Client Account Number
-label.column.Name=Name
-label.column.Product=Product
-label.column.Loan.Account.Number=Loan Account Number
-label.column.Due.Date=Due Date
-label.column.Installment=Installment
-label.column.Currency=Currency
-label.column.Principal.Due=Principal Due
-label.column.Interest.Due=Interest Due
-label.column.Fees.Due=Fees Due
-label.column.Penalty.Due=Penalty Due
-label.column.Total.Due=Total Due
-label.column.Total.Overdue=Total Overdue
-
-
-lable.title.Expected.Payments.By.Date.Basic=Expected Payments By Date - Basic
-lable.title.group.Branch=Branch
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 96486c2..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Expected Payments By Date - Formatted.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index f4873e0..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index d09905b..0000000
--- a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary by Office.PROPERTIES
+++ /dev/null
@@ -1,8 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Fund=Fund
-label.column.Currency=Currency
-label.column.Disbursed.amount=Disbursed_amount
-
-
-lable.title.Funds.Disbursed.Between.Dates.Summary.by.Office=Funds Disbursed Between Dates Summary by Office
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index f5455f9..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 32d6fce..0000000
--- a/fineract-provider/src/main/pentahoReports/Funds Disbursed Between Dates Summary.PROPERTIES
+++ /dev/null
@@ -1,4 +0,0 @@
-label.column.Fund=Fund
-label.column.Currency=Currency
-label.column.disbursed_amount=disbursed_amount
-lable.title.Funds.Disbursed.Between.Dates.Summary=Funds Disbursed Between Dates Summary
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 908b48f..0000000
--- a/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-lable.detail.Vch_No_Unit=Vch No./Unit
-lable.detail.AC.code=GL Code
-lable.detail.Account_Description=Account Description
-lable.detail.Narration=Description
-lable.detail.Debits=Debits
-lable.detail.Credits=Credits
-lable.detail.Opening_Balance=BALANCE BROUGHT FORWARD (b/f)
-lable.detail.Day_Total=Day Total
-lable.detail.Closing_Balance=Closing Balance
-lable.detail.date=Date
-lable.detail.Cash_Book_From=Ledger Report From Date :
-lable.detail.Run_Date=Run Date :
-lable.detail.Cash_Code= Ledger Account :
-lable.header=GENERAL LEDGER REPORT
-lable.page=Page No
-lable.detail.AfterTxn=Balance
-lable.detail.office = Office :
-lable.detail.todate = To Date :
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 46bdf93..0000000
Binary files a/fineract-provider/src/main/pentahoReports/GeneralLedgerReport.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 3882aa3..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Income Statement.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index e7113c8..0000000
--- a/fineract-provider/src/main/pentahoReports/Loan Account Statement.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-Loan_Account_Statement.=Loan Account Statement
-Date.=Date
-type.=Type
-disbur.=Disbursement
-repayment.=Repayment
-contra.=Contra
-waiveint=WaiveInterest
-repaydisbur=Repayment At Disburesement
-writeoff.=Write-off
-marked_resch.=Marked for Rescheduling
-recover.=Recover Repayment
-waive_cha.=Waive Charges
-apply_char.=Apply charges
-apply_int.=Apply Interest
-description.=Description
-amount.=Amount
-principal.=Principal
-interest.=Interest
-recepit_no.=Recepit No
-paymentype.=Payment Type
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index e2f4f17..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Loan Account statement.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index f55ed9a..0000000
--- a/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-title.Loan.Transaction.Receipt=Receipt
-label.ClientName=Client Name:
-label.ClientAccountNumber=Client Account Number:
-label.ProductName=Client Account Title:
-label.Operation=Operation:
-label.Operation.Deposit=Deposit
-label.Operation.Withdrawal=Withdrawal
-label.Operation.Amount=Amount:
-label.Operation.Amount.InFigures=In Figures:
-label.Operation.Amount.InWords=In Words:
-label.Operation.Description=Description:
-label.receipt.text1=Your account has been
-label.receipt.credited=credited
-label.receipt.debited=debited
-label.receipt.text2= with
-label.receipt.text.dot=.
-label.receipt.ClientName=Client Name and Signature
-label.receipt.TxnDateTime=Date and Time of Transaction:
-label.receipt.Operator=Cashier Name:
-label.receipt.TxnID=Transaction ID:
-txn_type.1=Disbursement
-txn_type.2=Repayment
-txn_type.3=Contra
-txn_type.4=Waive Interest
-txn_type.5=Repayment At Disbursement
-txn_type.6=Write-Off
-txn_type.7=Marked for Rescheduling
-txn_type.8=Recovery Repayment
-txn_type.9=Waive Charges
-txn_type.10=Apply Charges
-txn_type.11=Apply Interest
-accounting_txn_type.1=debited
-accounting_txn_type.2=credited
-accounting_txn_type.3=contra-ed
-accounting_txn_type.4=credited
-accounting_txn_type.5=credited
-accounting_txn_type.6=credited
-accounting_txn_type.7=credited
-accounting_txn_type.8=debited
-accounting_txn_type.9=credited
-accounting_txn_type.10=debitd
-accounting_txn_type.11=debited
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index f042d46..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Loan Transaction Receipt.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index d280c26..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 5751fcf..0000000
--- a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary by Month.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-
-label.column.Office/Branch=Office/Branch
-label.column.Product=Product
-label.column.Currency=Currency
-
-label.column.Year=Year
-label.column.Month=Month
-label.column.Principal=Principal
-
-lable.title.Loans.Awaiting.Disbursal.Summary.by.Month=Loans Awaiting Disbursal Summary by Month
-lable.Group.title.Branch=Branch
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index b7dafb3..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index ddabb80..0000000
--- a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal Summary.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Product=Product
-label.column.Currency=Currency
-label.column.Fund=Fund
-label.column.Principal=Principal
-lable.title.Loans.Awaiting.Disbursal.Summary=Loans Awaiting Disbursal Summary
-lable.Group.title.Branch=Branch
-
-
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 360779e..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 915d7d6..0000000
--- a/fineract-provider/src/main/pentahoReports/Loans Awaiting Disbursal.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Client.Account.No=Client Account No
-label.column.Name=Name
-label.column.Loan.Account.No=Loan Account No.
-label.column.Product=Product
-label.column.Fund=Fund
-label.column.Currency=Currency
-label.column.Principal=Principal
-label.column.Term.Frequency=Term Frequency
-label.column.Term.Frequency.Period=Term Frequency Period
-label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
-label.column.Approved=Approved
-label.column.Days.to.Disbursal=Days to Disbursal
-label.column.Expected.Disbursal=Expected Disbursal
-label.column.Loan.Purpose=Loan Purpose
-label.column.Loan.Officer=Loan Officer
-label.group.title.Branch.Name=Branch Name
-
-
-lable.title.Loans.Awaiting.Disbursal=Loans Awaiting Disbursal
-
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 5998718..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Loans Pending Approval(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index bd9e6b4..0000000
--- a/fineract-provider/src/main/pentahoReports/Loans Pending Approval.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-label.column.Branch/Office=Branch/Office
-label.column.Client.Account.No=Client Account No.
-label.column.Client.Name=Client Name
-label.column.Currency=Currency
-label.column.Product=Product
-label.column.Loan.Account.No=Loan Account No.
-label.column.Loan.Amount=Loan Amount
-label.column.Term.Frequency=Term Frequency
-label.column.Term.Frequency.Period=Term Frequency Period
-label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
-label.column.Days.Pending.Approval=Days Pending Approval
-label.column.Loan.Purpose=Loan Purpose
-label.column.Loan.Officer=Loan Officer
-
-label.group.title.Branch.Name=Branch Name
-
-
-lable.title.Loans.Pending.Approval=Loans Pending Approval
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 191b177..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index b3614e7..0000000
--- a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Details.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.Client.Account.No=Client Account No.
-label.column.Client=Client
-label.column.Loan.Account.No=Loan Account No.
-label.column.Product=Product
-label.column.Fund=Fund
-label.column.Loan.Amount=Loan Amount
-label.column.Total.Repaid=Total Repaid
-label.column.Annual.Nominal.Interest.Rate=Annual Nominal Interest Rate
-label.column.Disbursed=Disbursed
-label.column.Closed=Closed
-label.column.Principal.Repaid=Principal Repaid
-label.column.Interest.Repaid=Interest Repaid
-label.column.Fees.Repaid=Fees Repaid
-label.column.Penalties.Repaid=Penalties Repaid
-label.column.Loan.Officer=Loan Officer
-label.group.title.Branch.Name=Branch Name
-
-
-lable.title.Obligation.Met.Loans.Details=Obligation Met Loans Details
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index b320ac3..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 0243333..0000000
--- a/fineract-provider/src/main/pentahoReports/Obligation Met Loans Summary.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.No.of.Clients=No. of Clients
-label.column.Total.Loan.Amount=Total Loan Amount
-label.column.Total.Principal.Repaid=Total Principal Repaid
-label.column.Total.Interest.Repaid=Total Interest Repaid
-label.column.Total.Fees.Repaid=Total Fees Repaid
-label.column.Total.Penalties.Repaid=Total Penalties Repaid
-label.column.Total.Interest.Waived=Total Interest Waived
-label.column.Total.Fees.Waived=Total Fees Waived
-label.column.Total.Penalties.Waived=Total Penalties Waived
-label.group.title.Branch=Branch
-label.column.
-
-
-lable.title.Obligation.Met.Loans.Summary=Obligation Met Loans Summary
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 52e7f8a..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index f845130..0000000
--- a/fineract-provider/src/main/pentahoReports/Portfolio at Risk by Branch.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-label.group.title.Branch=Branch
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.Principal.Outstanding=Principal Outstanding
-label.column.Principal.Overdue=Principal Overdue
-label.column.Interest.Outstanding=Interest Outstanding
-label.column.Interest.Overdue=Interest Overdue
-label.column.Fees.Outstanding=Fees Outstanding
-label.column.Fees.Overdue=Fees Overdue
-label.column.Penalties.Outstanding=Penalties Outstanding
-label.column.Penalties.Overdue=Penalties Overdue
-
-
-
-lable.title.Portfolio.At.Risk.By.Branch=Portfolio At Risk By Branch
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index cc3a0b4..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Portfolio at Risk(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 653f768..0000000
--- a/fineract-provider/src/main/pentahoReports/Portfolio at Risk.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-label.column.Currency=Currency
-label.column.Principal.Outstanding=Principal Outstanding
-label.column.Principal.Overdue=Principal Overdue
-label.column.Interest.Outstanding=Interest Outstanding
-label.column.Interest.Overdue=Interest Overdue
-label.column.Fees.Outstanding=Fees Outstanding
-label.column.Fees.Overdue=Fees Overdue
-label.column.Penalties.Outstanding=Penalties Outstanding
-label.column.Penalties.Overdue=Penalties Overdue
-label.column.Portfolio.at.Risk.per=Portfolio at Risk %
-
-label.group.title.Branch=Branch
-lable.title.Portfolio.at.Risk=Portfolio at Risk
-
-
-
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 7d335d9..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Rescheduled Loans(Pentaho).prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 28c3058..0000000
--- a/fineract-provider/src/main/pentahoReports/Rescheduled Loans.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-label.column.Office/Branch=Office/Branch
-label.column.Currency=Currency
-label.column.Client.Account.No=Client Account No.
-label.column.Client.Name=Client Name
-label.column.Loan.AccountNo=Loan Account No.
-label.column.Product.Name=Product Name
-label.column.Disbursed.Date=Disbursed Date
-label.column.Written.Off.date=Written Off date
-label.column.Loan.Amount=Loan Amount
-label.column.Rescheduled.Principal=Rescheduled Principal
-label.column.Rescheduled.Interest=Rescheduled Interest
-label.column.Rescheduled.Fees=Rescheduled Fees
-label.column.Rescheduled.Penalties=Rescheduled Penalties
-label.column.Reason.For.Rescheduling=Reason For Rescheduling
-label.columnLoan.Officer.Name=Loan Officer Name
-label.group.title.Branch=Branch
-lable.title.Rescheduled.Loans=Rescheduled Loans
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 24c4500..0000000
--- a/fineract-provider/src/main/pentahoReports/Saving Account Statement.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-Saving_Account_Statement.=Saving Account Statement
-date.=Date
-transaction_type=Transaction type
-receipt_number=Receipt no
-Description.=Description
-Credited.=Credited
-Debited.=Debited
-Balance.=Balance
-transaction.=Patment Type
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index 7526b60..0000000
Binary files a/fineract-provider/src/main/pentahoReports/Saving Account Statement.prpt and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/f367fadd/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
deleted file mode 100644
index c4b5451..0000000
--- a/fineract-provider/src/main/pentahoReports/Saving Transaction.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-label.column.Transaction.ID=Transaction ID
-label.column.Transaction.Date=Transaction Date
-label.column.Transaction.Type=Transaction Type
-label.column.Debit=Debit
-label.column.Credit=Credit
-label.column.Balance=Balance
-label.column.Reversed=Reversed
-lable.title.Saving.Transaction=Client Saving Transaction
-lable.title.Transaction.from=Transaction From :
-lable.title.Saving.Transaction.To= To :
-lable.title.Client.Name=Client Name :
-lable.title.Savings.Account.Name/No=Account Name/No. :
-lable.title.
-