fineract-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nazeer1100...@apache.org
Subject [1/2] incubator-fineract git commit: changes for fees
Date Wed, 27 Apr 2016 08:49:56 GMT
Repository: incubator-fineract
Updated Branches:
  refs/heads/develop 0480e0854 -> 4d8ad87d9


changes for fees


Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/a8374782
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/a8374782
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/a8374782

Branch: refs/heads/develop
Commit: a83747822beb691b4f92f4ba6d7af044a25e4bb7
Parents: 446ff44
Author: sachinkulkarni12 <sachin.kulkarni@confluxtechnologies.com>
Authored: Fri Apr 8 12:00:59 2016 +0530
Committer: sachinkulkarni12 <sachin.kulkarni@confluxtechnologies.com>
Committed: Fri Apr 8 12:33:43 2016 +0530

----------------------------------------------------------------------
 .../service/LoanChargeReadPlatformServiceImpl.java           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/a8374782/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java
index f38d87e..c2a908c 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanChargeReadPlatformServiceImpl.java
@@ -271,7 +271,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform
                 + " order by lc.charge_time_enum ASC, lc.due_for_collection_as_of_date ASC,
lc.is_penalty ASC";
 
         Collection<LoanChargeData> charges = this.jdbcTemplate.query(sql, rm,
-                new Object[] { LoanTransactionType.ACCRUAL.getValue(), loanId });
+                new Object[] { LoanTransactionType.ACCRUAL.getValue(), loanId, loanId });
         charges = updateLoanChargesWithUnrecognizedIncome(loanId, charges);
 
         Collection<LoanChargeData> removeCharges = new ArrayList<>();
@@ -311,7 +311,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform
             sb.append("select lcp.loan_charge_id, lcp.amount");
             sb.append(" from m_loan_charge_paid_by lcp ");
             sb.append(
-                    "inner join m_loan_transaction lt on lt.id = lcp.loan_transaction_id
and lt.is_reversed = 0 and lt.transaction_type_enum = ?");
+                    "inner join m_loan_transaction lt on lt.id = lcp.loan_transaction_id
and lt.is_reversed = 0 and lt.transaction_type_enum = ? and lt.loan_id = ?");
             sb.append(") cp on  cp.loan_charge_id= lc.id  ");
 
             schemaSql = sb.toString();
@@ -348,7 +348,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform
         final String sql = "select " + rm.schema() + " where lc.loan_id=? AND lc.is_active
= 1 group by  lc.id "
                 + " order by lc.charge_time_enum ASC, lc.due_for_collection_as_of_date ASC,
lc.is_penalty ASC";
 
-        return this.jdbcTemplate.query(sql, rm, new Object[] { LoanTransactionType.WAIVE_CHARGES.getValue(),
loanId });
+        return this.jdbcTemplate.query(sql, rm, new Object[] { LoanTransactionType.WAIVE_CHARGES.getValue(),
loanId, loanId });
 
     }
 
@@ -371,7 +371,7 @@ public class LoanChargeReadPlatformServiceImpl implements LoanChargeReadPlatform
             sb.append("select cpb.loan_charge_id, lt.unrecognized_income_portion");
             sb.append(" from m_loan_charge_paid_by cpb ");
             sb.append(
-                    "inner join m_loan_transaction lt on lt.id = cpb.loan_transaction_id
and lt.is_reversed = 0 and lt.transaction_type_enum = ?");
+                    "inner join m_loan_transaction lt on lt.id = cpb.loan_transaction_id
and lt.is_reversed = 0 and lt.transaction_type_enum = ?  and lt.loan_id = ? ");
             sb.append(") wt on  wt.loan_charge_id= lc.id  ");
 
             schemaSql = sb.toString();


Mime
View raw message