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

TP->T64: gnucash/report/standard-reports/advanced-portfolio.scm

Browse Source
This commit is contained in:
Christopher Lam 2017-11-24 23:38:34 +08:00
parent c218c267ba
commit a4fe497985
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnucash/report/standard-reports/advanced-portfolio.scm
View File

@ -535,11 +535,11 @@
(gnc:report-percent-done (* 100 (/ work-done work-to-do))) (gnc:report-percent-done (* 100 (/ work-done work-to-do)))
(let* ((parent (xaccSplitGetParent split)) (let* ((parent (xaccSplitGetParent split))
(txn-date (gnc-transaction-get-date-posted parent)) (txn-date (xaccTransGetDate parent))
(commod-currency (xaccTransGetCurrency parent)) (commod-currency (xaccTransGetCurrency parent))
(commod-currency-frac (gnc-commodity-get-fraction commod-currency))) (commod-currency-frac (gnc-commodity-get-fraction commod-currency)))
(if (and (gnc:timepair-le txn-date to-date) (if (and (<= txn-date to-date)
(not (assoc-ref seen_trans (gncTransGetGUID parent)))) (not (assoc-ref seen_trans (gncTransGetGUID parent))))
(let ((trans-income (gnc-numeric-zero)) (let ((trans-income (gnc-numeric-zero))
(trans-brokerage (gnc-numeric-zero)) (trans-brokerage (gnc-numeric-zero))
@ -828,9 +828,9 @@
;; This is safe because xaccSplitGetAccount returns null for a null split ;; This is safe because xaccSplitGetAccount returns null for a null split
(other-acct (xaccSplitGetAccount other-split)) (other-acct (xaccSplitGetAccount other-split))
(parent (xaccSplitGetParent split)) (parent (xaccSplitGetParent split))
(txn-date (gnc-transaction-get-date-posted parent))) (txn-date (xaccTransGetDate parent)))
(if (and (not (null? other-acct)) (if (and (not (null? other-acct))
(gnc:timepair-le txn-date to-date) (<= txn-date to-date)
(string=? (xaccAccountGetName other-acct) account-name) (string=? (xaccAccountGetName other-acct) account-name)
(gnc-commodity-is-currency (xaccAccountGetCommodity other-acct))) (gnc-commodity-is-currency (xaccAccountGetCommodity other-acct)))
;; This is a two split transaction where the other split is to an ;; This is a two split transaction where the other split is to an
@ -1025,7 +1025,7 @@
(gnc:html-document-set-title! (gnc:html-document-set-title!
document (string-append document (string-append
report-title report-title
(sprintf #f " %s" (gnc-print-date to-date)))) (sprintf #f " %s" (qof-print-date to-date))))
(if (not (null? accounts)) (if (not (null? accounts))
; at least 1 account selected ; at least 1 account selected
@ -1040,7 +1040,7 @@
((pricedb-nearest) ((pricedb-nearest)
(lambda (foreign domestic date) (lambda (foreign domestic date)
(find-price (gnc-pricedb-lookup-nearest-in-time-any-currency (find-price (gnc-pricedb-lookup-nearest-in-time-any-currency
pricedb foreign (timespecCanonicalDayTime date)) domestic))))) pricedb foreign (time64CanonicalDayTime date)) domestic)))))
(headercols (list (_ "Account"))) (headercols (list (_ "Account")))
(totalscols (list (gnc:make-html-table-cell/markup "total-label-cell" (_ "Total")))) (totalscols (list (gnc:make-html-table-cell/markup "total-label-cell" (_ "Total"))))
(sum-total-moneyin (gnc-numeric-zero)) (sum-total-moneyin (gnc-numeric-zero))