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

Merge pull request #1572 from rajuan/MIFOSX-2207

Browse Source 
MIFOSX-2207 : Fixed outstanding balance calculation to exclude transfer transactions
This commit is contained in:
pramod
2015-12-22 14:05:35 +05:30
parent a5e915d456 c2744eafea
commit 782160c912
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
+11 -4
View File
@@ -3080,7 +3080,9 @@ public class Loan extends AbstractPersistable<Long> {
private List<LoanTransaction> retreiveListOfTransactionsPostDisbursement() { private List<LoanTransaction> retreiveListOfTransactionsPostDisbursement() {
final List<LoanTransaction> repaymentsOrWaivers = new ArrayList<>(); final List<LoanTransaction> repaymentsOrWaivers = new ArrayList<>();
for (final LoanTransaction transaction : this.loanTransactions) { for (final LoanTransaction transaction : this.loanTransactions) {
if (!transaction.isDisbursement() && transaction.isNotReversed()) { if (transaction.isNotReversed()
&& !(transaction.isDisbursement()
|| transaction.isNonMonetaryTransaction())) {
repaymentsOrWaivers.add(transaction); repaymentsOrWaivers.add(transaction);
} }
} }
@@ -3092,8 +3094,11 @@ public class Loan extends AbstractPersistable<Long> {
public List<LoanTransaction> retreiveListOfTransactionsPostDisbursementExcludeAccruals() { public List<LoanTransaction> retreiveListOfTransactionsPostDisbursementExcludeAccruals() {
final List<LoanTransaction> repaymentsOrWaivers = new ArrayList<>(); final List<LoanTransaction> repaymentsOrWaivers = new ArrayList<>();
for (final LoanTransaction transaction : this.loanTransactions) { for (final LoanTransaction transaction : this.loanTransactions) {
if (!transaction.isDisbursement() && transaction.isNotReversed() && !transaction.isAccrual() if (transaction.isNotReversed()
&& !transaction.isRepaymentAtDisbursement()) { && !(transaction.isDisbursement()
|| transaction.isAccrual()
|| transaction.isRepaymentAtDisbursement()
|| transaction.isNonMonetaryTransaction())) {
repaymentsOrWaivers.add(transaction); repaymentsOrWaivers.add(transaction);
} }
} }
@@ -3105,7 +3110,9 @@ public class Loan extends AbstractPersistable<Long> {
private List<LoanTransaction> retreiveListOfTransactionsExcludeAccruals() { private List<LoanTransaction> retreiveListOfTransactionsExcludeAccruals() {
final List<LoanTransaction> repaymentsOrWaivers = new ArrayList<>(); final List<LoanTransaction> repaymentsOrWaivers = new ArrayList<>();
for (final LoanTransaction transaction : this.loanTransactions) { for (final LoanTransaction transaction : this.loanTransactions) {
if (transaction.isNotReversed() && !transaction.isAccrual()) { if (transaction.isNotReversed()
&& !(transaction.isAccrual()
|| transaction.isNonMonetaryTransaction())) {
repaymentsOrWaivers.add(transaction); repaymentsOrWaivers.add(transaction);
} }
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanTransaction.java
+10
View File
@@ -617,6 +617,16 @@ public final class LoanTransaction extends AbstractPersistable<Long> {
public boolean isAccrual() { public boolean isAccrual() {
return LoanTransactionType.ACCRUAL.equals(getTypeOf()) && isNotReversed(); return LoanTransactionType.ACCRUAL.equals(getTypeOf()) && isNotReversed();
} }
public boolean isNonMonetaryTransaction(){
return isNotReversed()
&& (LoanTransactionType.CONTRA.equals(getTypeOf())
|| LoanTransactionType.MARKED_FOR_RESCHEDULING.equals(getTypeOf())
|| LoanTransactionType.APPROVE_TRANSFER.equals(getTypeOf())
|| LoanTransactionType.INITIATE_TRANSFER.equals(getTypeOf())
|| LoanTransactionType.REJECT_TRANSFER.equals(getTypeOf())
|| LoanTransactionType.WITHDRAW_TRANSFER.equals(getTypeOf()));
}
public void updateOutstandingLoanBalance(BigDecimal outstandingLoanBalance) { public void updateOutstandingLoanBalance(BigDecimal outstandingLoanBalance) {
this.outstandingLoanBalance = outstandingLoanBalance; this.outstandingLoanBalance = outstandingLoanBalance;