gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/a81b72f0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5a490d9f (commit)
	from  https://github.com/Gnucash/gnucash/commit/19bbde70 (commit)



commit a81b72f04cdfa2bc774d230a76438046647e0bd6
Merge: 19bbde700 5a490d9ff
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jan 23 14:03:01 2023 -0800

    Merge Ralf Habacker's 'activate-opening-balance-accounts' into maint.

diff --cc gnucash/gnome/gnc-plugin-page-register.c
index 81ac39874,8afdc5d51..72ebe469b
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@@ -758,6 -742,10 +758,10 @@@ gnc_plugin_page_register_new_common (GN
      if (!gnc_features_check_used (gnc_get_current_book(), GNC_FEATURE_REG_SORT_FILTER))
          gnc_features_set_used (gnc_get_current_book(), GNC_FEATURE_REG_SORT_FILTER);
  
 -    // added for version 4.5 onwards
++    // added for version 4.14 onwards
+     if (!gnc_using_equity_type_opening_balance_account (gnc_get_current_book()))
+         gnc_set_use_equity_type_opening_balance_account (gnc_get_current_book());
+ 
      /* Is there an existing page? */
      gsr = gnc_ledger_display_get_user_data (ledger);
      if (gsr)

commit 5a490d9ff7f600654d06139999c099f55eacb9d5
Author: Ralf Habacker <ralf.habacker at freenet.de>
Date:   Wed Oct 28 06:44:42 2020 +0100

    Activate feature GNC_FEATURE_EQUITY_TYPE_OPENING_BALANCE

diff --git a/gnucash/gnome/assistant-hierarchy.c b/gnucash/gnome/assistant-hierarchy.c
index 6d39f37ad..f5431e9b8 100644
--- a/gnucash/gnome/assistant-hierarchy.c
+++ b/gnucash/gnome/assistant-hierarchy.c
@@ -1424,6 +1424,9 @@ on_finish (GtkAssistant  *gtkassistant,
     ENTER (" ");
     com = gnc_currency_edit_get_currency (GNC_CURRENCY_EDIT(data->currency_selector));
 
+    if (!gnc_using_equity_type_opening_balance_account (gnc_get_current_book()))
+        gnc_set_use_equity_type_opening_balance_account (gnc_get_current_book());
+
     if (data->our_account_tree)
     {
         gnc_account_foreach_descendant (data->our_account_tree,
diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index 797b2959d..8afdc5d51 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -742,6 +742,10 @@ gnc_plugin_page_register_new_common (GNCLedgerDisplay* ledger)
     if (!gnc_features_check_used (gnc_get_current_book(), GNC_FEATURE_REG_SORT_FILTER))
         gnc_features_set_used (gnc_get_current_book(), GNC_FEATURE_REG_SORT_FILTER);
 
+    // added for version 4.5 onwards
+    if (!gnc_using_equity_type_opening_balance_account (gnc_get_current_book()))
+        gnc_set_use_equity_type_opening_balance_account (gnc_get_current_book());
+
     /* Is there an existing page? */
     gsr = gnc_ledger_display_get_user_data (ledger);
     if (gsr)



Summary of changes:
 gnucash/gnome/assistant-hierarchy.c      | 3 +++
 gnucash/gnome/gnc-plugin-page-register.c | 4 ++++
 2 files changed, 7 insertions(+)