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

Merge branch 'FINERACT-115' into develop

Browse Source
This commit is contained in:
Nazeer Hussain Shaik
2017-03-13 17:27:36 +05:30
parent f159e59c15 df93ce64db
commit 121df4eb08
2 changed files with 9 additions and 5 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
+7 -3
View File
@@ -5869,9 +5869,13 @@ public class Loan extends AbstractPersistableCustom<Long> {
return actualDisbursementDate; return actualDisbursementDate;
} }
public void addTrancheLoanCharge(Charge charge) { public void addTrancheLoanCharge(final Charge charge) {
if (!trancheCharges.contains(charge)) { final List<Charge> appliedCharges = new ArrayList<>();
trancheCharges.add(new LoanTrancheCharge(charge, this)); for(final LoanTrancheCharge loanTrancheCharge: this.trancheCharges){
appliedCharges.add(loanTrancheCharge.getCharge());
}
if (!appliedCharges.contains(charge)) {
this.trancheCharges.add(new LoanTrancheCharge(charge, this));
} }
} }
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class LoanTrancheDisbursementCharge extends AbstractPersistableCustom<Lon
@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.PERSIST, optional = false) @ManyToOne(cascade = CascadeType.ALL, 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;