gnucash stable: Multiple changes pushed
Christopher Lam
clam at code.gnucash.org
Fri May 8 05:39:39 EDT 2026
Updated via https://github.com/Gnucash/gnucash/commit/99208875 (commit)
via https://github.com/Gnucash/gnucash/commit/4bad776b (commit)
via https://github.com/Gnucash/gnucash/commit/2b48c1aa (commit)
from https://github.com/Gnucash/gnucash/commit/b72a98ec (commit)
commit 992088754f278debcd2befe1f4a0fac1dedc90fb
Merge: b72a98ecdf 4bad776ba1
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Fri May 8 07:52:39 2026 +0800
Merge branch 'always-offer-options-summary' into stable
commit 4bad776ba109050a18c8ba7541cd34a1754e170e
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue May 5 22:25:28 2026 +0800
[reports] remove "Add options summary" report option
because it is now offered in all reports.
diff --git a/gnucash/report/reports/standard/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm
index cc81ce6eab..3a0be2f63f 100644
--- a/gnucash/report/reports/standard/balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/balsheet-pnl.scm
@@ -65,9 +65,6 @@ reporting."))
(define optname-disable-amount-indent (N_ "Disable amount indenting"))
(define opthelp-disable-amount-indent (N_ "Selecting this option will disable amount indenting, and condense amounts into a single column."))
-(define optname-options-summary (N_ "Add options summary"))
-(define opthelp-options-summary (N_ "Add summary of options."))
-
(define optname-account-full-name (N_ "Account full name instead of indenting"))
(define opthelp-account-full-name (N_ "Selecting this option enables full account name instead, and disables indenting account names."))
@@ -187,13 +184,6 @@ also show overall period profit & loss."))
gnc:pagename-general optname-reverse-chrono
"c5" opthelp-reverse-chrono #t)
- (gnc-register-multichoice-option options
- gnc:pagename-general optname-options-summary
- "d" opthelp-options-summary
- "never"
- (list (vector 'always (G_ "Always"))
- (vector 'never (G_ "Never"))))
-
;; accounts to work on
(gnc-register-account-list-option options
gnc:pagename-accounts optname-accounts
@@ -867,10 +857,6 @@ also show overall period profit & loss."))
(display (gnc-date-interval-format startdate enddate))
(display (qof-print-date enddate))))))
- (if (eq? (get-option gnc:pagename-general optname-options-summary) 'always)
- (gnc:html-document-add-object!
- doc (gnc:html-render-options-changed (gnc:report-options report-obj))))
-
(cond
((null? accounts)
(gnc:html-document-add-object!
diff --git a/gnucash/report/reports/standard/ifrs-cost-basis.scm b/gnucash/report/reports/standard/ifrs-cost-basis.scm
index 6cb3706058..a1e53cb133 100644
--- a/gnucash/report/reports/standard/ifrs-cost-basis.scm
+++ b/gnucash/report/reports/standard/ifrs-cost-basis.scm
@@ -520,9 +520,6 @@ the split action field to detect capitalized fees on stock activity")
;; (gnc:dump-all-transactions)
(gnc:html-document-add-object! document disclaimer)
- (gnc:html-document-add-object!
- document (gnc:html-render-options-changed (gnc:report-options report-obj)))
-
document)
diff --git a/gnucash/report/reports/standard/txn-columns.scm b/gnucash/report/reports/standard/txn-columns.scm
index a44fa75d68..fe10517e10 100644
--- a/gnucash/report/reports/standard/txn-columns.scm
+++ b/gnucash/report/reports/standard/txn-columns.scm
@@ -245,8 +245,6 @@ Select a different subset of transactions, or increase the limit in the options.
(gnc:html-document-set-title! document (G_ reportname))
- (gnc:html-document-add-object! document (gnc:html-render-options-changed options))
-
(gnc:html-document-add-object! document table))))
document)
diff --git a/gnucash/report/trep-engine.scm b/gnucash/report/trep-engine.scm
index 483bca9c2b..cee742975a 100644
--- a/gnucash/report/trep-engine.scm
+++ b/gnucash/report/trep-engine.scm
@@ -105,7 +105,6 @@
(define optname-enddate (N_ "End Date"))
(define optname-date-source (N_ "Date Filter"))
(define optname-table-export (N_ "Table for Exporting"))
-(define optname-infobox-display (N_ "Add options summary"))
;; Currency
(define pagename-currency (N_ "Currency"))
@@ -582,17 +581,6 @@ in the Options panel."))
"g" (G_ "Formats the table suitable for cut & paste exporting with extra cells.")
#f)
- (gnc-register-multichoice-option options
- gnc:pagename-general optname-infobox-display
- "h" (G_ "Add summary of options.")
- "no-match"
- ;; This is an alist of conditions for displaying the infobox
- ;; 'no-match for empty-report
- ;; 'match for generated report
- (list (vector 'no-match (G_ "If no transactions matched"))
- (vector 'always (G_ "Always"))
- (vector 'never (G_ "Never"))))
-
;; Filtering Options
(gnc-register-string-option options
@@ -2305,7 +2293,6 @@ be excluded from periodic reporting.")
primary-subtotal)
(memq (opt-val gnc:pagename-display (N_ "Amount"))
'(single double))))
- (infobox-display (opt-val gnc:pagename-general optname-infobox-display))
(query (qof-query-create-for-splits)))
;; define a preprocessed alist of report parameters.
@@ -2549,12 +2536,7 @@ be excluded from periodic reporting.")
(when empty-report-message
(gnc:html-document-add-object!
document
- empty-report-message))
-
- (when (memq infobox-display '(always no-match))
- (gnc:html-document-add-object!
- document
- (gnc:html-render-options-changed options))))
+ empty-report-message)))
(else
(qof-query-set-book query (gnc-get-current-book))
@@ -2628,12 +2610,7 @@ be excluded from periodic reporting.")
report-title (gnc:report-id report-obj)
NO-MATCHING-TRANS-HEADER NO-MATCHING-TRANS-TEXT))
- (gnc:html-document-set-export-error document "No splits found")
-
- (when (memq infobox-display '(always no-match))
- (gnc:html-document-add-object!
- document
- (gnc:html-render-options-changed options))))
+ (gnc:html-document-set-export-error document "No splits found"))
(else
(let-values (((table grid csvlist)
@@ -2648,11 +2625,6 @@ be excluded from periodic reporting.")
(gnc:html-markup-h3
(gnc-date-interval-format begindate enddate))))
- (when (eq? infobox-display 'always)
- (gnc:html-document-add-object!
- document
- (gnc:html-render-options-changed options)))
-
(when subtotal-table?
(gnc:html-document-add-object! document (grid 'get-html)))
commit 2b48c1aa343ac7474d365ee6c0fd08b871a053e5
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue May 5 22:22:05 2026 +0800
[report-core] always offer options summary in reports
this is useful to debug reports. if the "Add options summary" is
enabled, show the list of changed options at the *end* of the report.
diff --git a/gnucash/report/html-utilities.scm b/gnucash/report/html-utilities.scm
index 670e424b4b..a679bc8804 100644
--- a/gnucash/report/html-utilities.scm
+++ b/gnucash/report/html-utilities.scm
@@ -331,6 +331,7 @@
(retval (cons (format #f "~a / ~a" section name)
(disp value))))
(if (and (GncOption-is-changed option)
+ (not (equal? name gnc:optname-options-summary))
(not (GncOption-is-internal option)))
(addto! render-list retval))))
(define (name-fn name) (if plaintext? name (gnc:html-markup-b name)))
diff --git a/gnucash/report/report-core.scm b/gnucash/report/report-core.scm
index 6828e39538..dbfa718813 100644
--- a/gnucash/report/report-core.scm
+++ b/gnucash/report/report-core.scm
@@ -66,6 +66,7 @@
(export gnc:menuname-taxes)
(export gnc:optname-invoice-number)
(export gnc:optname-reportname)
+(export gnc:optname-options-summary)
(export gnc:pagename-accounts)
(export gnc:pagename-display)
(export gnc:pagename-general)
@@ -165,6 +166,7 @@
(define gnc:pagename-accounts (N_ "Accounts"))
(define gnc:pagename-display (N_ "Display"))
(define gnc:optname-reportname (N_ "Report name"))
+(define gnc:optname-options-summary (N_ "Add options summary"))
(define gnc:optname-stylesheet (N_ "Stylesheet"))
(define gnc:menuname-business-reports (N_ "_Business"))
(define gnc:optname-invoice-number (N_ "Invoice Number"))
@@ -323,6 +325,13 @@ not found.")))
(string->symbol (gnc:html-style-sheet-name ss))
(gnc:html-style-sheet-name ss)))
(gnc:get-html-style-sheets))))
+ (or
+ (gnc-lookup-option optiondb gnc:pagename-general gnc:optname-options-summary)
+ (gnc-register-multichoice-option
+ optiondb gnc:pagename-general gnc:optname-options-summary "0c"
+ (G_ "Add summary of options.") "never"
+ (list (vector 'always (G_ "Always"))
+ (vector 'never (G_ "Never")))))
options))
;; A <report> represents an instantiation of a particular report type.
@@ -762,6 +771,13 @@ not found.")))
(stylesheet (gnc:report-stylesheet report))
(_ (report-set-anchors! report (ht:make-hash-table)))
(doc (renderer report))
+ (options (gnc:report-options report))
+ (opt-summary (gnc-optiondb-lookup-value
+ (gnc:optiondb options)
+ gnc:pagename-general gnc:optname-options-summary))
+ (_ (unless (eq? 'never opt-summary)
+ (gnc:html-document-add-object!
+ doc (gnc:html-render-options-changed options))))
(html (cond
((string? doc) doc)
(else
Summary of changes:
gnucash/report/html-utilities.scm | 1 +
gnucash/report/report-core.scm | 16 +++++++++++
gnucash/report/reports/standard/balsheet-pnl.scm | 14 ----------
.../report/reports/standard/ifrs-cost-basis.scm | 3 --
gnucash/report/reports/standard/txn-columns.scm | 2 --
gnucash/report/trep-engine.scm | 32 ++--------------------
6 files changed, 19 insertions(+), 49 deletions(-)
More information about the gnucash-changes
mailing list