Fix for preserving Transaction split amount for finalized transactions.

Author: CodeWithCJ

…s/upgrade/SparkyBudget_Upgrade_v0.18.sql …s/upgrade/SparkyBudget_Upgrade_v0.19.sqlSparkyBudget/py_db/db_scripts/upgrade/SparkyBudget_Upgrade_v0.18.sql renamed to SparkyBudget/py_db/db_scripts/upgrade/SparkyBudget_Upgrade_v0.19.sql SparkyBudget/py_db/db_scripts/upgrade/SparkyBudget_Upgrade_v0.18.sql renamed to SparkyBudget/py_db/db_scripts/upgrade/SparkyBudget_Upgrade_v0.19.sql

@@ -15,20 +15,22 @@ BEGIN
         TransactionPayee,
         TransactionMemo,
 		TransactionPending,
-		SubCategory
-    ) VALUES (
-        (SELECT TransactionKey FROM f_transaction WHERE TransactionID = NEW.TransactionID),
-        NEW.AccountID,
-        NEW.AccountName,
-        NEW.TransactionID,
-        NEW.TransactionPosted,
-        NEW.TransactionAmount,
-        NEW.TransactionDescription,
-        NEW.TransactionPayee,
-        NEW.TransactionMemo,
+		SubCategory,
+		TransactionAmountNew -- Add TransactionAmountNew here
+		  ) VALUES (
+		      (SELECT TransactionKey FROM f_transaction WHERE TransactionID = NEW.TransactionID),
+		      NEW.AccountID,
+		      NEW.AccountName,
+		      NEW.TransactionID,
+		      NEW.TransactionPosted,
+		      NEW.TransactionAmount,
+		      NEW.TransactionDescription,
+		      NEW.TransactionPayee,
+		      NEW.TransactionMemo,
 		NEW.TransactionPending,
-		(SELECT SubCategory FROM f_transaction WHERE TransactionID = NEW.TransactionID)
-    );
+		(SELECT SubCategory FROM f_transaction WHERE TransactionID = NEW.TransactionID),
+		(SELECT TransactionAmountNew FROM f_transaction WHERE TransactionID = NEW.TransactionID) -- Select existing TransactionAmountNew
+		  );
 
     -- Remove the specific record from stg_transaction after insert
     DELETE FROM stg_transaction WHERE TransactionID = NEW.TransactionID;
@@ -59,4 +61,4 @@ END
 ;
 
 
-update D_DB set DB_VERSION = "v0.18";
+update D_DB set DB_VERSION = "v0.19";

SparkyBudget/py_utils/SimpleFinToDB.py

@@ -116,10 +116,10 @@ def process_accounts_data(private_data_path):
 
                     # Insert data into the temporary table from F_Transaction
                     insert_into_temp_table_query = """
-                    INSERT INTO Temp_F_Transaction_Pending (TransactionID, SubCategory,TransactionAmountNew)
+                    INSERT INTO Temp_F_Transaction_Pending (TransactionID, SubCategory, TransactionAmountNew)
                     SELECT TransactionID, SubCategory, TransactionAmountNew
                     FROM F_Transaction
-                    WHERE TransactionPending = 1 AND SubCategory IS NOT NULL;
+                    WHERE TransactionPending = 1 and (TransactionAmountNew IS NOT NULL or SubCategory is not NULL);
                     """
                     cursor.execute(insert_into_temp_table_query)
 
@@ -198,11 +198,14 @@ def process_accounts_data(private_data_path):
                     # Update F_Transaction with SubCategory from the temporary table
                     update_F_Transaction_query = """
                     UPDATE F_Transaction
-                    SET 
-                        SubCategory = (
-                            SELECT SubCategory
-                            FROM Temp_F_Transaction_Pending
-                            WHERE Temp_F_Transaction_Pending.TransactionID = F_Transaction.TransactionID
+                    SET
+                        SubCategory = COALESCE(
+                            (
+                                SELECT SubCategory
+                                FROM Temp_F_Transaction_Pending
+                                WHERE Temp_F_Transaction_Pending.TransactionID = F_Transaction.TransactionID
+                            ),
+                            F_Transaction.SubCategory -- Keep existing SubCategory if the temporary table has NULL
                         ),
                         TransactionAmountNew = (
                             SELECT TransactionAmountNew