From 933ae74b415b4e5d2bc691ab031eec1e1fc6eaa6 Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Wed, 10 Jan 2018 23:36:26 +1100 Subject: [PATCH 1/2] BUGFIX TR common currency was broken --- gnucash/report/standard-reports/transaction.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm index 0ee0df3fd9..71226a7cfb 100644 --- a/gnucash/report/standard-reports/transaction.scm +++ b/gnucash/report/standard-reports/transaction.scm @@ -1071,7 +1071,7 @@ tags within description, notes or memo. ") ((damount (lambda (s) (if (gnc:split-voided? s) (xaccSplitVoidFormerAmount s) (xaccSplitGetAmount s)))) - (trans-date (lambda (s) (gnc-transaction-get-date-posted (xaccSplitGetTransaction s)))) + (trans-date (lambda (s) (gnc-transaction-get-date-posted (xaccSplitGetParent s)))) (currency (lambda (s) (xaccAccountGetCommodity (xaccSplitGetAccount s)))) (report-currency (lambda (s) (if (column-uses? 'common-currency) (opt-val gnc:pagename-general optname-currency) @@ -1095,7 +1095,7 @@ tags within description, notes or memo. ") ;; Use midday as the transaction time so it matches a price ;; on the same day. Otherwise it uses midnight which will ;; likely match a price on the previous day - (timespecCanonicalDayTime trans-date)))) + (timespecCanonicalDayTime (trans-date s))))) (split-value (lambda (s) (convert s (damount s)))) ; used for correct debit/credit (amount (lambda (s) (split-value s))) (debit-amount (lambda (s) (and (positive? (gnc:gnc-monetary-amount (split-value s))) From a0577cd0e7524fb77fcf605a8c5c6975a4870085 Mon Sep 17 00:00:00 2001 From: Christopher Lam Date: Sun, 7 Jan 2018 22:30:24 +1100 Subject: [PATCH 2/2] BUGFIX: enable informal headers for dual-column only --- gnucash/report/standard-reports/transaction.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnucash/report/standard-reports/transaction.scm b/gnucash/report/standard-reports/transaction.scm index 71226a7cfb..702f75ae44 100644 --- a/gnucash/report/standard-reports/transaction.scm +++ b/gnucash/report/standard-reports/transaction.scm @@ -1204,6 +1204,7 @@ tags within description, notes or memo. ") (for-each (lambda (cell) (addto! row-contents cell)) (gnc:html-make-empty-cells left-indent)) (if (and (opt-val pagename-sorting optname-show-informal-headers) + (column-uses? 'amount-double) (member sortkey SORTKEY-INFORMAL-HEADERS)) (begin (if export?