Fsf 18 19 20 prod (#993)

* feature fbr 648 * fix fbr 663 * fix fbr 663 * fix fbr 646 * Fix FBR-664 (#696) * Fix missing entry for migration file * Spotless fixes * Fix for FBR-664 * Fix FBR-665 (#699) * Fix FBR-665 (#699) (#702) * fix fbr 648 * fix fbr 647 * fix fbr 647 * initial commit FBR-644 hard policy updates (#655) FBR-644 hard policy updates * Update LoanApplicationWritePlatformServiceJpaRepositoryImpl.java (#708) * Update LoanApplicationWritePlatformServiceJpaRepositoryImpl.java (#708) (#709) * Update changelog-tenant.xml (#711) * Update changelog-tenant.xml * fixed typo in query * fixed table name in query --------- Co-authored-by: Faheem Ahmad <[email protected]> * Fix/fbr 644 v2 (#714) * Update changelog-tenant.xml * fixed typo in query * fixed table name in query * fixed multiple issues with queries * FBR-644 --------- Co-authored-by: Leonardo Hildt <[email protected]> Co-authored-by: Faheem Ahmad <[email protected]> * fix fbr 667 * fix fbr 667 * fix fbr 666 (#718) * release fbr 648 * release fbr 648 * release fbr 648 (#727) * release fbr 669 * release fbr 669 * Fix/fbr 669 qa (#730) * release fbr 669 * release fbr 669 * release fbr 668 * release fbr 668 * release fbr 670 * release fbr 671 * release fbr 672 * release fbr 678 * fix fbr 677 * fix fbr 684 * fix fbr 677 * release fbr 678 * fix fbr 684 * Reports Fix QA (#750) * fix FBR 673 * fix FBR 673 * fix FBR 673 * fix QA REPORTS * fix QA REPORTS * fix QA REPORTS * fix QA REPORTS (#756) * fix QA REPORTS * fix QA REPORTS * fix FBR 674 * fix QA REPORTS * fix REPORTS * fix Topu Loan Policies * Fix/fbr 673 (#768) * fix Policy Labels * fix Hard Policy Labels * Qa/fbr 673 674 (#769) * fix FBR 674 * fix REPORTS * fix Topu Loan Policies * Fix/fbr 673 (#768) * fix Policy Labels * fix Hard Policy Labels * fix/FBR-676 * fix/FBR-676 (#773) * fix/FBR-676 * fix/FBR-HARDPOLICIES * fix/FBR-HARDPOLICIES * fix/FBR-HARDPOLICIES * fix/FBR-HARDPOLICIES * Fix/fbr 676 (#777) * fix/FBR-HARDPOLICIES * fix/FBR-HARDPOLICIES * fix/FBR-HARDPOLICIES * fix/FBR-HARDPOLICIES * fix/FBR-682 * fix/FBR-688 * fix/FBR-688 * fix/FBR-690 * Fix FBR-692 (#803) * Fix for FBR-692 * Spotless fixes * fix/FBR-699 * fix/FBR-699 (#805) * fix/FBR-699 * fix/FBR-699 * fix/FBR-699 * fix/FBR-699 * fix/FBR-699 * fix/FBR-700 * fix/FBR-700 (#812) * fix/FBR-690 * fix/FBR-696 * Release v1.0.45 (#817) * fix/FBR-699 * fix/FBR-700 * fix/FBR-700 (#812) * fix/FBR-690 * fix/FBR-696 --------- Co-authored-by: Muhimbura Brian Mart <[email protected]> * fix/FBR-690 * fix/FBR-690 (#820) * Release v1.0.47 (#826) * fix/FBR-699 * fix/FBR-700 * fix/FBR-700 (#812) * fix/FBR-690 * fix/FBR-696 * fix/FBR-690 (#820) --------- Co-authored-by: Muhimbura Brian Mart <[email protected]> * fix/FBR-691 * Fix FBR-691 (#831) * fix/FBR-699 * fix/FBR-700 * fix/FBR-700 (#812) * fix/FBR-690 * fix/FBR-696 * fix/FBR-690 * fix/FBR-690 (#820) * fix/FBR-691 --------- Co-authored-by: Muhimbura Brian Mart <[email protected]> * fix/FBR-689 * fix/FBR-690 (#836) * fix FBR 697 * fix FBR 698 * fix FBR 699 * fixed NPE (#848) Co-authored-by: Faheem Ahmad <[email protected]> * fixed NPE (#848) (#849) Co-authored-by: Faheem Ahmad <[email protected]> Co-authored-by: Faheem Ahmad <[email protected]> * fix FBR 689 * fix FBR 695 * fix FBR 699 * fix FBR 697 * fix FBR 697 (#861) * fix FBR 701 * Release/1.0.47/prepare (#864) * fix FBR 697 * fix FBR 701 * fix FBR 704 * Release/1.0.48/prepare (#868) * fix FBR 697 * fix FBR 701 * fix FBR 704 * fix FBR 704 * fix FBR 704 * Release/1.0.48/prepare (#869) * fix FBR 697 * fix FBR 701 * fix FBR 704 * fix FBR 704 * fix FBR 704 * fix FBR 704 (#870) * Fix/fbr 704 (#871) * fix FBR 704 * fix FBR 704 * fix FBR 704 * Release/1.0.48/prepare (#872) * fix FBR 697 * fix FBR 701 * fix FBR 704 * fix FBR 704 * fix FBR 704 * fix FBR 704 (#870) * Fix/fbr 704 (#871) * fix FBR 704 * fix FBR 704 * fix FBR 704 * fix FBR 702 (#874) * Fic 699 (#878) * Fic 689 * Fic 689 (#883) * Fic 705 (#887) * Fic 705 (#887) (#888) Co-authored-by: Brian Muhimbura <[email protected]> * Fix/fbr 707 (#890) * Fic 705 * Fic 707 * Release/1.0.48/prepare (#891) * Fic 689 * Fic 705 (#887) * Fix/fbr 707 (#890) * Fic 705 * Fic 707 * Fix/fbr 690 (#896) * Fic 690 * fix/FBR-690 * Recredit Categorization fix * Recredit Categorization fix * Fix/fbr 690 (#897) * Fic 690 * fix/FBR-690 * Recredit Categorization fix * Recredit Categorization fix * Recredit Categorization fix * Fix/fbr 690 (#898) * Fic 690 * fix/FBR-690 * Recredit Categorization fix * Recredit Categorization fix * Recredit Categorization fix * Recredit Categorization fix * Release/1.0.48/prepare (#899) * Fic 689 * Fic 705 (#887) * Fix/fbr 707 (#890) * Fic 705 * Fic 707 * Fix/fbr 690 (#896) * Fic 690 * fix/FBR-690 * Recredit Categorization fix * Recredit Categorization fix * Fix/fbr 690 (#897) * Fic 690 * fix/FBR-690 * Recredit Categorization fix * Recredit Categorization fix * Recredit Categorization fix * Fix/fbr 690 (#898) * Fic 690 * fix/FBR-690 * Recredit Categorization fix * Recredit Categorization fix * Recredit Categorization fix * Recredit Categorization fix * fix FBR 709 * fix FBR 709 (#901) * fix FBR 709 * Fix/fbr 709 (#903) * fix FBR 709 * fix FBR 709 * Release 1.0.49 prepare (#906) * Fic 689 * Fic 705 (#887) * Fix/fbr 707 (#890) * Fic 705 * Fic 707 * Fix/fbr 690 (#896) * Fic 690 * fix/FBR-690 * Recredit Categorization fix * Recredit Categorization fix * Fix/fbr 690 (#897) * Fic 690 * fix/FBR-690 * Recredit Categorization fix * Recredit Categorization fix * Recredit Categorization fix * Fix/fbr 690 (#898) * Fic 690 * fix/FBR-690 * Recredit Categorization fix * Recredit Categorization fix * Recredit Categorization fix * Recredit Categorization fix * fix FBR 709 (#901) * Fix/fbr 709 (#903) * fix FBR 709 * fix FBR 709 --------- Co-authored-by: Muhimbura Brian Mart <[email protected]> * fix FS-005 * fix FS-007 * fix FS-007 * fix FS-003 * fix FS-003 * fix FS-2 * fix FSF-8 * Release v1.0.50 (#951) * fix FSF-9 * fix FSF-4 (#945) * Fix/fsf 11 (#947) * fix FSF-4 * fix FSF-11 * Fix/fsf 11 (#950) * fix FSF-4 * fix FSF-11 * fix FSF-11 --------- Co-authored-by: Muhimbura Brian Mart <[email protected]> * Fix/fsf 17 qa (#958) * fix FSF-9 * fix FSF-4 (#945) * Fix/fsf 11 (#947) * fix FSF-4 * fix FSF-11 * Fix/fsf 11 (#950) * fix FSF-4 * fix FSF-11 * fix FSF-11 * fix FSF-17 (#957) * F sf 12 15 qa (#965) * fix FSF-9 * fix FSF-4 (#945) * Fix/fsf 11 (#947) * fix FSF-4 * fix FSF-11 * Fix/fsf 11 (#950) * fix FSF-4 * fix FSF-11 * fix FSF-11 * fix FSF-17 (#957) * fix FSF-15 * fix FSF-12 * Fix/fsf 19 qa (#970) * fix FSF-9 * fix FSF-4 (#945) * Fix/fsf 11 (#947) * fix FSF-4 * fix FSF-11 * Fix/fsf 11 (#950) * fix FSF-4 * fix FSF-11 * fix FSF-11 * fix FSF-17 (#957) * fix FSF-15 * fix FSF-12 * fix FSF-19 (#969) * Fix/fsf 18 20 qa (#981) * fix FSF-9 * fix FSF-4 (#945) * Fix/fsf 11 (#947) * fix FSF-4 * fix FSF-11 * Fix/fsf 11 (#950) * fix FSF-4 * fix FSF-11 * fix FSF-11 * fix FSF-17 (#957) * fix FSF-15 * fix FSF-12 * fix FSF-19 (#969) * Fix/fs 18 (#977) * fix FSF-19 * FIX FSF-18 * Fix/fsf 20 (#980) * fix FSF-19 * FIX FSF-18 * FIX FSF-20 --------- Co-authored-by: Leonardo Hildt <[email protected]> Co-authored-by: Faheem Ahmad <[email protected]> Co-authored-by: Faheem Ahmad <[email protected]> Co-authored-by: Leonardo Hildt <[email protected]>
fiterlatam · Aug 6, 2024 · 51d70d2 · 51d70d2
1 parent bce71a7
commit 51d70d2
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 6 deletions.
diff --git a/fineract-provider/pentahoReports/Print Bank Cheque.prpt b/fineract-provider/pentahoReports/Print Bank Cheque.prpt
diff --git a/...che/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/...che/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
@@ -1477,11 +1477,10 @@ public CommandProcessingResult writeOff(final Long loanId, final JsonCommand com
 
         SavingsAccountTransaction holdTransaction = savingsAccountTransactions.stream().filter(sa -> sa.isAmountOnHoldNotReleased())
                 .findFirst().orElse(null);
-        SavingsAccount fromSavingsAccount = holdTransaction.getSavingsAccount();
-
-        this.savingsAccountWritePlatformService.releaseLoanGuarantee(loanId, command,
-                command.localDateValueOfParameterNamed("transactionDate"), holdTransaction);
-
+        if (holdTransaction!=null) {
+            this.savingsAccountWritePlatformService.releaseLoanGuarantee(loanId, command,
+                    command.localDateValueOfParameterNamed("transactionDate"), holdTransaction);
+        }
         businessEventNotifierService.notifyPostBusinessEvent(new LoanWrittenOffPostBusinessEvent(writeOff));
         return new CommandProcessingResultBuilder().withCommandId(command.commandId()).withEntityId(writeOff.getId())
                 .withOfficeId(loan.getOfficeId()).withClientId(loan.getClientId()).withGroupId(loan.getGroupId()).withLoanId(loanId)

diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
@@ -154,5 +154,4 @@
     <include file="parts/0132_AddConfigurationForAmountFormats.xml" relativeToChangelogFile="true"/>
     <include file="parts/0133_UpdateNewHardPolicyQueries.xml" relativeToChangelogFile="true"/>
     <include file="parts/0134_HardPolicyFixes.xml" relativeToChangelogFile="true"/>
-    <include file="parts/FS_001_FIX_GROUP_MEETING_DATES.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0134_HardPolicyFixes.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0134_HardPolicyFixes.xml
@@ -143,6 +143,85 @@
             ]]>
         </sql>
     </changeSet>
+    <changeSet id="6" author="fineract">
+        <sql>
+            <![CDATA[
+            UPDATE stretchy_report SET report_sql = " SELECT
+           CASE
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} BETWEEN 1 AND 3) THEN 'GREEN'
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} > 3) THEN 'YELLOW'
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} > 4) THEN 'YELLOW'
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} BETWEEN 1 AND 3) THEN 'GREEN'
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} > 3) THEN 'YELLOW'
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} > 4) THEN 'YELLOW'
+
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} > 4) THEN 'YELLOW'
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} > 4) THEN 'YELLOW'
+
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} BETWEEN 1 AND 3) THEN 'GREEN'
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} > 3) THEN 'YELLOW'
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} BETWEEN 1 AND 3) THEN 'GREEN'
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} > 3) THEN 'YELLOW'
+
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} BETWEEN 1 AND 3) THEN 'GREEN'
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} > 3) THEN 'YELLOW'
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA') AND (${disparityRatio} > 4) THEN 'YELLOW'
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} BETWEEN 1 AND 3) THEN 'GREEN'
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'NUEVO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} > 3) THEN 'YELLOW'
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL') AND (${disparityRatio} > 4) THEN 'YELLOW'
+
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} > 4) THEN 'YELLOW'
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 2) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} > 4) THEN 'YELLOW'
+
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} > 4) THEN 'YELLOW'
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 8) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} > 4) THEN 'YELLOW'
+
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'URBANA')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} > 4) THEN 'YELLOW'
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} BETWEEN 1 AND 4) THEN 'GREEN'
+               WHEN (${loanProductId} = 9) AND ('${categorization}' = 'RECREDITO') AND ('${clientArea}' = 'RURAL')
+               AND recredit_loan.recredit_count > 0 AND (${disparityRatio} > 4) THEN 'YELLOW'
+
+           END AS color
+           FROM m_prequalification_group mpg
+           LEFT JOIN (
+              SELECT p.id AS prequalification_id,
+              (select count(ml.id) FROM m_prequalification_group mp
+             LEFT JOIN m_prequalification_group_members mpgm ON mpgm.group_id = mp.id
+             LEFT JOIN m_client mc ON mc.dpi = mpgm.dpi
+             LEFT JOIN m_loan ml ON ml.client_id = mc.id
+             WHERE
+             ml.loan_status_id < 300 AND ml.product_id = ${loanProductId} AND ml.is_topup = 1
+             AND mp.id = ${prequalificationId}
+             ) recredit_count
+              FROM m_prequalification_group p
+          ) recredit_loan ON recredit_loan.prequalification_id = mpg.id
+           WHERE mpg.id = ${prequalificationId}"
+            WHERE report_name = "Value disparity Policy Check";
+            ]]>
+        </sql>
+    </changeSet>