gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/a84891a4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/caa6bcd1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/bdb5f3d8 (commit)
	from  https://github.com/Gnucash/gnucash/commit/b7001b52 (commit)



commit a84891a43c9bca060e2e1dd3672f7676b6a9f231
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Sep 27 18:12:31 2021 -0700

    Revert "Revert "[gnc-plugin-page-register] when reversing reversed txn, offer jump""
    
    This reverts commit bdb5f3d87133139d798d62702b059939524e83e6, restoring
    the new jump-to-transaction facility post-4.8 release.

diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index ff7ade8d4..989593cef 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -4072,13 +4072,6 @@ gnc_plugin_page_register_cmd_reverse_transaction (GtkAction* action,
     if (trans == NULL)
         return;
 
-    if (xaccTransGetReversedBy (trans))
-    {
-        gnc_error_dialog (GTK_WINDOW (window), "%s",
-                          _ ("A reversing entry has already been created for this transaction."));
-        return;
-    }
-
     split = gnc_split_register_get_current_split (reg);
     account = xaccSplitGetAccount (split);
 
@@ -4088,6 +4081,17 @@ gnc_plugin_page_register_cmd_reverse_transaction (GtkAction* action,
         return;
     }
 
+    new_trans = xaccTransGetReversedBy (trans);
+    if (new_trans)
+    {
+        const char *rev = _("A reversing entry has already been created for this transaction.");
+        const char *jump = _("Jump to the transaction?");
+        if (gnc_verify_dialog (GTK_WINDOW (window), TRUE, "%s\n\n%s", rev, jump))
+            goto jump_to_trans;
+        else
+            return;
+    }
+
     if (!gnc_dup_time64_dialog (window, _("Reverse Transaction"),
                                 _("New Transaction Information"), &date))
     {
@@ -4104,6 +4108,7 @@ gnc_plugin_page_register_cmd_reverse_transaction (GtkAction* action,
 
     gnc_resume_gui_refresh();
 
+ jump_to_trans:
     /* Now jump to new trans */
     gsr = gnc_plugin_page_register_get_gsr (GNC_PLUGIN_PAGE (page));
     split = xaccTransFindSplitByAccount(new_trans, account);

commit caa6bcd1ce44171cdd9d36de1cec700eb1d24222
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Sep 27 17:46:56 2021 -0700

    Release GnuCash 4.8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b377d97cb..de10b7390 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14.0)
 endif()
 
 project (gnucash
-    VERSION 4.7
+    VERSION 4.8
 )
 
 enable_testing()
diff --git a/NEWS b/NEWS
index 30f8f6270..9737ffe2b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Version history:
 ------- -------
+4.8  - 28 September 2021
+The ninth release of the 4.x stable series.
+
+This is a snap release to fix a crasher bug on Linux. The only change is
+     GSettings hotfix - resolve crash due to bad schema reference
+
 4.7  - 26 September 2021
 The eighth release of the 4.x stable series.
 

commit bdb5f3d87133139d798d62702b059939524e83e6
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Sep 27 15:35:35 2021 -0700

    Revert "[gnc-plugin-page-register] when reversing reversed txn, offer jump"
    
    This reverts commit b8c9b1a6ce0e1e4c6740e1de450859b90cbadcec so that
    we can release 4.8 without any translatable string changes.

diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index 989593cef..ff7ade8d4 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -4072,6 +4072,13 @@ gnc_plugin_page_register_cmd_reverse_transaction (GtkAction* action,
     if (trans == NULL)
         return;
 
+    if (xaccTransGetReversedBy (trans))
+    {
+        gnc_error_dialog (GTK_WINDOW (window), "%s",
+                          _ ("A reversing entry has already been created for this transaction."));
+        return;
+    }
+
     split = gnc_split_register_get_current_split (reg);
     account = xaccSplitGetAccount (split);
 
@@ -4081,17 +4088,6 @@ gnc_plugin_page_register_cmd_reverse_transaction (GtkAction* action,
         return;
     }
 
-    new_trans = xaccTransGetReversedBy (trans);
-    if (new_trans)
-    {
-        const char *rev = _("A reversing entry has already been created for this transaction.");
-        const char *jump = _("Jump to the transaction?");
-        if (gnc_verify_dialog (GTK_WINDOW (window), TRUE, "%s\n\n%s", rev, jump))
-            goto jump_to_trans;
-        else
-            return;
-    }
-
     if (!gnc_dup_time64_dialog (window, _("Reverse Transaction"),
                                 _("New Transaction Information"), &date))
     {
@@ -4108,7 +4104,6 @@ gnc_plugin_page_register_cmd_reverse_transaction (GtkAction* action,
 
     gnc_resume_gui_refresh();
 
- jump_to_trans:
     /* Now jump to new trans */
     gsr = gnc_plugin_page_register_get_gsr (GNC_PLUGIN_PAGE (page));
     split = xaccTransFindSplitByAccount(new_trans, account);



Summary of changes:
 CMakeLists.txt | 2 +-
 NEWS           | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)