IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[balsheet-pnl] test "lvl <= depth-limit" outside add-indented-row

Browse Source 
this will be the first step trying to fix bug 798502. the bug likely
resides in the (if) conditional in (add-account-row).
This commit is contained in:
Christopher Lam 2022-04-24 16:20:07 +08:00
parent e381e70638
commit 7f316b8bdd
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gnucash/report/reports/standard/balsheet-pnl.scm
View File

@ -382,28 +382,30 @@ also show overall period profit & loss."))
(define (make-narrow-cell) (define (make-narrow-cell)
(gnc:make-html-table-cell/min-width 1)) (gnc:make-html-table-cell/min-width 1))
(define (show-depth? lvl)
(or (not depth-limit) (<= lvl depth-limit)))
(define (add-indented-row indent label label-markup row-markup amount-indent rest) (define (add-indented-row indent label label-markup row-markup amount-indent rest)
(when (or (not depth-limit) (<= indent depth-limit)) (let* ((account-cell (if label-markup
(let* ((account-cell (if label-markup (gnc:make-html-table-cell/size/markup
(gnc:make-html-table-cell/size/markup 1 (if disable-account-indent? 1 (- maxindent indent))
1 (if disable-account-indent? 1 (- maxindent indent)) label-markup label)
label-markup label) (gnc:make-html-table-cell/size
(gnc:make-html-table-cell/size 1 (if disable-account-indent? 1 (- maxindent indent))
1 (if disable-account-indent? 1 (- maxindent indent)) label)))
label))) (row (append
(row (append (if disable-account-indent?
(if disable-account-indent? '()
'() (make-list-thunk indent make-narrow-cell))
(make-list-thunk indent make-narrow-cell)) (list account-cell)
(list account-cell) (gnc:html-make-empty-cells
(gnc:html-make-empty-cells (if amount-indenting? (1- amount-indent) 0))
(if amount-indenting? (1- amount-indent) 0)) (if reverse-cols? (reverse rest) rest)
(if reverse-cols? (reverse rest) rest) (gnc:html-make-empty-cells
(gnc:html-make-empty-cells (if amount-indenting? (- maxindent amount-indent) 0)))))
(if amount-indenting? (- maxindent amount-indent) 0))))) (if row-markup
(if row-markup (gnc:html-table-append-row/markup! table row-markup row)
(gnc:html-table-append-row/markup! table row-markup row) (gnc:html-table-append-row! table row))))
(gnc:html-table-append-row! table row)))))
(define (monetary+ . monetaries) (define (monetary+ . monetaries)
;; usage: (monetary+ monetary...) ;; usage: (monetary+ monetary...)
@ -518,8 +520,9 @@ also show overall period profit & loss."))
((_ . tail) (lp1 tail)))))))) ((_ . tail) (lp1 tail))))))))
(define* (add-recursive-subtotal lvl lvl-acct #:key account-style-normal?) (define* (add-recursive-subtotal lvl lvl-acct #:key account-style-normal?)
(if (or show-zb-accts? (if (and (or show-zb-accts?
(is-not-zero? (account-and-descendants lvl-acct))) (is-not-zero? (account-and-descendants lvl-acct)))
(show-depth? lvl))
(add-indented-row lvl (add-indented-row lvl
(render-account lvl-acct (not account-style-normal?)) (render-account lvl-acct (not account-style-normal?))
(if account-style-normal? (if account-style-normal?
@ -545,9 +548,10 @@ also show overall period profit & loss."))
(define* (add-account-row lvl-curr curr #:key (define* (add-account-row lvl-curr curr #:key
(override-show-zb-accts? #f) (override-show-zb-accts? #f)
(account-indent 0)) (account-indent 0))
(if (or show-zb-accts? (if (and (or show-zb-accts?
override-show-zb-accts? override-show-zb-accts?
(is-not-zero? (list curr))) (is-not-zero? (list curr)))
(show-depth? lvl-curr))
(add-indented-row lvl-curr (add-indented-row lvl-curr
(render-account curr #f) (render-account curr #f)
"text-cell" "text-cell"