REFACTOR: simplify num/t-num display code

This commit is contained in:
Christopher Lam 2017-11-29 18:27:30 +08:00
parent 005fdb5f43
commit 39dceb5534

View File

@ -877,20 +877,18 @@ tags within description, notes or memo. ")
(_ "Num/T-Num") (_ "Num/T-Num")
(_ "Num")) (_ "Num"))
(lambda (split transaction-row?) (lambda (split transaction-row?)
(define trans (xaccSplitGetParent split)) (let* ((trans (xaccSplitGetParent split))
(if transaction-row? (num (gnc-get-num-action trans split))
(if BOOK-SPLIT-ACTION (t-num (if (and BOOK-SPLIT-ACTION
(let* ((num (gnc-get-num-action trans split)) (opt-val gnc:pagename-display (N_ "Trans Number")))
(t-num (if (opt-val gnc:pagename-display (N_ "Trans Number")) (gnc-get-num-action trans #f)
(gnc-get-num-action trans #f) ""))
"")) (num-string (if (string-null? t-num)
(num-string (if (string-null? t-num) num
num (string-append num "/" t-num))))
(string-append num "/" t-num)))) (if transaction-row?
(gnc:make-html-table-cell/markup "text-cell" num-string)) (gnc:make-html-table-cell/markup "text-cell" num-string)
(gnc:make-html-table-cell/markup "text-cell" "")))))
(gnc-get-num-action trans split)))
""))))
(add-if (column-uses? 'description) (add-if (column-uses? 'description)
(vector (_ "Description") (vector (_ "Description")