gnucash stable: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/49e34b5e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a7f02401 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b86eb964 (commit)



commit 49e34b5e03a36cd93ca0e15a7d1d813717d43954
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Apr 27 13:58:41 2023 +0200

    Bug 798869 - Transaction Import MAP
    
    Reverted and reapplied commit b86eb964767a1f3513f7fcdd8424bdf514eb9e64
    in order to reference the proper bug report related to the fix.

diff --git a/gnucash/import-export/import-backend.cpp b/gnucash/import-export/import-backend.cpp
index df80be0965..10e465568a 100644
--- a/gnucash/import-export/import-backend.cpp
+++ b/gnucash/import-export/import-backend.cpp
@@ -301,7 +301,11 @@ gnc_import_TransInfo_set_last_split_info (GNCImportTransInfo *info,
             info->lsplit_amount = lsplit->amount;
             info->lsplit_amount_selected_manually = true;
         }
-        info->dest_acc = lsplit->account;
+        /* Bayesian matching may have already set a candidate destination
+         * account. However if the csv data also provides one, the one from the
+         * csv data is preferred. */
+        if (lsplit->account)
+            info->dest_acc = lsplit->account;
         info->lsplit_rec_state = lsplit->rec_state;
         info->lsplit_rec_date = lsplit->rec_date;
     }

commit a7f02401e93139d0c72deaea0bdae7d5181cdcc8
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Apr 27 13:58:35 2023 +0200

    Revert "Regression: bayesian matching in csv import doesn't find account"
    
    This reverts commit b86eb964767a1f3513f7fcdd8424bdf514eb9e64.

diff --git a/gnucash/import-export/import-backend.cpp b/gnucash/import-export/import-backend.cpp
index 10e465568a..df80be0965 100644
--- a/gnucash/import-export/import-backend.cpp
+++ b/gnucash/import-export/import-backend.cpp
@@ -301,11 +301,7 @@ gnc_import_TransInfo_set_last_split_info (GNCImportTransInfo *info,
             info->lsplit_amount = lsplit->amount;
             info->lsplit_amount_selected_manually = true;
         }
-        /* Bayesian matching may have already set a candidate destination
-         * account. However if the csv data also provides one, the one from the
-         * csv data is preferred. */
-        if (lsplit->account)
-            info->dest_acc = lsplit->account;
+        info->dest_acc = lsplit->account;
         info->lsplit_rec_state = lsplit->rec_state;
         info->lsplit_rec_date = lsplit->rec_date;
     }



Summary of changes: