gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/f4169c9d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/44bc6411 (commit)
	from  https://github.com/Gnucash/gnucash/commit/ce4af952 (commit)



commit f4169c9d5a46c31e1fe0dce35e1c8c166a732cd9
Merge: ce4af95212 44bc641131
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Feb 1 13:46:18 2026 -0800

    Merge Roy Hansen's 'CSV-reparse' into stable.


commit 44bc641131646010578090d2f101bc14853d5f8a
Author: Roy Hansen <roy at royhansen.no>
Date:   Sat Jan 24 11:46:56 2026 +0100

    Bug - When importing csv-transactions, currency_format is not always
    properly applied.
    
    Reparse/tokenize all import lines when changing date/currency
    formats. In addition, make sure this also happens when setting
    base_account.

diff --git a/gnucash/import-export/csv-imp/gnc-import-tx.cpp b/gnucash/import-export/csv-imp/gnc-import-tx.cpp
index b3c1b32e53..9484e0a26a 100644
--- a/gnucash/import-export/csv-imp/gnc-import-tx.cpp
+++ b/gnucash/import-export/csv-imp/gnc-import-tx.cpp
@@ -199,12 +199,9 @@ void GncTxImport::base_account (Account* base_account)
             for (auto line : m_parsed_lines)
                 std::get<PL_PRESPLIT>(line)->set_account (m_settings.m_base_account);
         }
-        else
-        {
-            /* Reparse all of the lines with the new base account's commodity. */
-            tokenize(false);
-        }
 
+    	/* Reparse all of the lines with the new base account's commodity. */
+    	tokenize(false);
     }
 }
 
@@ -219,6 +216,9 @@ void GncTxImport::reset_formatted_column (std::vector<GncTransPropType>& col_typ
         if (col != m_settings.m_column_types.end())
             set_column_type (col - m_settings.m_column_types.begin(), col_type, true);
     }
+
+    /* Reparse all lines */
+    tokenize(false);
 }
 
 void GncTxImport::currency_format (int currency_format)



Summary of changes:
 gnucash/import-export/csv-imp/gnc-import-tx.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)