From c79b876193709117daf8b32edd2f91bc1ac6b63e Mon Sep 17 00:00:00 2001
From: ashok-conflux <ashok@confluxtechnologies.com>
Date: Tue, 8 Oct 2013 13:42:24 +0530
Subject: [PATCH] Allow adjustment of deposited amount if there are any
 charges/withdrawan transactions on same day

---
 api-docs/apiLive.htm                                     | 5 +++--
 .../savings/domain/SavingsAccountTransaction.java        | 4 ++++
 .../domain/SavingsAccountTransactionComparator.java      | 9 +++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

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
 }
 					</code>
@@ -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<Long> {
     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<SavingsAc
                 compareResult = -1;
             } else if (!o1.isInterestPostingAndNotReversed() && o2.isInterestPostingAndNotReversed()) {
                 compareResult = 1;
+            } else if (!o1.isDepositAndNotReversed() && o2.isDepositAndNotReversed()) {
+                // push all deposit transactions before charge/withdrawal transactions on same day.
+                // activation charge is charged on account activation date, any
+                // adjustments with deposit amount
+                // resulting into negative balance, to fix this push deposit
+                // transactions before charge/withdrawal charges transactions.
+                compareResult = 1;
+            } else if (o1.isDepositAndNotReversed() && !o2.isDepositAndNotReversed()) {
+                compareResult = -1;
             } else {
                 compareResult = 0;
             }