Merge pull request #748 from fiterlatam/fix/RELEASE-QA-45

Fix/release qa 45
fiterlatam · May 28, 2024 · 517f9d0 · 517f9d0
2 parents 6589f51 + 282883e
commit 517f9d0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/fineract-provider/pentahoReports/Pagare Libre Protesto Grupal.prpt b/fineract-provider/pentahoReports/Pagare Libre Protesto Grupal.prpt
diff --git a/...org/apache/fineract/organisation/prequalification/domain/PrequalificationGroupMember.java b/...org/apache/fineract/organisation/prequalification/domain/PrequalificationGroupMember.java
@@ -233,6 +233,9 @@ public Map<String, Object> update(JsonCommand command) {
     public void updateApprovedAmount(BigDecimal newValue) {
         this.approvedAmount = newValue;
     }
+    public void updateOriginalAmount(BigDecimal newValue) {
+        this.originalAmount = newValue;
+    }
 
     public void updatePresident(Boolean newValue) {
         this.groupPresident = newValue;

diff --git a/...eract/organisation/prequalification/service/PrequalificationWritePlatformServiceImpl.java b/...eract/organisation/prequalification/service/PrequalificationWritePlatformServiceImpl.java
@@ -690,6 +690,7 @@ private PrequalificationGroupMember assembleMemberForUpdate(JsonElement memberEl
             if (newValue != null) {
                 prequalificationGroupMember.updateAmountRequested(newValue);
                 prequalificationGroupMember.updateApprovedAmount(newValue);
+                prequalificationGroupMember.updateOriginalAmount(newValue);
             }
         }
 

diff --git a/...n/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java b/...n/java/org/apache/fineract/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java
@@ -368,7 +368,7 @@ public Page<LoanAccountData> retrieveAll(final SearchParameters searchParameters
         final Set<Long> agencyIds = agencyOptions.stream().map(AgencyData::getId).collect(Collectors.toSet());
         if (!agencyIds.isEmpty() && searchParameters.getAgencyId() == null) {
             final String agencyIdParams = StringUtils.join(agencyIds, ", ");
-            sqlBuilder.append(" AND agency.id IN ( ").append(agencyIdParams).append(") ");
+            sqlBuilder.append(" AND (agency.id IN ( ").append(agencyIdParams).append(") OR agency.id is null )");
         }
 
         int arrayPos = 4;