CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 19 Packages Projects Releases Wiki Activity

Merge pull request #573 from vishwasbabu/develop

Browse Source 
Develop
This commit is contained in:
Vishwas Babu A J
2013-09-08 17:48:03 -07:00
parent 74b0b82d1f fcacf1582d
commit 0297757f50
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api-docs/apiLive.htm
+3 -1
View File
@@ -2258,7 +2258,9 @@ Request Body:
Content-Type: application/json Content-Type: application/json
Request Body: Request Body:
{ {
"note":"Due Diligence done and all documents received" "destinationGroupId":"13",
"staffId":"1",
"note":"Due Diligence done and all documents received"
} }
</code> </code>
<code class="method-response"> <code class="method-response">
mifosng-provider/gradle.properties
+1 -1
View File
@@ -1 +1 @@
releaseVersion=1.8.1.RELEASE releaseVersion=1.9.0.RELEASE
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
+5 -2
View File
@@ -1821,6 +1821,9 @@ public class Loan extends AbstractPersistable<Long> {
existingTransactionIds.addAll(findExistingTransactionIds()); existingTransactionIds.addAll(findExistingTransactionIds());
existingReversedTransactionIds.addAll(findExistingReversedTransactionIds()); existingReversedTransactionIds.addAll(findExistingReversedTransactionIds());
validateActivityNotBeforeClientOrGroupTransferDate(LoanEvent.LOAN_REPAYMENT_OR_WAIVER,
transactionForAdjustment.getTransactionDate());
if (transactionForAdjustment.isNotRepayment() && transactionForAdjustment.isNotWaiver()) { if (transactionForAdjustment.isNotRepayment() && transactionForAdjustment.isNotWaiver()) {
final String errorMessage = "Only transactions of type repayment or waiver can be adjusted."; 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", throw new InvalidLoanTransactionTypeException("transaction", "adjustment.is.only.allowed.to.repayment.or.waiver.transaction",
@@ -2698,14 +2701,14 @@ public class Loan extends AbstractPersistable<Long> {
postfix = "cannot.be.before.client.transfer.date"; postfix = "cannot.be.before.client.transfer.date";
break; break;
case LOAN_DISBURSAL_UNDO: 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"; action = "disbursal";
postfix = "cannot.be.undone.before.client.transfer.date"; postfix = "cannot.be.undone.before.client.transfer.date";
break; break;
case LOAN_REPAYMENT_OR_WAIVER: 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"; 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"; action = "repayment.or.waiver";
postfix = "cannot.be.undone.before.client.transfer.date"; postfix = "cannot.be.made.before.client.transfer.date";
break; break;
case LOAN_REJECTED: case LOAN_REJECTED:
errorMessage = "The date on which a loan is rejected cannot be earlier than client's transfer date to this office"; errorMessage = "The date on which a loan is rejected cannot be earlier than client's transfer date to this office";