IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-30 20:54:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

[transaction] bugfix: subtotal-table + subtotals-only = hide table

Browse Source 
It is intuitive that if the user wishes to show the subtotal-table,
and hide the transactions, then both the main (hidden) transactions
and subtotals must be hidden as well.

https://gnucash.uservoice.com/forums/101223-feature-request/suggestions/36565759-add-a-transaction-report-option-to-show-subtotal
This commit is contained in:
Christopher Lam 2019-01-20 08:25:59 +08:00
parent d8d3c669a6
commit 8f2776dabd
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnucash/report/standard-reports/transaction.scm
View File

@ -1888,6 +1888,11 @@ be excluded from periodic reporting.")
(not (eq? secondary-date-subtotal 'none)))
(or (CUSTOM-SORTING? primary-key BOOK-SPLIT-ACTION)
(CUSTOM-SORTING? secondary-key BOOK-SPLIT-ACTION))))
(subtotal-table? (and (opt-val gnc:pagename-display optname-grid)
(if (memq primary-key DATE-SORTING-TYPES)
(keylist-get-info date-subtotal-list primary-date-subtotal 'renderer-fn)
(opt-val pagename-sorting optname-prime-subtotal))
(eq? (opt-val gnc:pagename-display (N_ "Amount")) 'single)))
(infobox-display (opt-val gnc:pagename-general optname-infobox-display))
(query (qof-query-create-for-splits)))
@ -2049,11 +2054,7 @@ be excluded from periodic reporting.")
document
(gnc:html-render-options-changed options)))
(if (and (opt-val gnc:pagename-display optname-grid)
(if (memq primary-key DATE-SORTING-TYPES)
(keylist-get-info date-subtotal-list primary-date-subtotal 'renderer-fn)
(opt-val pagename-sorting optname-prime-subtotal))
(eq? (opt-val gnc:pagename-display (N_ "Amount")) 'single))
(if subtotal-table?
(let* ((generic<? (lambda (a b)
(cond ((string? (car a)) (string<? (car a) (car b)))
((number? (car a)) (< (car a) (car b)))
@ -2063,7 +2064,9 @@ be excluded from periodic reporting.")
(gnc:html-document-add-object!
document (grid->html-table grid list-of-rows list-of-cols))))
(gnc:html-document-add-object! document table)))))
(unless (and subtotal-table?
(opt-val pagename-sorting optname-show-subtotals-only))
(gnc:html-document-add-object! document table))))))
(gnc:report-finished)