diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm index 8cb5421f4..00f5860f0 100644 --- a/api-docs/apiLive.htm +++ b/api-docs/apiLive.htm @@ -11231,7 +11231,7 @@ Request Body: "amount": "230.56", "chargeTimeType": "1", "chargeCalculationType": "1", - "chargePaymentMode": "1" + "chargePaymentMode": "1", "active": true } @@ -11252,7 +11252,7 @@ Request Body: "chargeAppliesTo": "1", "chargeTimeType": "2", "chargeCalculationType": "2", - "chargeCalculationType": "1", + "chargePaymentMode": "1", "active": "true", "penalty": "true" } @@ -11275,6 +11275,7 @@ Request Body: "chargeAppliesTo": "2", "chargeTimeType": "6", "chargeCalculationType": "1", + "chargePaymentMode": "1", "active": "true", "penalty": "false" } diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountTransaction.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountTransaction.java index 88021b676..8aab38eaf 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountTransaction.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountTransaction.java @@ -205,6 +205,10 @@ public final class SavingsAccountTransaction extends AbstractPersistable { public boolean isDeposit() { return SavingsAccountTransactionType.fromInt(this.typeOf).isDeposit(); } + + public boolean isDepositAndNotReversed() { + return SavingsAccountTransactionType.fromInt(this.typeOf).isDeposit() && isNotReversed(); + } public boolean isWithdrawal() { return SavingsAccountTransactionType.fromInt(this.typeOf).isWithdrawal(); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountTransactionComparator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountTransactionComparator.java index 0d592f6ba..9e228e91e 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountTransactionComparator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/SavingsAccountTransactionComparator.java @@ -23,6 +23,15 @@ public class SavingsAccountTransactionComparator implements Comparator