From b8b5d91bc26d8e526295f88d093c1f669738aef4 Mon Sep 17 00:00:00 2001 From: Madhukar Date: Sun, 20 Jul 2014 14:31:23 +0530 Subject: [PATCH] MIFOSX-1446,MIFOSX-1445,MIFOSX-1426 --- .../portfolio/loanaccount/domain/Loan.java | 6 ++---- .../loanaccount/service/LoanAssembler.java | 6 +++--- .../Client Saving Transactions.prpt | Bin 7438 -> 7550 bytes .../Client Savings Summary.prpt | Bin 15981 -> 15945 bytes 4 files changed, 5 insertions(+), 7 deletions(-) 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 a3d8ffbb3080646d1e9098bdcb6361f2ce3063fa..573e46847c6367c9a85b668bfa7b2105e3e7d3a6 100644 GIT binary patch delta 2522 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 XPA436z9TQcY!LYZT$YI+`g8I>W_lWC diff --git a/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt b/mifosng-provider/src/main/pentahoReports/Client Savings Summary.prpt index 44265e54c1707f83e9da48908e1967b3c3841421..79888b06fda596004a1563db38635ec7fdd11350 100755 GIT binary patch delta 3118 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 delta 3154 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 o{=aqt@5