gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e92cd20d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a143d59b (commit)
	from  https://github.com/Gnucash/gnucash/commit/f7a85161 (commit)



commit e92cd20d78cc84d5c8b2963aebd0c8006a31b292
Merge: f7a85161c a143d59b7
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat May 9 15:41:06 2020 -0700

    Merge Jean Laroches '797737_match_previously_matched_trans' into maint.


commit a143d59b7c9984d532c4db15c0f7438cb18dd3ac
Author: jean <you at example.com>
Date:   Fri May 8 08:44:23 2020 -0700

    Bug 797737 - Import matching can match an imported transaction to an existing, previously matched transaction
    
    A simple fix that skips transactions that have an online_id in the matching process.
    This fixes the issue, and also speeds up the import.

diff --git a/gnucash/import-export/import-backend.c b/gnucash/import-export/import-backend.c
index 888b913b2..747cf29cd 100644
--- a/gnucash/import-export/import-backend.c
+++ b/gnucash/import-export/import-backend.c
@@ -627,6 +627,10 @@ static void split_find_match (GNCImportTransInfo * trans_info,
         Transaction *new_trans = gnc_import_TransInfo_get_trans (trans_info);
         Split *new_trans_fsplit = gnc_import_TransInfo_get_fsplit (trans_info);
 
+        // Do not consider transactions that have been previously matched.
+        if (gnc_import_split_has_online_id (split))
+            return;
+
         /* Matching heuristics */
 
         /* Amount heuristics */



Summary of changes:
 gnucash/import-export/import-backend.c | 4 ++++
 1 file changed, 4 insertions(+)