From ade1bd38cffda9f2103a0971756c6c14809b9a59 Mon Sep 17 00:00:00 2001 From: Pramod Nuthakki Date: Tue, 18 Feb 2014 11:25:52 +0530 Subject: [PATCH] MIFOSX-92 - modified column names --- .../core_db/V147__tranche_loans_column_name_changes.sql | 4 ++++ .../loanaccount/service/LoanReadPlatformServiceImpl.java | 2 +- .../loanproduct/domain/LoanProductTrancheDetails.java | 6 +++--- .../service/LoanProductReadPlatformServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100755 mifosng-db/migrations/core_db/V147__tranche_loans_column_name_changes.sql diff --git a/mifosng-db/migrations/core_db/V147__tranche_loans_column_name_changes.sql b/mifosng-db/migrations/core_db/V147__tranche_loans_column_name_changes.sql new file mode 100755 index 000000000..dc92a1193 --- /dev/null +++ b/mifosng-db/migrations/core_db/V147__tranche_loans_column_name_changes.sql @@ -0,0 +1,4 @@ +ALTER TABLE `m_product_loan` + CHANGE COLUMN `multi_disburse_loan` `allow_multiple_disbursals` TINYINT(1) NOT NULL DEFAULT '0' AFTER `close_date`, + CHANGE COLUMN `max_tranche_count` `max_disbursals` INT(2) NULL DEFAULT NULL AFTER `allow_multiple_disbursals`, + CHANGE COLUMN `outstanding_loan_balance` `max_outstanding_loan_balance` DECIMAL(19,6) NULL DEFAULT NULL AFTER `max_disbursals`; \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java index 014bb1561..3add305cd 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java @@ -419,7 +419,7 @@ public class LoanReadPlatformServiceImpl implements LoanReadPlatformService { return "l.id as id, l.account_no as accountNo, l.external_id as externalId, l.fund_id as fundId, f.name as fundName," + " l.loan_type_enum as loanType, l.loanpurpose_cv_id as loanPurposeId, cv.code_value as loanPurposeName," + " lp.id as loanProductId, lp.name as loanProductName, lp.description as loanProductDescription," - + " lp.multi_disburse_loan as multiDisburseLoan," + + " lp.allow_multiple_disbursals as multiDisburseLoan," + " c.id as clientId, c.display_name as clientName, c.office_id as clientOfficeId," + " g.id as groupId, g.display_name as groupName," + " g.office_id as groupOfficeId, g.staff_id As groupStaffId , g.parent_id as groupParentId, " diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductTrancheDetails.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductTrancheDetails.java index 910175fdd..3144a225b 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductTrancheDetails.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductTrancheDetails.java @@ -12,13 +12,13 @@ import org.mifosplatform.portfolio.loanproduct.LoanProductConstants; @Embeddable public class LoanProductTrancheDetails { - @Column(name = "multi_disburse_loan") + @Column(name = "allow_multiple_disbursals") private boolean multiDisburseLoan; - @Column(name = "max_tranche_count", nullable = false) + @Column(name = "max_disbursals", nullable = false) private Integer maxTrancheCount; - @Column(name = "outstanding_loan_balance", scale = 6, precision = 19, nullable = false) + @Column(name = "max_outstanding_loan_balance", scale = 6, precision = 19, nullable = false) private BigDecimal outstandingLoanBalance; protected LoanProductTrancheDetails() { diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java index 33c107210..afdf71c25 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java @@ -120,7 +120,7 @@ public class LoanProductReadPlatformServiceImpl implements LoanProductReadPlatfo + "lp.grace_on_principal_periods as graceOnPrincipalPayment, lp.grace_on_interest_periods as graceOnInterestPayment, lp.grace_interest_free_periods as graceOnInterestCharged," + "lp.amortization_method_enum as amortizationMethod, lp.arrearstolerance_amount as tolerance, " + "lp.accounting_type as accountingType, lp.include_in_borrower_cycle as includeInBorrowerCycle,lp.use_borrower_cycle as useBorrowerCycle, lp.start_date as startDate, lp.close_date as closeDate, " - + "lp.multi_disburse_loan as multiDisburseLoan, lp.max_tranche_count as maxTrancheCount, lp.outstanding_loan_balance as outstandingLoanBalance, " + + "lp.allow_multiple_disbursals as multiDisburseLoan, lp.max_disbursals as maxTrancheCount, lp.max_outstanding_loan_balance as outstandingLoanBalance, " + "curr.name as currencyName, curr.internationalized_name_code as currencyNameCode, curr.display_symbol as currencyDisplaySymbol, lp.external_id as externalId " + " from m_product_loan lp " + " left join m_fund f on f.id = lp.fund_id"