undo temporary bug fixes made for 1.25 release

This commit is contained in:
Vishwas Babu A J
2014-10-13 00:42:03 -07:00
parent 07d054cbec
commit 76e1c819a4
@@ -14,7 +14,6 @@ import org.mifosplatform.accounting.common.AccountingConstants.CASH_ACCOUNTS_FOR
import org.mifosplatform.accounting.common.AccountingConstants.FINANCIAL_ACTIVITY;
import org.mifosplatform.accounting.journalentry.data.LoanDTO;
import org.mifosplatform.accounting.journalentry.data.LoanTransactionDTO;
import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
import org.mifosplatform.organisation.office.domain.Office;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,13 +36,6 @@ public class AccrualBasedAccountingProcessorForLoan implements AccountingProcess
final Date transactionDate = loanTransactionDTO.getTransactionDate();
this.helper.checkForBranchClosures(latestGLClosure, transactionDate);
// FIXME Disable charge and Interest Waivers for Periodic accounting
if (loanDTO.isPeriodicAccrualBasedAccountingEnabled()
|| (loanTransactionDTO.getTransactionType().isWaiveCharges() && loanTransactionDTO.getTransactionType()
.isWaiveInterest())) { throw new PlatformDataIntegrityException(
"Restricted functionality with Periodic Accrual accounting...charge and interest waivers are not allowed",
"Restricted functionality with Periodic Accrual accounting...charge and interest waivers are not allowed"); }
/** Handle Disbursements **/
if (loanTransactionDTO.getTransactionType().isDisbursement()) {
createJournalEntriesForDisbursements(loanDTO, loanTransactionDTO, office);