From 103a4a0ee1cb4ff01563b5e8c3fe16e2cac13c90 Mon Sep 17 00:00:00 2001
From: Pramod Nuthakki <pramod@confluxtechnologies.com>
Date: Fri, 8 Aug 2014 10:33:51 +0530
Subject: [PATCH] MIFOSX-1421 : corrected remove installment charge and add a
 new installment charge issues

---
 .keystore                                        | Bin 0 -> 1380 bytes
 .../SchedulerJobsTestResults.java                |   2 +-
 .../portfolio/loanaccount/domain/Loan.java       |   2 +-
 .../portfolio/loanaccount/domain/LoanCharge.java |   1 +
 4 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100755 .keystore

diff --git a/.keystore b/.keystore
new file mode 100755
index 0000000000000000000000000000000000000000..7ed3e8b95ffac5fd0bad222c72b3774b8819becf
GIT binary patch
literal 1380
zcmezO_TO6u1_mY|W&~rllKkA{#1bIaM)TxZJD}7qgC?eJ27GK>+H8z0j9N^BjEt-d
zEKN*{Ue|48Y}&JU{yig?YwY2I=T2^~X*2%%b?4-xm%0@at6y-hk#3N9?DcWUCBF6Z
zt=Tl|)-!F8IF`1pRqJLAoAL)n!DT1zaz$<YTO_e*>ZGdIMj|g|qnCGz<=JgFohrPj
z{*8O7;kG+|SxVoP^KDyK8-<G<xV`nW)J$2H`C(i}e^l5O+|dfIyUU#!u28r4LGM|%
ztn3S##@q)IAGI&d_{aXf&gNm_dDgBgHd;q*KAPzkEp5AD-qcaA*Pp}MG~H0LG&I_}
z`C;YZFRc2$GSyojF~~gb;{1~ou!CXI492M1ljgzqdS-m%nLpjGw@lsZ67Qj9O>3Ii
zukgBXDlK7am%XuvjYDhk{R<@zSXyrXn0wzzg0n|-qmcDchlu6_t394AyQ5>!e_=^P
z-@;2##<!N8dvf=2ZcU(9{Gv#fMJARKUsrv#Ej=GIIn?ghnIrrQRT7o=U;ci;>Gc1z
zcE`5%#W97=?qx93-+NWEFt{%$+4fH<NATRB?l*2dLbs=7Gq9cgbLG%Fg>{;H%+*}{
zloxUwHt@{s<ui?&)f?<I)!Z=m;Uca$p?msE&8@c=c-E$hNOYUjm>$qBHF@Z4B)-|#
z^LE#b^sHW6^=baK_bm5#2^Jb#3P0OsvZ6~-Eh%_M!;vHE5%O{3mO16uAD2c4N$l&6
z`7>9-vMTRX(u4)`EMtOx+xA>p{PMxl60x&-yo-+BP+^jD{P5P8V}DTA*Y2l|j%jTV
zg7hcb@2cHeEB5+|+pgPJKCVld+j;)uPt#bxP?jtAp9RXgKUgX%Y_f1x>-O)H7)28D
zK2BM`o$=|(6F%nkQZ|=uKR;AjxUc^y-_h;aB^w|9uiEx_Y8__~`+<{+l6S1WJzeHx
z-!a>As(#45qu;Ibs_T|0lrGp37A`hn>Gr2*AI`b6!lZTaNpOm0jnFeSummRLWMD#$
zH)vu!v4EM0k%@^V;DgW|170>xtu~Lg@4UcN&B|a<V#sa4$;KSY!Y0g=nP(_uAOPZU
z2y<p97Ud<DBxWbV#Mp&7lM?gN6La#5QVnGdq(SPqghi6`^U`ukD-=pnlQZ)2bMn(O
zQ;Q9G47fnj+``N$sbz)&z{~{XF$=SoWfo_YCl(vXiSrs78yEtCv5~2XMHHB80_P5p
zs~YDchYm2)GdK1!7&LY=H8wJIgw47s|Es-t)3b>m+cjNIJiWB2Z4F;Fi_+RHS7u!m
zJH=sbqpoM7u(52;IbT6N@g2#A0j77Kav$I;iu>xfZL)n=z{|Kfow8Hb2Hs>oTsV8p
z>9e}0ixOB3@5r~cZqhGqYmnR{s5brJwZHG|jvUTfyJULZB@y}e8kc+41PIo*zA<KE
zW@KPQb{;VDn1SxHxGSh-wd2#S^}3ry-j~?l39D4tVS1XScS^~*E4s~TlN63dUor}L
zk>%KNK1Cq(%Cp)ak6Y6uHMP#I4|%Cyy+TrOS4Xe+zuH|No4DRjE!;ad>CNSzEsNs}
z_6Trm{Mzu>Ej!;Wl<S6S#g|tJoX>b#-Q`a2YkYlr<%7G&R~R>iINaF&Ez$M)t#ui5
QoR{|e);DS5URy8$0B~n5U;qFB

literal 0
HcmV?d00001

diff --git a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SchedulerJobsTestResults.java b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SchedulerJobsTestResults.java
index b8df3bf77..2a9871221 100644
--- a/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SchedulerJobsTestResults.java
+++ b/mifosng-provider/src/integrationTest/java/org/mifosplatform/integrationtests/SchedulerJobsTestResults.java
@@ -214,7 +214,7 @@ public class SchedulerJobsTestResults {
         Assert.assertNotNull(specifiedDueDateChargeId);
 
         this.loanTransactionHelper.addChargesForLoan(loanID,
-                LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(specifiedDueDateChargeId.toString()));
+                LoanTransactionHelper.getSpecifiedDueDateChargesForLoanAsJSON(specifiedDueDateChargeId.toString(), "12 March 2013", "100"));
         ArrayList<HashMap> chargesPendingState = this.loanTransactionHelper.getLoanCharges(loanID);
         Assert.assertEquals(1, chargesPendingState.size());
 
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 c24a82f30..dc38daa8a 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
@@ -622,7 +622,7 @@ public class Loan extends AbstractPersistable<Long> {
             final LocalDate lastRepaymentPeriodDueDate) {
         if (loanCharge.isSpecifiedDueDate()
                 && !loanCharge.isDueForCollectionFromAndUpToAndIncluding(disbursementDate, lastRepaymentPeriodDueDate)) {
-            final String defaultUserMessage = "This charge which is due at disbursement cannot be added as the loan is already disbursed.";
+            final String defaultUserMessage = "This charge with specified due date cannot be added as the it is not in schedule range.";
             throw new LoanChargeCannotBeAddedException("loanCharge", "specified.due.date.outside.range", defaultUserMessage,
                     getDisbursementDate(), getLastRepaymentPeriodDueDate(), loanCharge.name());
         }
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java
index 01a80d5fe..ffbfecc73 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java
@@ -824,6 +824,7 @@ public class LoanCharge extends AbstractPersistable<Long> {
         this.active = active;
         if (!active) {
             this.overdueInstallmentCharge = null;
+            this.clearLoanInstallmentCharges();
         }
     }