From 39dceb55344eb07db45ab6c87d9eb2b9e2c55161 Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Wed, 29 Nov 2017 18:27:30 +0800 Subject: [PATCH] REFACTOR: simplify num/t-num display code --- .../report/standard-reports/transaction.scm | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm index aa64236f95..23bef7d798 100644 --- a/gnucash/report/standard-reports/transaction.scm +++ b/gnucash/report/standard-reports/transaction.scm @@ -877,20 +877,18 @@ tags within description, notes or memo. ") (_ "Num/T-Num") (_ "Num")) (lambda (split transaction-row?) - (define trans (xaccSplitGetParent split)) - (if transaction-row? - (if BOOK-SPLIT-ACTION - (let* ((num (gnc-get-num-action trans split)) - (t-num (if (opt-val gnc:pagename-display (N_ "Trans Number")) - (gnc-get-num-action trans #f) - "")) - (num-string (if (string-null? t-num) - num - (string-append num "/" t-num)))) - (gnc:make-html-table-cell/markup "text-cell" num-string)) - (gnc:make-html-table-cell/markup "text-cell" - (gnc-get-num-action trans split))) - "")))) + (let* ((trans (xaccSplitGetParent split)) + (num (gnc-get-num-action trans split)) + (t-num (if (and BOOK-SPLIT-ACTION + (opt-val gnc:pagename-display (N_ "Trans Number"))) + (gnc-get-num-action trans #f) + "")) + (num-string (if (string-null? t-num) + num + (string-append num "/" t-num)))) + (if transaction-row? + (gnc:make-html-table-cell/markup "text-cell" num-string) + ""))))) (add-if (column-uses? 'description) (vector (_ "Description")