From dcee94e732761f93e38b62b83b5ac85c24dfc0df Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Mon, 28 Apr 2014 18:01:36 +0530 Subject: [PATCH] MIFOSX-865 bug fixes for accruals batch job --- .../service/LoanAccrualWritePlatformServiceImpl.java | 3 ++- .../loanaccount/service/LoanReadPlatformServiceImpl.java | 2 +- .../service/LoanWritePlatformServiceJpaRepositoryImpl.java | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java index a0660b678..77e3712cb 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java @@ -145,7 +145,8 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat accountingBridgeData.put("officeId", loanScheduleAccrualData.getOfficeId()); accountingBridgeData.put("currency", loanScheduleAccrualData.getCurrencyData()); accountingBridgeData.put("cashBasedAccountingEnabled", false); - accountingBridgeData.put("accrualBasedAccountingEnabled", true); + accountingBridgeData.put("upfrontAccrualBasedAccountingEnabled", false); + accountingBridgeData.put("periodicAccrualBasedAccountingEnabled", true); final List> newLoanTransactions = new ArrayList>(); newLoanTransactions.add(transactionMap); diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java index 79e9473d4..383ff8e59 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java @@ -1321,7 +1321,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { .append(" where ((if(ls.fee_charges_waived_derived is null , ls.fee_charges_amount,(ls.fee_charges_amount-ls.fee_charges_waived_derived)) <> if(ls.accrual_fee_charges_derived is null,0, ls.accrual_fee_charges_derived))") .append(" or (if(ls.penalty_charges_waived_derived is null , ls.penalty_charges_amount,(ls.penalty_charges_amount-ls.penalty_charges_waived_derived)) <> if(ls.accrual_penalty_charges_derived is null,0,ls.accrual_penalty_charges_derived))") .append(" or (if(ls.interest_waived_derived is null , ls.interest_amount,(ls.interest_amount-ls.interest_waived_derived)) <> if(ls.accrual_interest_derived is null,0,ls.accrual_interest_derived)))") - .append(" and loan.loan_status_id=? and mpl.accounting_type=? and loan.is_npa=0"); + .append(" and loan.loan_status_id=? and mpl.accounting_type=? and loan.is_npa=0 and ls.duedate <= CURDATE()"); return this.jdbcTemplate.query(sqlBuilder.toString(), mapper, new Object[] { LoanStatus.ACTIVE.getValue(), AccountingRuleType.ACCRUAL_PERIODIC.getValue() }); } 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 dd4e7d2c8..fffa789c5 100644 --- 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 @@ -1790,7 +1790,6 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf } } - @SuppressWarnings("null") @Transactional public void applyChargeToOverdueLoanInstallment(final Long loanId, final Long loanChargeId, final Integer periodNumber, final JsonCommand command) {