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

Merge pull request #1237 from chandrikamohith/MIFOSX-1776

Browse Source 
MIFOSX-1776 Sync repayment dates with meeting dates for Group Loan appli...
This commit is contained in:
Vishwas Babu A J
2015-01-07 22:50:45 -08:00
parent 653c534514 4cd7c79225
commit 0acf7c1498
1 changed files with 4 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/loanschedule/service/LoanScheduleAssembler.java
+4 -4
View File
@@ -176,12 +176,12 @@ public class LoanScheduleAssembler {
final AccountType loanType = AccountType.fromName(loanTypeStr); final AccountType loanType = AccountType.fromName(loanTypeStr);
/* /*
* If it is JLG loan then make sure loan frequency is same as * If it is JLG loan/Group Loan then make sure loan frequency is same as
* Group/Center meeting frequency or multiple of it. TODO: Check should * Group/Center meeting frequency or multiple of it. TODO: Check should
* be either same frequency or loan freq is multiple of center/group * be either same frequency or loan freq is multiple of center/group
* meeting freq multiples * meeting freq multiples
*/ */
if (loanType.isJLGAccount() && calendarId != null) { if ((loanType.isJLGAccount() || loanType.isGroupAccount()) && calendarId != null) {
calendar = this.calendarRepository.findOne(calendarId); calendar = this.calendarRepository.findOne(calendarId);
if (calendar == null) { throw new CalendarNotFoundException(calendarId); } if (calendar == null) { throw new CalendarNotFoundException(calendarId); }
final PeriodFrequencyType meetingPeriodFrequency = CalendarUtils.getMeetingPeriodFrequencyType(calendar.getRecurrence()); final PeriodFrequencyType meetingPeriodFrequency = CalendarUtils.getMeetingPeriodFrequencyType(calendar.getRecurrence());
@@ -199,10 +199,10 @@ public class LoanScheduleAssembler {
} }
/* /*
* If it is JLG loan synched with a meeting, then make sure first * If it is JLG loan/Group Loan synched with a meeting, then make sure first
* repayment falls on meeting date * repayment falls on meeting date
*/ */
if (loanType.isJLGAccount() && calendar != null) { if ((loanType.isJLGAccount() || loanType.isGroupAccount()) && calendar != null) {
validateRepaymentsStartDateWithMeetingDates(calculatedRepaymentsStartingFromDate, calendar); validateRepaymentsStartDateWithMeetingDates(calculatedRepaymentsStartingFromDate, calendar);
/* /*
* If disbursement is synced on meeting, make sure disbursement date * If disbursement is synced on meeting, make sure disbursement date