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

Merge branch 'FINERACT-182' into develop

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2016-06-23 17:42:43 +05:30
parent 91a51698fb 8894269543
commit e2b0084c96
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
+6 -6
View File
@@ -1890,9 +1890,9 @@ public class ClientLoanIntegrationTest {
loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
validateCharge(flatInstallmentFee, loanCharges, "50", "100.00", "50.0", "50.0");
this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", new JournalEntry(Float.valueOf("50.0"),
this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011", new JournalEntry(Float.valueOf("50.0"),
JournalEntry.TransactionType.CREDIT));
this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 September 2011",
this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 November 2011",
new JournalEntry(Float.valueOf("50.0"), JournalEntry.TransactionType.DEBIT));
System.out.println("----------Make repayment 2------------");
@@ -2079,9 +2079,9 @@ public class ClientLoanIntegrationTest {
loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
validateCharge(percentageInstallmentFee, loanCharges, "1", "61.19", "29.11", "29.70");
this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", new JournalEntry(Float.valueOf("29.7"),
this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011", new JournalEntry(Float.valueOf("29.7"),
JournalEntry.TransactionType.CREDIT));
this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 September 2011",
this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 November 2011",
new JournalEntry(Float.valueOf("29.7"), JournalEntry.TransactionType.DEBIT));
System.out.println("----------Make repayment 2------------");
@@ -2280,9 +2280,9 @@ public class ClientLoanIntegrationTest {
loanCharges = this.loanTransactionHelper.getLoanCharges(loanID);
validateCharge(amountPlusInterestPercentageInstallmentFee, loanCharges, "1", "63.02", "31.51", "31.51");
this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 September 2011", new JournalEntry(
this.journalEntryHelper.checkJournalEntryForAssetAccount(assetAccount, "20 November 2011", new JournalEntry(
Float.valueOf("31.51"), JournalEntry.TransactionType.CREDIT));
this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 September 2011",
this.journalEntryHelper.checkJournalEntryForExpenseAccount(expenseAccount, "20 November 2011",
new JournalEntry(Float.valueOf("31.51"), JournalEntry.TransactionType.DEBIT));
System.out.println("----------Make repayment 2------------");
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+9 -2
View File
@@ -972,9 +972,16 @@ public class Loan extends AbstractPersistable<Long> {
}
LocalDate transactionDate = getDisbursementDate();
if (loanCharge.isSpecifiedDueDate()) {
transactionDate = loanCharge.getDueLocalDate();
if (loanCharge.isDueDateCharge()) {
if (loanCharge.getDueLocalDate().isAfter(DateUtils.getLocalDateOfTenant())) {
transactionDate = DateUtils.getLocalDateOfTenant();
} else {
transactionDate = loanCharge.getDueLocalDate();
}
}else if(loanCharge.isInstalmentFee()){
transactionDate = loanCharge.getInstallmentLoanCharge(loanInstallmentNumber).getRepaymentInstallment().getDueDate();
}
scheduleGeneratorDTO.setRecalculateFrom(transactionDate);
updateSummaryWithTotalFeeChargesDueAtDisbursement(deriveSumTotalOfChargesDueAtDisbursement());
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
+4
View File
@@ -987,4 +987,8 @@ public class LoanCharge extends AbstractPersistable<Long> {
public boolean isTrancheDisbursementCharge() {
return ChargeTimeType.fromInt(this.chargeTime).equals(ChargeTimeType.TRANCHE_DISBURSEMENT);
}
public boolean isDueDateCharge() {
return this.dueDate != null;
}
}