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

Merge branch 'unstable-TR-bugfix' of https://github.com/christopherlam/gnucash into unstable

Browse Source
This commit is contained in:
Geert Janssens 2018-01-26 12:22:14 +01:00
commit 1b02517ea1
1 changed files with 2 additions and 3 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) ((damount (lambda (s) (if (gnc:split-voided? s)
(xaccSplitVoidFormerAmount s) (xaccSplitVoidFormerAmount s)
(xaccSplitGetAmount s)))) (xaccSplitGetAmount s))))
(trans-date (lambda (s) (gnc-transaction-get-date-posted (xaccSplitGetParent s)))) (trans-date (lambda (s) (xaccTransGetDate (xaccSplitGetParent s))))
(currency (lambda (s) (xaccAccountGetCommodity (xaccSplitGetAccount s)))) (currency (lambda (s) (xaccAccountGetCommodity (xaccSplitGetAccount s))))
(report-currency (lambda (s) (if (column-uses? 'common-currency) (report-currency (lambda (s) (if (column-uses? 'common-currency)
(opt-val gnc:pagename-general optname-currency) (opt-val gnc:pagename-general optname-currency)
@ -1087,7 +1087,6 @@ tags within description, notes or memo. ")
(gnc-commodity-get-mnemonic (gnc-commodity-get-mnemonic
(opt-val gnc:pagename-general optname-currency))) (opt-val gnc:pagename-general optname-currency)))
"")))) ""))))
(time64CanonicalDayTime (lambda (t64) (gnc-tm-set-day-middle (gnc-localtime t64))))
(convert (lambda (s num) (convert (lambda (s num)
(gnc:exchange-by-pricedb-nearest (gnc:exchange-by-pricedb-nearest
(gnc:make-gnc-monetary (currency s) num) (gnc:make-gnc-monetary (currency s) num)
@ -1095,7 +1094,7 @@ tags within description, notes or memo. ")
;; Use midday as the transaction time so it matches a price ;; Use midday as the transaction time so it matches a price
;; on the same day. Otherwise it uses midnight which will ;; on the same day. Otherwise it uses midnight which will
;; likely match a price on the previous day ;; likely match a price on the previous day
(timespecCanonicalDayTime (trans-date s))))) (time64CanonicalDayTime (trans-date s)))))
(split-value (lambda (s) (convert s (damount s)))) ; used for correct debit/credit (split-value (lambda (s) (convert s (damount s)))) ; used for correct debit/credit
(amount (lambda (s) (split-value s))) (amount (lambda (s) (split-value s)))
(debit-amount (lambda (s) (and (positive? (gnc:gnc-monetary-amount (split-value s))) (debit-amount (lambda (s) (and (positive? (gnc:gnc-monetary-amount (split-value s)))