From 17b87c18a311267cd2f1d8c8fd32bb3f578b0edb Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Mon, 9 Sep 2013 06:06:40 +0530 Subject: [PATCH 1/2] minor fixes to transfer functionality --- .../mifosplatform/portfolio/loanaccount/domain/Loan.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 706b58efc..f937d5f81 100644 --- 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 @@ -1821,6 +1821,9 @@ public class Loan extends AbstractPersistable { existingTransactionIds.addAll(findExistingTransactionIds()); existingReversedTransactionIds.addAll(findExistingReversedTransactionIds()); + validateActivityNotBeforeClientOrGroupTransferDate(LoanEvent.LOAN_REPAYMENT_OR_WAIVER, + transactionForAdjustment.getTransactionDate()); + if (transactionForAdjustment.isNotRepayment() && transactionForAdjustment.isNotWaiver()) { final String errorMessage = "Only transactions of type repayment or waiver can be adjusted."; throw new InvalidLoanTransactionTypeException("transaction", "adjustment.is.only.allowed.to.repayment.or.waiver.transaction", @@ -2698,14 +2701,14 @@ public class Loan extends AbstractPersistable { postfix = "cannot.be.before.client.transfer.date"; break; case LOAN_DISBURSAL_UNDO: - errorMessage = "The date on which a loan is disbursed cannot be earlier than client's transfer date to this office"; + errorMessage = "Cannot undo a disbursal done in another branch"; action = "disbursal"; postfix = "cannot.be.undone.before.client.transfer.date"; break; case LOAN_REPAYMENT_OR_WAIVER: errorMessage = "The date on which a repayment or waiver is made cannot be earlier than client's transfer date to this office"; action = "repayment.or.waiver"; - postfix = "cannot.be.undone.before.client.transfer.date"; + postfix = "cannot.be.made.before.client.transfer.date"; break; case LOAN_REJECTED: errorMessage = "The date on which a loan is rejected cannot be earlier than client's transfer date to this office"; From fcacf1582d473282bd0002933b50d60ac6a90fc1 Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Mon, 9 Sep 2013 06:10:07 +0530 Subject: [PATCH 2/2] prep for 1.9.0 Release --- api-docs/apiLive.htm | 4 +++- mifosng-provider/gradle.properties | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm index a260fcd9f..ac6cd712d 100644 --- a/api-docs/apiLive.htm +++ b/api-docs/apiLive.htm @@ -2258,7 +2258,9 @@ Request Body: Content-Type: application/json Request Body: { - "note":"Due Diligence done and all documents received" + "destinationGroupId":"13", + "staffId":"1", + "note":"Due Diligence done and all documents received" } diff --git a/mifosng-provider/gradle.properties b/mifosng-provider/gradle.properties index fbc271f89..9f46c774a 100644 --- a/mifosng-provider/gradle.properties +++ b/mifosng-provider/gradle.properties @@ -1 +1 @@ -releaseVersion=1.8.1.RELEASE +releaseVersion=1.9.0.RELEASE