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

Merge pull request #1513 from Musoni/MIFOSX-2271

Browse Source 
MIFOSX-2271 done
This commit is contained in:
pramod
2015-09-24 09:57:38 +05:30
parent 2100fc806f 093a9844c6
commit b732fca525
2 changed files with 6 additions and 3 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
+5 -2
View File
@@ -905,7 +905,10 @@ public class Loan extends AbstractPersistable<Long> {
Money unrecognizedIncome = amountWaived.zero(); Money unrecognizedIncome = amountWaived.zero();
Money chargeComponent = amountWaived; Money chargeComponent = amountWaived;
if (isPeriodicAccrualAccountingEnabledOnLoanProduct()) { if (isPeriodicAccrualAccountingEnabledOnLoanProduct()) {
Money receivableCharge = accruedCharge.minus(loanCharge.getAmountPaid(getCurrency())); Money receivableCharge = Money.zero(getCurrency());
if(loanInstallmentNumber !=null){
receivableCharge = accruedCharge.minus(loanCharge.getInstallmentLoanCharge(loanInstallmentNumber).getAmountPaid(getCurrency()));
}else{ receivableCharge = accruedCharge.minus(loanCharge.getAmountPaid(getCurrency()));}
if (receivableCharge.isLessThanZero()) { if (receivableCharge.isLessThanZero()) {
receivableCharge = amountWaived.zero(); receivableCharge = amountWaived.zero();
} }
@@ -921,7 +924,7 @@ public class Loan extends AbstractPersistable<Long> {
feeChargesWaived = Money.zero(loanCurrency()); feeChargesWaived = Money.zero(loanCurrency());
} }
LocalDate transactionDate = getDisbursementDate(); LocalDate transactionDate = DateUtils.getLocalDateOfTenant();
if (loanCharge.isSpecifiedDueDate()) { if (loanCharge.isSpecifiedDueDate()) {
transactionDate = loanCharge.getDueLocalDate(); transactionDate = loanCharge.getDueLocalDate();
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanInstallmentCharge.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class LoanInstallmentCharge extends AbstractPersistable<Long> {
return Money.of(currency, this.amount); return Money.of(currency, this.amount);
} }
private Money getAmountPaid(final MonetaryCurrency currency) { public Money getAmountPaid(final MonetaryCurrency currency) {
return Money.of(currency, this.amountPaid); return Money.of(currency, this.amountPaid);
} }