diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java index a3cc27768..3b40d32db 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java @@ -324,10 +324,9 @@ public class Loan extends AbstractPersistable { final LoanProduct loanProduct, final Fund fund, final Staff officer, final CodeValue loanPurpose, final LoanTransactionProcessingStrategy transactionProcessingStrategy, final LoanProductRelatedDetail loanRepaymentScheduleDetail, final Set loanCharges, - final Boolean syncDisbursementWithMeeting, final BigDecimal fixedEmiAmount, + final Set collateral, final Boolean syncDisbursementWithMeeting, final BigDecimal fixedEmiAmount, final Set disbursementDetails, final BigDecimal maxOutstandingLoanBalance) { final LoanStatus status = null; - final Set collateral = null; final Client client = null; return new Loan(accountNo, client, group, loanType, fund, officer, loanPurpose, transactionProcessingStrategy, loanProduct, loanRepaymentScheduleDetail, status, loanCharges, collateral, syncDisbursementWithMeeting, fixedEmiAmount, @@ -338,10 +337,9 @@ public class Loan extends AbstractPersistable { final Integer loanType, final LoanProduct loanProduct, final Fund fund, final Staff officer, final CodeValue loanPurpose, final LoanTransactionProcessingStrategy transactionProcessingStrategy, final LoanProductRelatedDetail loanRepaymentScheduleDetail, final Set loanCharges, - final Boolean syncDisbursementWithMeeting, final BigDecimal fixedEmiAmount, + final Set collateral, final Boolean syncDisbursementWithMeeting, final BigDecimal fixedEmiAmount, final Set disbursementDetails, final BigDecimal maxOutstandingLoanBalance) { final LoanStatus status = null; - final Set collateral = null; return new Loan(accountNo, client, group, loanType, fund, officer, loanPurpose, transactionProcessingStrategy, loanProduct, loanRepaymentScheduleDetail, status, loanCharges, collateral, syncDisbursementWithMeeting, fixedEmiAmount, disbursementDetails, maxOutstandingLoanBalance); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAssembler.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAssembler.java index ef62039e1..baa6da740 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAssembler.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAssembler.java @@ -232,13 +232,13 @@ public class LoanAssembler { loanApplication = Loan.newIndividualLoanApplicationFromGroup(accountNo, client, group, loanType.getId().intValue(), loanProduct, fund, loanOfficer, loanPurpose, loanTransactionProcessingStrategy, loanProductRelatedDetail, loanCharges, - syncDisbursementWithMeeting, fixedEmiAmount, disbursementDetails, maxOutstandingLoanBalance); + collateral, syncDisbursementWithMeeting, fixedEmiAmount, disbursementDetails, maxOutstandingLoanBalance); } else if (group != null) { loanApplication = Loan.newGroupLoanApplication(accountNo, group, loanType.getId().intValue(), loanProduct, fund, loanOfficer, - loanPurpose, loanTransactionProcessingStrategy, loanProductRelatedDetail, loanCharges, syncDisbursementWithMeeting, - fixedEmiAmount, disbursementDetails, maxOutstandingLoanBalance); + loanPurpose, loanTransactionProcessingStrategy, loanProductRelatedDetail, loanCharges, collateral, + syncDisbursementWithMeeting, fixedEmiAmount, disbursementDetails, maxOutstandingLoanBalance); } else if (client != null) { diff --git a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt index a3d8ffbb3..573e46847 100644 Binary files a/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt and b/mifosng-provider/src/main/pentahoReports/Client Saving Transactions.prpt differ diff --git a/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt b/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt index 44265e54c..79888b06f 100755 Binary files a/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt and b/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt differ