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: date-grouping must allow indenting

Browse Source 
Indenting checkbox was erroneously disabled when: sortkey = date,
date-subtotal = not 'none.

This commit will allow indenting option in the above case.
This commit is contained in:
Christopher Lam 2019-01-11 13:15:14 +08:00
parent 8f2776dabd
commit 74d4be19dc
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -658,8 +658,10 @@ be excluded from periodic reporting.")
(date-subtotal-choice-list (keylist->vectorlist date-subtotal-list))
(prime-sortkey 'account-name)
(prime-sortkey-subtotal-true #t)
(prime-date-subtotal 'monthly)
(sec-sortkey 'register-order)
(sec-sortkey-subtotal-true #f))
(sec-sortkey-subtotal-true #f)
(sec-date-subtotal 'monthly))
(define (apply-selectable-by-name-sorting-options)
(let* ((prime-sortkey-enabled (not (eq? prime-sortkey 'none)))
@ -703,14 +705,16 @@ be excluded from periodic reporting.")
(gnc-option-db-set-option-selectable-by-name
options pagename-sorting optname-indenting
(or (and prime-sortkey-subtotal-enabled prime-sortkey-subtotal-true)
(and sec-sortkey-subtotal-enabled sec-sortkey-subtotal-true)))
(and sec-sortkey-subtotal-enabled sec-sortkey-subtotal-true)
(and prime-date-sortingtype-enabled (not (eq? 'none prime-date-subtotal)))
(and sec-date-sortingtype-enabled (not (eq? 'none sec-date-subtotal)))))
(gnc-option-db-set-option-selectable-by-name
options pagename-sorting optname-show-subtotals-only
(or (and prime-sortkey-subtotal-enabled prime-sortkey-subtotal-true)
(and sec-sortkey-subtotal-enabled sec-sortkey-subtotal-true)
prime-date-sortingtype-enabled
sec-date-sortingtype-enabled))
(and prime-date-sortingtype-enabled (not (eq? 'none prime-date-subtotal)))
(and sec-date-sortingtype-enabled (not (eq? 'none sec-date-subtotal)))))
(gnc-option-db-set-option-selectable-by-name
options pagename-sorting optname-show-informal-headers
@ -789,11 +793,14 @@ be excluded from periodic reporting.")
(apply-selectable-by-name-sorting-options))))
(gnc:register-trep-option
(gnc:make-multichoice-option
(gnc:make-multichoice-callback-option
pagename-sorting optname-prime-date-subtotal
"e2" (_ "Do a date subtotal.")
'monthly
date-subtotal-choice-list))
prime-date-subtotal
date-subtotal-choice-list #f
(lambda (x)
(set! prime-date-subtotal x)
(apply-selectable-by-name-sorting-options))))
(gnc:register-trep-option
(gnc:make-multichoice-option
@ -825,11 +832,14 @@ be excluded from periodic reporting.")
(apply-selectable-by-name-sorting-options))))
(gnc:register-trep-option
(gnc:make-multichoice-option
(gnc:make-multichoice-callback-option
pagename-sorting optname-sec-date-subtotal
"i2" (_ "Do a date subtotal.")
'monthly
date-subtotal-choice-list))
sec-date-subtotal
date-subtotal-choice-list #f
(lambda (x)
(set! sec-date-subtotal x)
(apply-selectable-by-name-sorting-options))))
(gnc:register-trep-option
(gnc:make-multichoice-option