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

REFACTOR:Centralise sign-reverse-list

Browse Source 
This allows us to centralise its account type list.
This commit is contained in:
Christopher Lam 2017-11-26 13:27:29 +08:00
parent 3b3c0322cf
commit 20feefe681
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,6 +319,28 @@ options specified in the Options panels."))
(cons 'text (N_ "Descending")) (cons 'text (N_ "Descending"))
(cons 'tip (N_ "Largest to smallest, latest to earliest.")))))) (cons 'tip (N_ "Largest to smallest, latest to earliest."))))))
(define sign-reverse-list
(list
(cons 'none
(list
(cons 'text (N_ "None"))
(cons 'tip (N_ "Don't change any displayed amounts."))
(cons 'acct-types '())))
(cons 'income-expense
(list
(cons 'text (N_ "Income and Expense"))
(cons 'tip (N_ "Reverse amount display for Income and Expense Accounts."))
(cons 'acct-types (list ACCT-TYPE-INCOME ACCT-TYPE-EXPENSE))))
(cons 'credit-accounts
(list
(cons 'text (N_ "Credit Accounts"))
(cons 'tip (N_ "Reverse amount display for Liability, Payable, Equity, \
Credit Card, and Income accounts."))
(cons 'acct-types (list ACCT-TYPE-LIABILITY ACCT-TYPE-PAYABLE
ACCT-TYPE-EQUITY ACCT-TYPE-CREDIT
ACCT-TYPE-INCOME))))))
(define (keylist-get-info keylist key info) (define (keylist-get-info keylist key info)
(cdr (assq info (cdr (assq key keylist))))) (cdr (assq info (cdr (assq key keylist)))))
@ -461,13 +483,13 @@ tags within description, notes or memo. ")
;; Sorting options ;; Sorting options
(let ((ascending-choice-list (keylist->vectorlist ascending-list)) (let ((ascending-choice-list (keylist->vectorlist ascending-list))
(key-choice-list (keylist->vectorlist sortkey-list))
(date-subtotal-choice-list (keylist->vectorlist date-subtotal-list))
(prime-sortkey 'account-name) (prime-sortkey 'account-name)
(prime-sortkey-subtotal-true #t) (prime-sortkey-subtotal-true #t)
(sec-sortkey 'register-order) (sec-sortkey 'register-order)
(sec-sortkey-subtotal-true #f) (sec-sortkey-subtotal-true #f))
(key-choice-list (keylist->vectorlist sortkey-list))
(date-subtotal-choice-list (keylist->vectorlist date-subtotal-list)))
(define (apply-selectable-by-name-sorting-options) (define (apply-selectable-by-name-sorting-options)
(let* ((prime-sortkey-enabled (not (eq? prime-sortkey 'none))) (let* ((prime-sortkey-enabled (not (eq? prime-sortkey 'none)))
@ -740,16 +762,7 @@ tags within description, notes or memo. ")
gnc:pagename-display (N_ "Sign Reverses") gnc:pagename-display (N_ "Sign Reverses")
"m1" (N_ "Reverse amount display for certain account types.") "m1" (N_ "Reverse amount display for certain account types.")
'credit-accounts 'credit-accounts
(list (vector 'none (keylist->vectorlist sign-reverse-list))))
(N_ "None")
(N_ "Don't change any displayed amounts."))
(vector 'income-expense
(N_ "Income and Expense")
(N_ "Reverse amount display for Income and Expense Accounts."))
(vector 'credit-accounts
(N_ "Credit Accounts")
(N_ "Reverse amount display for Liability, Payable, Equity, \
Credit Card, and Income accounts."))))))
(gnc:options-set-default-section options gnc:pagename-general) (gnc:options-set-default-section options gnc:pagename-general)
options) options)
@ -853,12 +866,9 @@ Credit Card, and Income accounts."))))))
(width (length headings)) (width (length headings))
(width-amount (length amount-headings)) (width-amount (length amount-headings))
(account-types-to-reverse (account-types-to-reverse
(case (opt-val gnc:pagename-display (N_ "Sign Reverses")) (keylist-get-info sign-reverse-list
((none) '()) (opt-val gnc:pagename-display (N_ "Sign Reverses"))
((income-expense) (list ACCT-TYPE-INCOME ACCT-TYPE-EXPENSE)) 'acct-types))
((credit-accounts) (list ACCT-TYPE-LIABILITY ACCT-TYPE-PAYABLE
ACCT-TYPE-EQUITY ACCT-TYPE-CREDIT
ACCT-TYPE-INCOME))))
(is-multiline? (eq? (opt-val gnc:pagename-display optname-detail-level) 'multi-line)) (is-multiline? (eq? (opt-val gnc:pagename-display optname-detail-level) 'multi-line))
(export? (opt-val gnc:pagename-general optname-table-export))) (export? (opt-val gnc:pagename-general optname-table-export)))