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

Merge pull request #1558 from Musoni/MIFOSX-2371

Browse Source 
MIFOSX-2371 fixed days in year issue
This commit is contained in:
pramod
2015-12-16 10:03:11 +05:30
parent 6961d3e97c 5384067737
commit e00f40f2bd
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/domain/LoanApplicationTerms.java
Regular → Executable
+9 -2
View File
@@ -786,10 +786,17 @@ public final class LoanApplicationTerms {
private long calculatePeriodsInOneYear(final PaymentPeriodsInOneYearCalculator calculator) { private long calculatePeriodsInOneYear(final PaymentPeriodsInOneYearCalculator calculator) {
long periodsInOneYear = calculator.calculate(this.repaymentPeriodFrequencyType).longValue(); //check if daysInYears is set if so change periodsInOneYear to days set in db
long periodsInOneYear;
boolean daysInYearToUse = (this.repaymentPeriodFrequencyType.getCode().equalsIgnoreCase("periodFrequencyType.days") && !this.daysInYearType.getCode().equalsIgnoreCase("DaysInYearType.actual"));
if(daysInYearToUse){
periodsInOneYear = this.daysInYearType.getValue().longValue();
}else{
periodsInOneYear = calculator.calculate(this.repaymentPeriodFrequencyType).longValue();
}
switch (this.interestCalculationPeriodMethod) { switch (this.interestCalculationPeriodMethod) {
case DAILY: case DAILY:
periodsInOneYear = calculator.calculate(PeriodFrequencyType.DAYS).longValue(); periodsInOneYear = (!this.daysInYearType.getCode().equalsIgnoreCase("DaysInYearType.actual")) ? this.daysInYearType.getValue().longValue() : calculator.calculate(PeriodFrequencyType.DAYS).longValue();
break; break;
case INVALID: case INVALID:
break; break;