gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/831a17c5 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0822d6f5 (commit)
	from  https://github.com/Gnucash/gnucash/commit/9d07471a (commit)



commit 831a17c514972fca210ad601f8943f73e25d8929
Merge: 9d07471a8 0822d6f5a
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jan 6 21:01:24 2022 -0800

    Merge Jean Laroche's '798391_Reimport_OFX_INCOME' into maint.


commit 0822d6f5a3f2ffb0daca0f1b2afb535feeb572f1
Author: jean <27791933+jeanlaroche at users.noreply.github.com>
Date:   Fri Dec 31 12:42:31 2021 -0800

    Bug 798391 OFX import routine keeps prompting for accepted
    With some OFX_INCOME or OFX_REINVEST transactions, the FITID field was not always being set.

diff --git a/gnucash/import-export/ofx/gnc-ofx-import.c b/gnucash/import-export/ofx/gnc-ofx-import.c
index 32e6ace4b..b77284a6c 100644
--- a/gnucash/import-export/ofx/gnc-ofx-import.c
+++ b/gnucash/import-export/ofx/gnc-ofx-import.c
@@ -873,6 +873,8 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void *user_data)
 
                     // Set split memo from ofx transaction name or memo
                     gnc_ofx_set_split_memo(&data, split);
+                    if (data.fi_id_valid)
+                        gnc_import_set_split_online_id (split, sanitize_string (data.fi_id));
                 }
                 if (income_account != NULL &&
                         data.invtransactiontype == OFX_INCOME)
@@ -889,6 +891,8 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void *user_data)
 
                     // Set split memo from ofx transaction name or memo
                     gnc_ofx_set_split_memo(&data, split);
+                    if (data.fi_id_valid)
+                        gnc_import_set_split_online_id (split, sanitize_string (data.fi_id));
                 }
             }
 
@@ -907,6 +911,8 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void *user_data)
 
                 // Set split memo from ofx transaction name or memo
                 gnc_ofx_set_split_memo(&data, split);
+                if (data.fi_id_valid)
+                    gnc_import_set_split_online_id (split, sanitize_string (data.fi_id));
             }
         }
 



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