Merge branch 'FINERACT-221' into develop

swagatikapanda123 · Jan 31, 2017 · b6f4230 · b6f4230
2 parents e1a0e3f + e92b6b1
commit b6f4230
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
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
@@ -1268,9 +1268,14 @@ public void updateLoanSummarAndStatus() {
     }
 
     public Map<String, Object> loanApplicationModification(final JsonCommand command, final Set<LoanCharge> possiblyModifedLoanCharges,
-            final Set<LoanCollateral> possiblyModifedLoanCollateralItems, final AprCalculator aprCalculator, boolean isChargesModified) {
+            final Set<LoanCollateral> possiblyModifedLoanCollateralItems, final AprCalculator aprCalculator, boolean isChargesModified,
+            final LoanProduct loanProduct) {
 
         final Map<String, Object> actualChanges = this.loanRepaymentScheduleDetail.updateLoanApplicationAttributes(command, aprCalculator);
+        final MonetaryCurrency currency = new MonetaryCurrency(loanProduct.getCurrency().getCode(), loanProduct.getCurrency().getDigitsAfterDecimal(),
+        		loanProduct.getCurrency().getCurrencyInMultiplesOf());
+        this.loanRepaymentScheduleDetail.updateCurrency(currency);
+
         if (!actualChanges.isEmpty()) {
             final boolean recalculateLoanSchedule = !(actualChanges.size() == 1 && actualChanges.containsKey("inArrearsTolerance"));
             actualChanges.put("recalculateLoanSchedule", recalculateLoanSchedule);

diff --git a/...t/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java b/...t/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java
@@ -605,7 +605,7 @@ public CommandProcessingResult modifyApplication(final Long loanId, final JsonCo
 
 
             final Map<String, Object> changes = existingLoanApplication.loanApplicationModification(command, possiblyModifedLoanCharges,
-                    possiblyModifedLoanCollateralItems, this.aprCalculator, isChargeModified);
+                    possiblyModifedLoanCollateralItems, this.aprCalculator, isChargeModified, loanProductForValidations);
 
             if (changes.containsKey("expectedDisbursementDate")) {
                 this.loanAssembler.validateExpectedDisbursementForHolidayAndNonWorkingDay(existingLoanApplication);

diff --git a/.../main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductRelatedDetail.java b/.../main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProductRelatedDetail.java
@@ -499,6 +499,10 @@ public Map<String, Object> updateLoanApplicationAttributes(final JsonCommand com
         return actualChanges;
     }
 
+    public void updateCurrency(final MonetaryCurrency currency) {
+    	this.currency = currency ;
+    }
+
     public void validateRepaymentPeriodWithGraceSettings() {
         final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
         final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("loanproduct");