Merge branch 'dev-latest' into feature/bugfix

2026-09-29 10:21:21 +05:30
parent af052dcb4f 24d3bf83bb
commit e02ab51ee1
4 changed files with 89 additions and 4 deletions
@@ -55,17 +55,25 @@ public enum PortfolioProductType {
            return null;
        }

+        // Matched against each constant's own declared value above, not its declaration position --
+        // those two orderings diverge (CLIENT is declared 3rd but its value is 5), so a switch written
+        // by position silently mapped every id past SAVING to the wrong type: 3 (really PROVISIONING)
+        // returned CLIENT, 4 (really SHARES) returned PROVISIONING, 5 (really CLIENT) returned SHARES,
+        // and 6 (CURRENT) fell through to null -- a live NPE the moment a Current-product GL entry
+        // (entity_type_enum=6) reached this on the Journal Entries screen.
        switch (v) {
            case 1:
                return LOAN;
            case 2:
                return SAVING;
            case 3:
-                return CLIENT;
-            case 4:
                return PROVISIONING;
-            case 5:
+            case 4:
                return SHARES;
+            case 5:
+                return CLIENT;
+            case 6:
+                return CURRENT;
            default:
                return null;
        }
@@ -631,7 +631,15 @@ public class ClerkDisbursementRequestApiResource {
                        return ps;
                    }, btLogKh);
                    final long btLogId = Objects.requireNonNull(btLogKh.getKey()).longValue();
-                    final String btVoucherNo = generateBtVoucherNo(btLogId, currentUser, finalBtTotal);
+                    // submit() already raised this request's voucher (every request type does, so it
+                    // shows in My Vouchers the moment a clerk submits it, before any checker acts) --
+                    // minting a second one here for Bank Transfer specifically double-counted the same
+                    // transfer under two different names, "Entered by" whoever raised it AND whoever
+                    // approved it. Reuse that voucher; only fall back to raising a fresh one if this
+                    // request somehow reached approval without it (defensive, not the normal path).
+                    final Object existingVoucherNo = record.get("voucher_no");
+                    final String btVoucherNo = existingVoucherNo != null ? (String) existingVoucherNo
+                        : generateBtVoucherNo(btLogId, currentUser, finalBtTotal);
                    jdbcTemplate.update("UPDATE m_bank_transfer_log SET voucher_no = ? WHERE id = ?", btVoucherNo, btLogId);
                }

@@ -145,6 +145,7 @@
    <include file="parts/0583_save_rbi_form_a_return_job.xml" relativeToChangelogFile="true"/>
    <include file="parts/0584_form9_slr_assets.xml" relativeToChangelogFile="true"/>
    <include file="parts/0582_create_tds_config.xml" relativeToChangelogFile="true"/>
+<<<<<<< HEAD
    <!-- Our local 0575 Loan Originator checker-permission migration collided with dev-latest's own
         0575_rbi_reserve_custom_roles.xml once merged (it was only stashed/uncommitted locally, so it
         never appeared on either side of this merge as a real conflict - the collision only became
@@ -155,4 +156,7 @@
    <include file="parts/0584_add_manage_survey_permissions.xml" relativeToChangelogFile="true"/>
    <include file="parts/0585_add_loan_cob_catchup_permission.xml" relativeToChangelogFile="true"/>
    <include file="parts/0586_add_system_module_checker_permissions.xml" relativeToChangelogFile="true"/>
+=======
+    <include file="parts/0585_fix_current_product_od_scheme_pending_columns.xml" relativeToChangelogFile="true"/>
+>>>>>>> dev-latest
 </databaseChangeLog>
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements. See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership. The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!--
+    2033 (savings module changelog) was meant to add the OD-scheme columns from 0577
+    (m_current_product) onto the pending-edit shadow table too, so an approved Current product edit
+    doesn't silently drop them. It guards on tableExists("m_savings_product_temp"), with an "s",
+    but the table 0369 actually created is "m_saving_product_temp" (singular, no "s"). That guard has
+    therefore never once matched, on any tenant: onFail="MARK_RAN" records 2033 as applied without
+    ever running its addColumn, so the columns were never added anywhere, and any edit to a Current
+    product with OD fields set fails the moment it reaches the pending-edit table ("column
+    od_excess_allowed does not exist"). Left 2033 itself untouched, since rewriting an already-applied
+    changeset's history is the wrong fix, and repeats it here against the table name that's actually
+    real, guarded the same way so it's a no-op wherever a hand patch already added these.
+-->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+
+    <changeSet author="CBS" id="0585-1-fix-saving-product-temp-od-min-limit">
+        <preConditions onFail="MARK_RAN">
+            <and>
+                <tableExists tableName="m_saving_product_temp"/>
+                <not>
+                    <columnExists tableName="m_saving_product_temp" columnName="od_min_limit"/>
+                </not>
+            </and>
+        </preConditions>
+        <addColumn tableName="m_saving_product_temp">
+            <column name="od_min_limit" type="DECIMAL(19,6)"/>
+            <column name="od_security_type" type="VARCHAR(20)"/>
+        </addColumn>
+    </changeSet>
+
+    <changeSet author="CBS" id="0585-2-fix-saving-product-temp-od-excess-drawing">
+        <preConditions onFail="MARK_RAN">
+            <and>
+                <tableExists tableName="m_saving_product_temp"/>
+                <not>
+                    <columnExists tableName="m_saving_product_temp" columnName="od_excess_allowed"/>
+                </not>
+            </and>
+        </preConditions>
+        <addColumn tableName="m_saving_product_temp">
+            <column name="od_excess_allowed" type="BOOLEAN"/>
+            <column name="od_excess_limit_percent" type="DECIMAL(19,6)"/>
+            <column name="od_penal_rate" type="DECIMAL(19,6)"/>
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>