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] multichoice option uses symbol instead of #f

Browse Source 
multichoice is designed to use symbols. use of #f is allowed but not
recommended according to the documentation.
This commit is contained in:
Christopher Lam 2020-05-01 21:33:54 +08:00
parent 6405c60f3d
commit c6e1029510
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ also show overall period profit & loss."))
(define periodlist
(list
(list #f
(list 'disabled
(cons 'text (_ "Disabled"))
(cons 'tip (_ "Disabled")))
@ -180,29 +180,30 @@ also show overall period profit & loss."))
(gnc:make-multichoice-callback-option
gnc:pagename-general optname-period
"c2" opthelp-period
#f
'disabled
(keylist->vectorlist periodlist)
#f
(lambda (x)
(gnc-option-db-set-option-selectable-by-name
options
gnc:pagename-general optname-disable-amount-indent
(not x))
(gnc-option-db-set-option-selectable-by-name
options
gnc:pagename-general optname-dual-columns
(not x))
(case report-type
((balsheet)
(gnc-option-db-set-option-selectable-by-name
options gnc:pagename-general optname-include-chart x)
(let ((x (not (eq? x 'disabled))))
(gnc-option-db-set-option-selectable-by-name
options
gnc:pagename-general optname-disable-amount-indent
(not x))
(gnc-option-db-set-option-selectable-by-name
options
gnc:pagename-general optname-dual-columns
(not x))
(case report-type
((balsheet)
(gnc-option-db-set-option-selectable-by-name
options gnc:pagename-general optname-include-chart x)
(gnc-option-db-set-option-selectable-by-name
options gnc:pagename-general optname-startdate x))
(gnc-option-db-set-option-selectable-by-name
options gnc:pagename-general optname-startdate x))
((pnl)
(gnc-option-db-set-option-selectable-by-name
options gnc:pagename-general optname-include-overall-period x))))))
((pnl)
(gnc-option-db-set-option-selectable-by-name
options gnc:pagename-general optname-include-overall-period x)))))))
(add-option
(gnc:make-simple-boolean-option
@ -704,10 +705,10 @@ also show overall period profit & loss."))
(disable-account-indent? (get-option gnc:pagename-display
optname-account-full-name))
(incr (get-option gnc:pagename-general optname-period))
(disable-amount-indent? (and (not incr)
(disable-amount-indent? (and (eq? incr 'disabled)
(get-option gnc:pagename-general
optname-disable-amount-indent)))
(enable-dual-columns? (and (not incr)
(enable-dual-columns? (and (eq? incr 'disabled)
(get-option gnc:pagename-general
optname-dual-columns)))
(accounts (get-option gnc:pagename-accounts
@ -753,7 +754,8 @@ also show overall period profit & loss."))
(report-dates
(cond
(incr (gnc:make-date-list startdate enddate (gnc:deltasym-to-delta incr)))
((not (eq? incr 'disabled))
(gnc:make-date-list startdate enddate (gnc:deltasym-to-delta incr)))
((eq? report-type 'pnl) (list startdate enddate))
(else (list enddate))))
@ -901,7 +903,7 @@ also show overall period profit & loss."))
(lambda ()
(display report-title)
(display " ")
(if (or incr (eq? report-type 'pnl))
(if (or (not (eq? incr 'disabled)) (eq? report-type 'pnl))
(format #t (_ "~a to ~a")
(qof-print-date startdate) (qof-print-date enddate))
(display (qof-print-date enddate))))))
@ -1017,7 +1019,7 @@ also show overall period profit & loss."))
(income-expense-balance 'format gnc:make-gnc-monetary #f)))))
(chart (and-let* (include-chart?
incr
(not (eq? incr 'disabled))
(curr (or common-currency book-main-currency))
(price (or price-source 'pricedb-nearest)))
(gnc:make-report-anchor
@ -1072,7 +1074,7 @@ also show overall period profit & loss."))
get-cell-anchor-fn)
))))
(when incr
(unless (eq? incr 'disabled)
(add-to-table multicol-table-left (_ "Date") '()
#:get-col-header-fn get-col-header-fn
#:show-accounts? #f
@ -1110,7 +1112,7 @@ also show overall period profit & loss."))
#:show-accounts? #f
#:show-total? #f))
(if (and include-chart? incr)
(if (and include-chart? (not (eq? incr 'disabled)))
(gnc:html-document-add-object!
doc
(gnc:make-html-text
@ -1149,7 +1151,7 @@ also show overall period profit & loss."))
(let ((datepair (col-idx->datepair col-idx))
(show-orig? (and common-currency #t))
(curr (or common-currency book-main-currency))
(delta (or incr 'MonthDelta))
(delta (or (not (eq? incr 'disabled)) 'MonthDelta))
(price (or price-source 'pricedb-nearest))
(accts (if (pair? account) account (list account))))
(gnc:make-report-anchor
@ -1166,7 +1168,7 @@ also show overall period profit & loss."))
(chart
(and-let* (include-chart?
(curr (or common-currency book-main-currency))
(delta (or incr 'MonthDelta))
(delta (or (not (eq? incr 'disabled)) 'MonthDelta))
(price (or price-source 'pricedb-nearest)))
(gnc:make-report-anchor
pnl-barchart-uuid report-obj
@ -1225,7 +1227,7 @@ also show overall period profit & loss."))
#:get-cell-anchor-fn (and use-amount-links?
get-cell-anchor-fn)))))
(when incr
(unless (eq? incr 'disabled)
(add-to-table multicol-table-left (_ "Period") '()
#:get-col-header-fn get-col-header-fn
#:show-accounts? #f

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

@ -540,7 +540,7 @@
;; the following includes non-zero retained earnings of $1,270
(set-option! multi-bs-options "General" "End Date"
(cons 'absolute (gnc-dmy2time64 1 3 1980)))
(set-option! multi-bs-options "General" "Period duration" #f)
(set-option! multi-bs-options "General" "Period duration" 'disabled)
(let ((sxml (options->sxml multicol-balsheet-uuid multi-bs-options
"multicol-balsheet-retained")))
(test-equal "bal-1/3/80"