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

[advanced-portfolio] bugfix. move functions top-level

Browse Source 
skipped during 8d47622ab. parent-or-sibling? was inaccessible to
table-add-stock-rows, causing errors that were not during internal
testing.
This commit is contained in:
Christopher Lam 2020-07-27 22:39:19 +08:00
parent d0d7fc8bc1
commit 150bfc8d1b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,6 +182,17 @@ by preventing negative stock balances.<br/>")
;; helper functions for renderer
(define (same-account? a1 a2)
(equal? (gncAccountGetGUID a1) (gncAccountGetGUID a2)))
;; Return true if either account is the parent of the other or they are siblings
(define (parent-or-sibling? a1 a2)
(let ((a2parent (gnc-account-get-parent a2))
(a1parent (gnc-account-get-parent a1)))
(or (same-account? a2parent a1)
(same-account? a1parent a2)
(same-account? a1parent a2parent))))
;; sum up the contents of the b-list built by basis-builder below
(define (sum-basis b-list currency-frac)
(fold (lambda (a b) (+ (* (car a) (cdr a)) b)) 0 b-list))
@ -897,9 +908,6 @@ by preventing negative stock balances.<br/>")
(define (same-split? s1 s2)
(equal? (gncSplitGetGUID s1) (gncSplitGetGUID s2)))
(define (same-account? a1 a2)
(equal? (gncAccountGetGUID a1) (gncAccountGetGUID a2)))
;; Given a price list and a currency find the price for that currency on the list.
;; If there is none for the requested currency, return the first one.
;; The price list is released but the price returned is ref counted.
@ -917,14 +925,6 @@ by preventing negative stock balances.<br/>")
(gnc-price-list-destroy price-list)
price)))
;; Return true if either account is the parent of the other or they are siblings
(define (parent-or-sibling? a1 a2)
(let ((a2parent (gnc-account-get-parent a2))
(a1parent (gnc-account-get-parent a1)))
(or (same-account? a2parent a1)
(same-account? a1parent a2)
(same-account? a1parent a2parent))))
;; Test whether the given split is the source of a spin off transaction
;; This will be a no-units split with only one other split.
;; xaccSplitGetOtherSplit only returns on a two-split txn. It's not a spinoff