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

Bug 798036 - Transaction Report should offer price source

Browse Source
This commit is contained in:
Christopher Lam 2020-12-02 07:41:12 +08:00
parent cc64f197ae
commit a8bed43dcb
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnucash/report/trep-engine.scm
View File

@ -76,6 +76,7 @@
;;General ;;General
(define optname-startdate (N_ "Start Date")) (define optname-startdate (N_ "Start Date"))
(define optname-enddate (N_ "End Date")) (define optname-enddate (N_ "End Date"))
(define optname-price-source (N_ "Price Source"))
(define optname-table-export (N_ "Table for Exporting")) (define optname-table-export (N_ "Table for Exporting"))
(define optname-common-currency (N_ "Common Currency")) (define optname-common-currency (N_ "Common Currency"))
(define optname-orig-currency (N_ "Show original currency amount")) (define optname-orig-currency (N_ "Show original currency amount"))
@ -545,6 +546,9 @@ Credit Card, and Income accounts."))
(gnc-option-db-set-option-selectable-by-name (gnc-option-db-set-option-selectable-by-name
options gnc:pagename-general optname-orig-currency x)))) options gnc:pagename-general optname-orig-currency x))))
(gnc:options-add-price-source!
options gnc:pagename-general optname-price-source "e5" 'pricedb-nearest)
(gnc:options-add-currency! (gnc:options-add-currency!
options gnc:pagename-general optname-currency "f") options gnc:pagename-general optname-currency "f")
@ -1051,7 +1055,7 @@ be excluded from periodic reporting.")
;; Here comes the big function that builds the whole table. ;; Here comes the big function that builds the whole table.
(define (make-split-table splits options custom-calculated-cells (define (make-split-table splits options custom-calculated-cells
begindate) begindate enddate c_account_1)
(define (opt-val section name) (define (opt-val section name)
(let ((option (gnc:lookup-option options section name))) (let ((option (gnc:lookup-option options section name)))
@ -1145,7 +1149,15 @@ be excluded from periodic reporting.")
(gnc-reverse-balance acc))) (gnc-reverse-balance acc)))
(define (column-uses? param) (define (column-uses? param)
(cdr (assq param used-columns))) (assq-ref used-columns param))
(define exchange-fn
(if (column-uses? 'common-currency)
(gnc:case-exchange-time-fn
(opt-val gnc:pagename-general optname-price-source)
(opt-val gnc:pagename-general optname-currency)
(gnc:accounts-get-commodities c_account_1 #f) enddate #f #f)
gnc:exchange-by-pricedb-nearest))
(define left-columns (define left-columns
(let* ((add-if (lambda (pred? . items) (if pred? items '()))) (let* ((add-if (lambda (pred? . items) (if pred? items '())))
@ -1306,7 +1318,7 @@ be excluded from periodic reporting.")
;; Otherwise it uses midnight which will likely match a ;; Otherwise it uses midnight which will likely match a
;; price on the previous day ;; price on the previous day
(converted-amount (lambda (s) (converted-amount (lambda (s)
(gnc:exchange-by-pricedb-nearest (exchange-fn
(gnc:make-gnc-monetary (split-currency s) (gnc:make-gnc-monetary (split-currency s)
(split-amount s)) (split-amount s))
(row-currency s) (row-currency s)
@ -2223,7 +2235,7 @@ warning will be removed in GnuCash 5.0"))
(else (else
(let-values (((table grid csvlist) (let-values (((table grid csvlist)
(make-split-table splits options custom-calculated-cells (make-split-table splits options custom-calculated-cells
begindate))) begindate enddate c_account_1)))
(gnc:html-document-set-title! document report-title) (gnc:html-document-set-title! document report-title)