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

fix for issue with apply charges event

Browse Source
This commit is contained in:
Vishwas Babu AJ
2013-05-27 16:39:28 +05:30
parent 421623359e
commit afaa4ba372
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class GLAccountReadPlatformServiceImpl implements GLAccountReadPlatformSe
final EnumOptionData usage = AccountingEnumerations.gLAccountUsage(usageId); final EnumOptionData usage = AccountingEnumerations.gLAccountUsage(usageId);
final String description = rs.getString("description"); final String description = rs.getString("description");
final String nameDecorated = rs.getString("nameDecorated"); final String nameDecorated = rs.getString("nameDecorated");
final Long codeId = rs.wasNull()? null : rs.getLong("codeId"); final Long codeId = rs.wasNull() ? null : rs.getLong("codeId");
final String codeValue = rs.getString("codeValue"); final String codeValue = rs.getString("codeValue");
CodeValueData tagId = CodeValueData.instance(codeId, codeValue); CodeValueData tagId = CodeValueData.instance(codeId, codeValue);
return new GLAccountData(id, name, parentId, glCode, disabled, manualEntriesAllowed, accountType, usage, description, return new GLAccountData(id, name, parentId, glCode, disabled, manualEntriesAllowed, accountType, usage, description,
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+3 -6
View File
@@ -694,13 +694,13 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
final List<Long> existingReversedTransactionIds = new ArrayList<Long>(); final List<Long> existingReversedTransactionIds = new ArrayList<Long>();
this.loanChargeRepository.save(loanCharge); this.loanChargeRepository.save(loanCharge);
final LoanTransaction applyLoanChargeTransaction = loan.handleChargeAppliedTransaction(loanCharge, null);
final ChangedTransactionDetail changedTransactionDetail = loan.addLoanCharge(loanCharge, existingTransactionIds, final ChangedTransactionDetail changedTransactionDetail = loan.addLoanCharge(loanCharge, existingTransactionIds,
existingReversedTransactionIds); existingReversedTransactionIds);
// we want to apply charge transactions only for those loans charges // we want to apply charge transactions only for those loans charges
// that are applied when a loan is active // that are applied when a loan is active
if (loan.status().isActive()) { if (loan.status().isActive()) {
final LoanTransaction applyLoanChargeTransaction = loan.handleChargeAppliedTransaction(loanCharge, null);
this.loanTransactionRepository.save(applyLoanChargeTransaction); this.loanTransactionRepository.save(applyLoanChargeTransaction);
/*** /***
* TODO Vishwas Batch save is giving me a * TODO Vishwas Batch save is giving me a
@@ -714,12 +714,9 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
this.loanTransactionRepository.save(loanTransaction); this.loanTransactionRepository.save(loanTransaction);
} }
} }
}
this.loanRepository.save(loan); this.loanRepository.save(loan);
// we post Journal entries only for loans in active status
// we post Journal entries only for loans in active status
if (loan.status().isActive()) {
postJournalEntries(loan, existingTransactionIds, existingReversedTransactionIds); postJournalEntries(loan, existingTransactionIds, existingReversedTransactionIds);
} }