gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/c6421d67 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/37a40314 (commit)
	from  https://github.com/Gnucash/gnucash/commit/686f842c (commit)



commit c6421d67dc0b37d0c5ac985426d6d3b424c5bad6
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Feb 24 21:52:13 2021 +0800

    [income-gst-statement.scm] "Secondary Subtotal" invalid value set
    
    It should be #f
    
    But the value is already #f. Remove modifying this option.

diff --git a/gnucash/report/reports/standard/income-gst-statement.scm b/gnucash/report/reports/standard/income-gst-statement.scm
index 66e22e73f..b2362edcf 100644
--- a/gnucash/report/reports/standard/income-gst-statement.scm
+++ b/gnucash/report/reports/standard/income-gst-statement.scm
@@ -228,9 +228,6 @@ with *EUGOODS* in the account description."))) #f
   (gnc:option-set-default-value
    (gnc:lookup-option options pagename-sorting "Secondary Key")
    'none)
-  (gnc:option-set-default-value
-   (gnc:lookup-option options pagename-sorting "Secondary Subtotal")
-   'none)
 
   ;; Disable display options not being used anymore
   (gnc:option-make-internal! options gnc:pagename-display "Shares")

commit 37a40314497fb7a330654b9149fad2259e807ca7
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Feb 24 21:51:56 2021 +0800

    [dialog-options.c] increase logging when option is set to bad value

diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index 607c1c8de..a743f1826 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -398,7 +398,10 @@ gnc_option_set_ui_value_internal (GNCOption *option, gboolean use_default)
     {
         bad_value = option_def->set_value (option, use_default, widget, value);
         if (bad_value)
-            PERR("bad value\n");
+            PERR("option '%s' bad value '%s'\n",
+                 gnc_option_name (option),
+                 scm_to_locale_string (scm_object_to_string
+                                       (value, scm_c_eval_string ("write"))));
     }
     else
         PERR("Unknown type. Ignoring.\n");



Summary of changes:
 gnucash/gnome-utils/dialog-options.c                     | 5 ++++-
 gnucash/report/reports/standard/income-gst-statement.scm | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)