You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ra...@apache.org on 2016/03/28 13:11:07 UTC
[1/4] incubator-fineract git commit: Populate Display Name as Full
Name when client is a Person
Repository: incubator-fineract
Updated Branches:
refs/heads/develop bba8ca47b -> 8dfec9a37
Populate Display Name as Full Name when client is a Person
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/b533916a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/b533916a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/b533916a
Branch: refs/heads/develop
Commit: b533916ab68fabab9444505bb5a8b9e0b1d39451
Parents: 9c38078
Author: jinjurajan <ji...@confluxtechnologies.com>
Authored: Thu Mar 24 16:14:15 2016 +0530
Committer: jinjurajan <ji...@confluxtechnologies.com>
Committed: Thu Mar 24 16:14:59 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/fineract/portfolio/client/domain/Client.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/b533916a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
index 6020c31..5ed9ad4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
@@ -679,6 +679,10 @@ public final class Client extends AbstractPersistable<Long> {
if (StringUtils.isNotBlank(this.lastname)) {
nameBuilder.append(this.lastname);
}
+
+ if (StringUtils.isNotBlank(this.fullname)) {
+ nameBuilder = new StringBuilder(this.fullname);
+ }
}
else if(LegalForm.fromInt(legalForm).isEntity())
{
[4/4] incubator-fineract git commit: Merge branch '53' into develop
Posted by ra...@apache.org.
Merge branch '53' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/8dfec9a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/8dfec9a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/8dfec9a3
Branch: refs/heads/develop
Commit: 8dfec9a3755436b8370d99d9f8a7085821bad9b1
Parents: ae5d01a 3c69d35
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Mon Mar 28 15:39:55 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Mon Mar 28 15:39:55 2016 +0530
----------------------------------------------------------------------
.../org/apache/fineract/portfolio/loanaccount/domain/Loan.java | 2 +-
.../apache/fineract/portfolio/loanaccount/domain/LoanCharge.java | 1 +
.../loanaccount/domain/LoanTrancheDisbursementCharge.java | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/8dfec9a3/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
----------------------------------------------------------------------
[2/4] incubator-fineract git commit: FINERACT-98:fix for deleting a
tranche
Posted by ra...@apache.org.
FINERACT-98:fix for deleting a tranche
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/3c69d35d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/3c69d35d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/3c69d35d
Branch: refs/heads/develop
Commit: 3c69d35da78d30902002c2c1cba5c54438584402
Parents: 9c38078
Author: sachinkulkarni12 <sa...@confluxtechnologies.com>
Authored: Fri Mar 25 11:01:55 2016 +0530
Committer: sachinkulkarni12 <sa...@confluxtechnologies.com>
Committed: Fri Mar 25 11:01:55 2016 +0530
----------------------------------------------------------------------
.../org/apache/fineract/portfolio/loanaccount/domain/Loan.java | 2 +-
.../apache/fineract/portfolio/loanaccount/domain/LoanCharge.java | 1 +
.../loanaccount/domain/LoanTrancheDisbursementCharge.java | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/3c69d35d/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
index ebc2b6c..e152d72 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java
@@ -4982,7 +4982,7 @@ public class Loan extends AbstractPersistable<Long> {
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 LoanScheduleGenerator loanScheduleGenerator = generatorDTO.getLoanScheduleFactory().create(interestMethod);
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/3c69d35d/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
index d76cf08..ee2c382 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java
@@ -865,6 +865,7 @@ public class LoanCharge extends AbstractPersistable<Long> {
this.active = active;
if (!active) {
this.overdueInstallmentCharge = null;
+ this.loanTrancheDisbursementCharge = null;
this.clearLoanInstallmentCharges();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/3c69d35d/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java
index 64830f9..fa65d0d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/LoanTrancheDisbursementCharge.java
@@ -29,11 +29,11 @@ import org.springframework.data.jpa.domain.AbstractPersistable;
@Table(name="m_loan_tranche_disbursement_charge")
public class LoanTrancheDisbursementCharge extends AbstractPersistable<Long> {
- @ManyToOne(cascade = CascadeType.ALL, optional = false)
+ @ManyToOne
@JoinColumn(name = "loan_charge_id", referencedColumnName = "id", nullable = false)
private LoanCharge loancharge;
- @ManyToOne(cascade = CascadeType.ALL, optional = false)
+ @ManyToOne(cascade = CascadeType.PERSIST, optional = false)
@JoinColumn(name="disbursement_detail_id", referencedColumnName = "id", nullable = false)
private LoanDisbursementDetails loanDisbursementDetails;
[3/4] incubator-fineract git commit: Merge branch '51' into develop
Posted by ra...@apache.org.
Merge branch '51' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/ae5d01a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/ae5d01a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/ae5d01a9
Branch: refs/heads/develop
Commit: ae5d01a912fad7ff3f13e359584cce48a2e77c74
Parents: bba8ca4 b533916
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Mon Mar 28 15:39:40 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Mon Mar 28 15:39:40 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/fineract/portfolio/client/domain/Client.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------