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

Merge branch '53' into develop

Browse Source
This commit is contained in:
Adi Narayana Raju
2016-03-28 15:39:55 +05:30
parent ae5d01a912 3c69d35da7
commit 8dfec9a375
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+1 -1
View File
@@ -4984,7 +4984,7 @@ public class Loan extends AbstractPersistable<Long> {
private LoanScheduleDTO getRecalculatedSchedule(final ScheduleGeneratorDTO generatorDTO) { private LoanScheduleDTO getRecalculatedSchedule(final ScheduleGeneratorDTO generatorDTO) {
if (!this.repaymentScheduleDetail().isInterestRecalculationEnabled() || isNpa || !isOpen()) { return null; } if (!this.repaymentScheduleDetail().isInterestRecalculationEnabled() || isNpa) { return null; }
final InterestMethod interestMethod = this.loanRepaymentScheduleDetail.getInterestMethod(); final InterestMethod interestMethod = this.loanRepaymentScheduleDetail.getInterestMethod();
final LoanScheduleGenerator loanScheduleGenerator = generatorDTO.getLoanScheduleFactory().create(interestMethod); final LoanScheduleGenerator loanScheduleGenerator = generatorDTO.getLoanScheduleFactory().create(interestMethod);
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
+1
View File
@@ -865,6 +865,7 @@ public class LoanCharge extends AbstractPersistable<Long> {
this.active = active; this.active = active;
if (!active) { if (!active) {
this.overdueInstallmentCharge = null; this.overdueInstallmentCharge = null;
this.loanTrancheDisbursementCharge = null;
this.clearLoanInstallmentCharges(); this.clearLoanInstallmentCharges();
} }
} }
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java
+2 -2
View File
@@ -29,11 +29,11 @@ import org.springframework.data.jpa.domain.AbstractPersistable;
@Table(name="m_loan_tranche_disbursement_charge") @Table(name="m_loan_tranche_disbursement_charge")
public class LoanTrancheDisbursementCharge extends AbstractPersistable<Long> { public class LoanTrancheDisbursementCharge extends AbstractPersistable<Long> {
@ManyToOne(cascade = CascadeType.ALL, optional = false) @ManyToOne
@JoinColumn(name = "loan_charge_id", referencedColumnName = "id", nullable = false) @JoinColumn(name = "loan_charge_id", referencedColumnName = "id", nullable = false)
private LoanCharge loancharge; private LoanCharge loancharge;
@ManyToOne(cascade = CascadeType.ALL, optional = false) @ManyToOne(cascade = CascadeType.PERSIST, optional = false)
@JoinColumn(name="disbursement_detail_id", referencedColumnName = "id", nullable = false) @JoinColumn(name="disbursement_detail_id", referencedColumnName = "id", nullable = false)
private LoanDisbursementDetails loanDisbursementDetails; private LoanDisbursementDetails loanDisbursementDetails;