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

Merge branch 'FINERACT-205' into develop

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2017-05-05 18:35:09 +05:30
parent 2efae80c1d 6c60d84a85
commit 0c658956b9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+5 -1
View File
@@ -3874,7 +3874,11 @@ public class Loan extends AbstractPersistableCustom<Long> {
return disbursementDate; return disbursementDate;
} }
public LocalDate getWrittenOffDate() { public void setActualDisbursementDate(Date actualDisbursementDate) {
this.actualDisbursementDate = actualDisbursementDate;
}
public LocalDate getWrittenOffDate() {
LocalDate writtenOffDate = null; LocalDate writtenOffDate = null;
if (this.writtenOffOnDate != null) { if (this.writtenOffOnDate != null) {
writtenOffDate = new LocalDate(this.writtenOffOnDate); writtenOffDate = new LocalDate(this.writtenOffOnDate);
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+3
View File
@@ -261,6 +261,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
final Loan loan = this.loanAssembler.assembleFrom(loanId); final Loan loan = this.loanAssembler.assembleFrom(loanId);
final LocalDate actualDisbursementDate = command.localDateValueOfParameterNamed("actualDisbursementDate"); final LocalDate actualDisbursementDate = command.localDateValueOfParameterNamed("actualDisbursementDate");
// validate ActualDisbursement Date Against Expected Disbursement Date // validate ActualDisbursement Date Against Expected Disbursement Date
LoanProduct loanProduct = loan.loanProduct(); LoanProduct loanProduct = loan.loanProduct();
if(loanProduct.syncExpectedWithDisbursementDate()){ if(loanProduct.syncExpectedWithDisbursementDate()){
@@ -278,6 +279,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
checkForProductMixRestrictions(loan); checkForProductMixRestrictions(loan);
LocalDate recalculateFrom = null; LocalDate recalculateFrom = null;
loan.setActualDisbursementDate(actualDisbursementDate.toDate());
ScheduleGeneratorDTO scheduleGeneratorDTO = this.loanUtilService.buildScheduleGeneratorDTO(loan, recalculateFrom); ScheduleGeneratorDTO scheduleGeneratorDTO = this.loanUtilService.buildScheduleGeneratorDTO(loan, recalculateFrom);
// validate actual disbursement date against meeting date // validate actual disbursement date against meeting date
@@ -688,6 +690,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
final ApplicationCurrency applicationCurrency = this.applicationCurrencyRepository.findOneWithNotFoundDetection(currency); final ApplicationCurrency applicationCurrency = this.applicationCurrencyRepository.findOneWithNotFoundDetection(currency);
final LocalDate recalculateFrom = null; final LocalDate recalculateFrom = null;
loan.setActualDisbursementDate(null);
ScheduleGeneratorDTO scheduleGeneratorDTO = this.loanUtilService.buildScheduleGeneratorDTO(loan, recalculateFrom); ScheduleGeneratorDTO scheduleGeneratorDTO = this.loanUtilService.buildScheduleGeneratorDTO(loan, recalculateFrom);
final Map<String, Object> changes = loan.undoDisbursal(scheduleGeneratorDTO, existingTransactionIds, final Map<String, Object> changes = loan.undoDisbursal(scheduleGeneratorDTO, existingTransactionIds,