From 0262d897273488f32725e958f2c7a279cbb4dae8 Mon Sep 17 00:00:00 2001 From: pramod Date: Sat, 11 Oct 2014 21:13:59 +0530 Subject: [PATCH 1/3] corrected charge payment accouting for accruals --- .../service/AccrualBasedAccountingProcessorForLoan.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java index d02661ed4..24da00cfb 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/AccrualBasedAccountingProcessorForLoan.java @@ -54,7 +54,7 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess || loanTransactionDTO.getTransactionType().isRepaymentAtDisbursement() || loanTransactionDTO.getTransactionType().isChargePayment()) { createJournalEntriesForRepaymentsAndWriteOffs(loanDTO, loanTransactionDTO, office, false, loanTransactionDTO - .getTransactionType().isRepaymentAtDisbursement() || loanTransactionDTO.getTransactionType().isChargePayment()); + .getTransactionType().isRepaymentAtDisbursement()); } /** Logic for handling recovery payments **/ From 30c73e32abf3c7ca9019be246dde30b7f8d1922f Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Sun, 12 Oct 2014 20:17:46 -0700 Subject: [PATCH 2/3] Update CHANGELOG.md for 1.25.0 Release --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e22a16453..b63cb609c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ See VERSIONING (https://github.com/openMF/mifosx/blob/master/VERSIONING.md) for Releases =============== -1. TBD Oct 2014 - 1.25.0.RELEASE +1. 12 Oct 2014 - 1.25.0.RELEASE 1. 10 Jul 2014 - 1.24.0.RELEASE 1. 16 Jun 2014 - 1.23.1.RELEASE 1. 15 Jun 2014 - 1.23.0.RELEASE @@ -69,7 +69,7 @@ Releases 1.25.0.RELEASE ============= -This feature release ships various enhancements like interest recalculation for loans with configurable rest definitions and compounding options, point in time accruals, improved pre-payment functionality and support for Hooks along with a number of updates to the Community app and bug fixes. +This feature release ships various enhancements like interest recalculation for loans with configurable rest definitions and compounding options, point in time accruals, improved pre-payment functionality, batching API calls and support for Hooks along with a number of updates to the Community app and bug fixes. New Features & Improvements From 511a0d89c00c38487794b069e0266f67fcbeeead Mon Sep 17 00:00:00 2001 From: Vishwas Babu A J Date: Sun, 12 Oct 2014 20:37:44 -0700 Subject: [PATCH 3/3] Update CHANGELOG.md removing issues that have not yet passed a round of testing from 1.25 release --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b63cb609c..29330c6c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,7 +82,6 @@ New Features & Improvements - [MIFOSX-1416] - Add batch jobs to run accruals with specific periodicity - [MIFOSX-1417] - Add API to add accrual transactions till specified date - [MIFOSX-1418] - Recalculate and adjust accruals for back dated entries - - [MIFOSX-1480] - Create an API for associating and dissociating groups from centers - [MIFOSX-1252] - Add API's for assigning and unassigning Staff for savings account (along with tracking assignment history similar to loans) - [MIFOSX-1265] - Ability to capture "External ID" for Savings account - [MIFOSX-1315] - Global search should search for saving account number and external id fields @@ -115,7 +114,6 @@ Bugs - [MIFOSX-1501] - Fixing Issues related to clean shutdown of Mifos Server: AbandonedCleanupThread and Quartz scheduler worker Threads. - [MIFOSX-1513] - If more than one repayment is done on today's date (i.e sysdate) loan got closed with overpaid status - [MIFOSX-1517] - For Tranche Loans interest is getting calculated with respect to the Approved amount than Disbursed amount - - [MIFOSX-1525] - In demo version not able to withdraw amount in RD account even allow withdrawals checkbox is enabled, displays internal server error - [MIFOSX-1528] - Missing Documentation: For Assign and Unassign Loan Officer - [MIFOSX-1531] - Not Appearing Loan Approval and Loan Disbursal in Checker Inbox & Tasks - [MIFOSX-1539] - In Loan account "First repayment on" is not working as expected @@ -144,11 +142,9 @@ Community App - [MIFOSX-1432] - Minor layout fixes to Organization Admin screens - [MIFOSX-1446] - In "Client savings transaction" page ( transaction page -> Export) different client name is displaying - [MIFOSX-1465] - UI and Label related issues - - [MIFOSX-1551] - System -> Audit trails- search is not working as expected - [MIFOSX-1430] - Activities search bar on home page doesn't populate with available activities or actually search - [MIFOSX-1433] - Products Views layout changes. - [MIFOSX-1455] - In Centers -> View Centers -> Create Group page members added is not displaying properly in Group General page - - [MIFOSX-1256] - Filter charge and overdue charges drop-down lists to display only valid charges (matching currency) - [MIFOSX-1325] - Add ability to attach a group to a center - [MIFOSX-1482] - Improve work-flow for adding Clients to a Group during its Creation - [MIFOSX-1574] - Unable to search for GL Accounts by GL Codes in "Add Journal Entries"