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

fix conflicts with recent commits.

Browse Source
This commit is contained in:
Keith Woodlock
2012-09-13 17:43:27 +01:00
parent b438747608
commit c1c92fef3c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java
+2 -2
View File
@@ -183,7 +183,7 @@ public class LoansApiResource {
"repaymentFrequencyType", "interestRateFrequencyType", "amortizationType", "interestType", "interestCalculationPeriodType",
"submittedOnDate", "approvedOnDate", "expectedDisbursementDate", "actualDisbursementDate",
"expectedFirstRepaymentOnDate", "interestChargedFromDate", "closedOnDate", "expectedMaturityDate",
"status", "lifeCycleStatusDate", "loanOfficerName", "loanOfficerId", "charges")
"status", "lifeCycleStatusDate", "loanOfficerName", "loanOfficerId")
);
Set<String> responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo.getQueryParameters());
@@ -245,7 +245,7 @@ public class LoansApiResource {
responseParameters.addAll(
Arrays.asList("productOptions", "amortizationTypeOptions", "interestTypeOptions", "interestCalculationPeriodTypeOptions",
"repaymentFrequencyTypeOptions", "interestRateFrequencyTypeOptions", "fundOptions",
"repaymentStrategyOptions", "chargeOptions", "loanOfficerOptions")
"repaymentStrategyOptions", "chargeOptions", "chargeTemplate", "loanOfficerOptions")
);
productOptions = this.loanProductReadPlatformService.retrieveAllLoanProductsForLookup();
mifosng-provider/src/main/java/org/mifosng/platform/loan/domain/Loan.java
+1 -2
View File
@@ -301,8 +301,7 @@ public class Loan extends AbstractAuditableCustom<AppUser, Long> {
if (command.isChargesChanged()) {
this.charges.clear();
this.charges = associateChargesWithThisLoan(charges);
this.charges.addAll(associateChargesWithThisLoan(charges));
this.totalChargesDueAtDisbursement = deriveSumTotalOfChargesDueAtDisbursement();
}