IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-16 18:25:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch Chris Lam's 'unstable-TR-fix' of into unstable.

Browse Source
This commit is contained in:
John Ralls 2018-01-18 12:24:39 -08:00
commit 47308f6bfd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)))
@ -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?