From a5306d045411028b15f5ac040a1cf33c749d5432 Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Sun, 10 Dec 2017 10:17:06 +0800 Subject: [PATCH] REFACTOR: improve heading-list to handle dual headings --- gnucash/report/standard-reports/transaction.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm index 7ec875b6b6..65f17eb74f 100644 --- a/gnucash/report/standard-reports/transaction.scm +++ b/gnucash/report/standard-reports/transaction.scm @@ -1055,7 +1055,7 @@ Credit Card, and Income accounts.")))))) (cons 'notes (opt-val gnc:pagename-display (N_ "Notes"))))) (define (make-heading-list columns-used) - (define (add-if pred? item) (if pred? (list item) '())) + (define (add-if pred? . items) (if pred? items '())) (append (add-if (column-uses? 'date columns-used) (_ "Date")) @@ -1087,11 +1087,9 @@ Credit Card, and Income accounts.")))))) (add-if (column-uses? 'amount-single columns-used) (_ "Amount")) ;; FIXME: Proper labels: what? - (if (column-uses? 'amount-double columns-used) - (list - (_ "Debit") - (_ "Credit")) - '()) + (add-if (column-uses? 'amount-double columns-used) + (_ "Debit") + (_ "Credit")) (add-if (column-uses? 'running-balance columns-used) (_ "Balance"))))