From 2ae4f02414dfa7800d3f8d52530dc83ab2252173 Mon Sep 17 00:00:00 2001 From: venkatconflux Date: Wed, 20 Jan 2016 16:41:54 +0530 Subject: [PATCH] MIFOSX-2481 adding tranche - branch closure issue resolved --- .../portfolio/loanaccount/domain/Loan.java | 6 ++---- .../LoanWritePlatformServiceJpaRepositoryImpl.java | 4 +++- .../migrations/core_db/V288__overdraft_interest.sql | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java index 946a37156..dd5de5415 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java @@ -4758,8 +4758,8 @@ public class Loan extends AbstractPersistable { } public ChangedTransactionDetail updateDisbursementDateAndAmountForTranche(final LoanDisbursementDetails disbursementDetails, - final JsonCommand command, final List existingTransactionIds, final List existingReversedTransactionIds, - final Map actualChanges, final ScheduleGeneratorDTO scheduleGeneratorDTO, final AppUser currentUser) { + final JsonCommand command,final Map actualChanges, final ScheduleGeneratorDTO scheduleGeneratorDTO, + final AppUser currentUser) { final Locale locale = command.extractLocale(); validateAccountStatus(LoanEvent.LOAN_EDIT_MULTI_DISBURSE_DATE); final BigDecimal principal = command.bigDecimalValueOfParameterNamed(LoanApiConstants.updatedDisbursementPrincipalParameterName, @@ -4773,8 +4773,6 @@ public class Loan extends AbstractPersistable { command.stringValueOfParameterNamed(LoanApiConstants.disbursementIdParameterName)); actualChanges.put(LoanApiConstants.disbursementPrincipalParameterName, command.bigDecimalValueOfParameterNamed(LoanApiConstants.disbursementPrincipalParameterName, locale)); - existingTransactionIds.addAll(findExistingTransactionIds()); - existingReversedTransactionIds.addAll(findExistingReversedTransactionIds()); Collection loanDisburseDetails = this.getDisbursementDetails(); BigDecimal setPrincipalAmount = BigDecimal.ZERO; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java index 25991c0be..3997f6d61 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java @@ -2484,6 +2484,8 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf LoanDisbursementDetails loanDisbursementDetails) { final List existingTransactionIds = new ArrayList<>(); final List existingReversedTransactionIds = new ArrayList<>(); + existingTransactionIds.addAll(loan.findExistingTransactionIds()); + existingReversedTransactionIds.addAll(loan.findExistingReversedTransactionIds()); final Map changes = new LinkedHashMap<>(); LocalDate recalculateFrom = null; ScheduleGeneratorDTO scheduleGeneratorDTO = this.loanUtilService.buildScheduleGeneratorDTO(loan, recalculateFrom); @@ -2494,7 +2496,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf if (command.entityId() != null) { changedTransactionDetail = loan.updateDisbursementDateAndAmountForTranche(loanDisbursementDetails, command, - existingTransactionIds, existingReversedTransactionIds, changes, scheduleGeneratorDTO, currentUser); + changes, scheduleGeneratorDTO, currentUser); } else { // BigDecimal setAmount = loan.getApprovedPrincipal(); Collection loanDisburseDetails = loan.getDisbursementDetails(); diff --git a/mifosng-provider/src/main/resources/sql/migrations/core_db/V288__overdraft_interest.sql b/mifosng-provider/src/main/resources/sql/migrations/core_db/V288__overdraft_interest.sql index 5b6783311..ca3843f2e 100644 --- a/mifosng-provider/src/main/resources/sql/migrations/core_db/V288__overdraft_interest.sql +++ b/mifosng-provider/src/main/resources/sql/migrations/core_db/V288__overdraft_interest.sql @@ -1,8 +1,8 @@ ALTER TABLE `m_savings_account` -ADD COLUMN `nominal_annual_interest_rate_overdraft` DECIMAL(19,6) NULL DEFAULT NULL AFTER `overdraft_limit`, -ADD COLUMN `total_overdraft_interest_derived` DECIMAL(19,6) NULL DEFAULT NULL AFTER `total_interest_posted_derived`, -ADD COLUMN `min_overdraft_for_interest_calculation` DECIMAL(19,6) NULL DEFAULT NULL AFTER `nominal_annual_interest_rate_overdraft`; +ADD COLUMN `nominal_annual_interest_rate_overdraft` DECIMAL(19,6) NULL DEFAULT 0 AFTER `overdraft_limit`, +ADD COLUMN `total_overdraft_interest_derived` DECIMAL(19,6) NULL DEFAULT 0 AFTER `total_interest_posted_derived`, +ADD COLUMN `min_overdraft_for_interest_calculation` DECIMAL(19,6) NULL DEFAULT 0 AFTER `nominal_annual_interest_rate_overdraft`; ALTER TABLE `m_savings_product` -ADD COLUMN `nominal_annual_interest_rate_overdraft` DECIMAL(19,6) NULL DEFAULT NULL AFTER `overdraft_limit`, -ADD COLUMN `min_overdraft_for_interest_calculation` DECIMAL(19,6) NULL DEFAULT NULL AFTER `nominal_annual_interest_rate_overdraft`; +ADD COLUMN `nominal_annual_interest_rate_overdraft` DECIMAL(19,6) NULL DEFAULT 0 AFTER `overdraft_limit`, +ADD COLUMN `min_overdraft_for_interest_calculation` DECIMAL(19,6) NULL DEFAULT 0 AFTER `nominal_annual_interest_rate_overdraft`;