mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
[new-aging] step 3 - only render APAR details if APAR-accounts>1
This commit will hide the APAR account anchor if there's only one found. So, for majority of users with single AP/AR accounts, the aging report will be very similar to old one. For users with multi APAR accounts, each one will be shown with header (and anchor) and indenting to highlight grouping.
This commit is contained in:
parent
97798f9fd1
commit
6f7c6b9de3
@ -192,8 +192,7 @@ exist but have no suitable transactions."))
|
||||
(gnc:option-value (gnc:lookup-option options section name)))
|
||||
|
||||
(define make-heading-list
|
||||
(list ""
|
||||
(_ "Company")
|
||||
(list (_ "Company")
|
||||
(_ "Prepayments")
|
||||
(_ "Current")
|
||||
(_ "0-30 days")
|
||||
@ -258,10 +257,12 @@ exist but have no suitable transactions."))
|
||||
document (gnc:make-html-text empty-APAR-accounts)))
|
||||
|
||||
(else
|
||||
(let ((table (gnc:make-html-table)))
|
||||
(let ((table (gnc:make-html-table))
|
||||
(accounts>1? (> (length accounts-and-owners) 1)))
|
||||
|
||||
(gnc:html-table-set-col-headers!
|
||||
table (append make-heading-list
|
||||
table (append (if accounts>1? '(#f) '())
|
||||
make-heading-list
|
||||
(options->address options receivable #f)))
|
||||
|
||||
(for-each
|
||||
@ -271,13 +272,14 @@ exist but have no suitable transactions."))
|
||||
(acc-totals (caddr account-and-owners))
|
||||
(comm (xaccAccountGetCommodity account)))
|
||||
|
||||
(when accounts>1?
|
||||
(gnc:html-table-append-row!
|
||||
table (list (gnc:make-html-table-cell/size
|
||||
1 (+ 2 num-buckets)
|
||||
(gnc:make-html-text
|
||||
(gnc:html-markup-anchor
|
||||
(gnc:account-anchor-text account)
|
||||
(xaccAccountGetName account))))))
|
||||
(xaccAccountGetName account)))))))
|
||||
|
||||
(for-each
|
||||
(lambda (owner-and-aging)
|
||||
@ -287,7 +289,7 @@ exist but have no suitable transactions."))
|
||||
(gnc:html-table-append-row!
|
||||
table
|
||||
(append
|
||||
(list #f)
|
||||
(if accounts>1? '(#f) '())
|
||||
(cons
|
||||
(gnc:make-html-text
|
||||
(gnc:html-markup-anchor
|
||||
@ -309,9 +311,10 @@ exist but have no suitable transactions."))
|
||||
owners-and-aging)
|
||||
(gnc:html-table-append-row!
|
||||
table
|
||||
(cons* #f
|
||||
(gnc:make-html-table-cell/markup
|
||||
"total-label-cell" (_ "Total"))
|
||||
(append
|
||||
(if accounts>1? '(#f) '())
|
||||
(list (gnc:make-html-table-cell/markup
|
||||
"total-label-cell" (_ "Total")))
|
||||
(map
|
||||
(lambda (amt)
|
||||
(gnc:make-html-table-cell/markup
|
||||
|
Loading…
Reference in New Issue
Block a user