Merge branch 'develop' of github.com:openMF/mifosx into develop
This commit is contained in:
+2
-1
@@ -2552,7 +2552,8 @@ 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.isDisbursement() && transaction.isNotReversed() && !transaction.isAccrual()
|
||||||
|
&& !transaction.isRepaymentAtDisbursement()) {
|
||||||
repaymentsOrWaivers.add(transaction);
|
repaymentsOrWaivers.add(transaction);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user