You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by sh...@apache.org on 2018/12/31 11:46:32 UTC

[fineract] 01/01: Merge pull request #470 from wkk91193/bulkimport-integration-loanrepayment-added-total-outstanding-amount-col

This is an automated email from the ASF dual-hosted git repository.

shruthirajaram pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git

commit 80261d0f10e422683c5cec19e73cbda6d4c487dd
Merge: 9324aaf 7a77cfd
Author: ShruthiRajaram <sh...@confluxtechnologies.com>
AuthorDate: Mon Dec 31 17:16:26 2018 +0530

    Merge pull request #470 from wkk91193/bulkimport-integration-loanrepayment-added-total-outstanding-amount-col
    
    FINERACT:681 Added total outstanding amount to loan repayment workbook

 .../constants/LoanRepaymentConstants.java          | 33 ++++++-----
 .../LoanRepaymentWorkbookPopulator.java            | 68 ++++++++++++++--------
 .../loanaccount/data/LoanAccountData.java          |  6 +-
 3 files changed, 68 insertions(+), 39 deletions(-)

diff --cc fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java
index fe3e8c5,adf9b67..55f24b8
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java
@@@ -213,9 -227,11 +227,11 @@@ public class LoanRepaymentWorkbookPopul
  			row = loanRepaymentSheet.createRow(rowIndex++);
  			writeString(LoanRepaymentConstants.LOOKUP_CLIENT_NAME_COL, row, loan.getClientName() + "(" + loan.getClientId() + ")");
  			writeString(LoanRepaymentConstants.LOOKUP_CLIENT_EXTERNAL_ID,row, clientIdToClientExternalId.get(loan.getClientId()));
 -			writeString(LoanRepaymentConstants.LOOKUP_ACCOUNT_NO_COL, row, Long.parseLong(loan.getAccountNo())+"-"+loan.getStatusStringValue());
 +			writeString(LoanRepaymentConstants.LOOKUP_ACCOUNT_NO_COL, row, loan.getAccountNo()+"-"+loan.getStatusStringValue());
  			writeString(LoanRepaymentConstants.LOOKUP_PRODUCT_COL, row, loan.getLoanProductName());
  			writeDouble(LoanRepaymentConstants.LOOKUP_PRINCIPAL_COL, row, loan.getPrincipal().doubleValue());
+ 			if (loan.getTotalOutstandingAmount() != null)
+ 				writeBigDecimal(LoanRepaymentConstants.LOOKUP_TOTAL_OUTSTANDING_AMOUNT_COL, row, loan.getTotalOutstandingAmount());
  			if (loan.getDisbursementDate() != null) {
  				try {
  					date = inputFormat.parse(loan.getDisbursementDate().toString());