gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/2ab5357b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f8803385 (commit)
	from  https://github.com/Gnucash/gnucash/commit/0a5f05c0 (commit)



commit 2ab5357be6a87220dfabec692c454e690a49b4e7
Merge: 0a5f05c0c f88033850
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun May 23 15:06:14 2021 -0700

    Merge Ralf Habacker's 'account-dialog-opa-state-fix' into maint.


commit f88033850c8ffc5f6cd1162abd4bd31a7e0e436c
Author: Ralf Habacker <ralf.habacker at freenet.de>
Date:   Sat May 22 12:55:19 2021 +0200

    In the account dialog, make sure that the state of the dialog is checked and not the account type
    
    Fix for #762 mentioned at #820.

diff --git a/gnucash/gnome-utils/dialog-account.c b/gnucash/gnome-utils/dialog-account.c
index d90bc06df..d05ee6fea 100644
--- a/gnucash/gnome-utils/dialog-account.c
+++ b/gnucash/gnome-utils/dialog-account.c
@@ -213,7 +213,7 @@ gnc_account_opening_balance_button_update (AccountWindow *aw, gnc_commodity *com
     Account *ob_account = gnc_account_lookup_by_opening_balance (gnc_book_get_root_account (aw->book), commodity);
     gboolean has_splits = (xaccAccountGetSplitList (account) != NULL);
 
-    if (xaccAccountGetType (account) != ACCT_TYPE_EQUITY)
+    if (aw->type != ACCT_TYPE_EQUITY)
     {
         gtk_widget_set_sensitive (aw->opening_balance_button, FALSE);
         return;



Summary of changes:
 gnucash/gnome-utils/dialog-account.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)