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

make some improvements to handling of moneyin/out. Clean up some cruft. Fixes #355660. May at least partially fix #346062

Browse Source 
BP


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16684 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andrew Sackville-West 2007-12-19 21:59:44 +00:00
parent 1fb8b422e6
commit 411abc0d7b
1 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/report/standard-reports/advanced-portfolio.scm
View File

@ -306,8 +306,8 @@
((and (gnc-numeric-zero-p b-units)
(not (gnc-numeric-zero-p b-value)))
(let* ((current-value (sum-basis b-list))
(value-ratio (gnc-numeric-div (gnc-numeric-add b-value current-value 100000 GNC-RND-ROUND)
current-value 100000 GNC-RND-ROUND)))
(value-ratio (gnc-numeric-div (gnc-numeric-add b-value current-value 100000 GNC-RND-ROUND)
current-value 100000 GNC-RND-ROUND)))
(gnc:debug "this is a spinoff")
(gnc:debug "blist is " b-list " value ratio is " value-ratio)
@ -470,47 +470,31 @@
(gnc:debug "going in to basis list " basis-list split-units split-value)
;; first fix the basis. but only when we are dealing with the actual stock
;; are we dealing with the actual stock/fund?
(if (same-account? current (xaccSplitGetAccount s))
(set! basis-list (basis-builder basis-list split-units (gnc:gnc-monetary-amount
(exchange-fn (gnc:make-gnc-monetary
commod-currency split-value)
currency)) basis-method)))
(begin
;; adjust the basis
(set! basis-list (basis-builder basis-list split-units (gnc:gnc-monetary-amount
(exchange-fn (gnc:make-gnc-monetary
commod-currency split-value)
currency)) basis-method))
;; adjust moneyin/out
(if (gnc-numeric-positive-p split-value)
;; but only adjust moneyin if it's not a spinoff
(if (or (null? (xaccSplitGetOtherSplit s))
(not (gnc-numeric-zero-p (xaccSplitGetAmount (xaccSplitGetOtherSplit s)))))
(moneyincoll 'add commod-currency split-value))
(moneyoutcoll 'add commod-currency (gnc-numeric-neg split-value)))
)
)
(gnc:debug "coming out of basis list " basis-list)
;; now look at what else we have to work with
(cond
;; are we looking at the same
;; account? that means we're
;; dealing strictly with the
;; amount of stock moving, and
;; its value, adjust the money
;; collectors ((same-account?
;; current (xaccSplitGetAccount
;; s)) if the commod-currency and
;; the commodity of this split,
;; s, are the same then we're
;; dealing with actual money
;; being shuffled and we need to
;; adjust moneyin/out
((equal? commod-currency (xaccAccountGetCommodity (xaccSplitGetAccount s)))
(begin
(gnc:debug "adjsting the moneyin/out " split-value)
(if (gnc-numeric-negative-p split-value)
(moneyincoll 'add commod-currency
(gnc-numeric-neg split-value))
(moneyoutcoll 'add commod-currency split-value)
)
)
)
)
)
)
;; here is where we handle a spin-off txn. This will be a no-units
;; transaction with only one other split. xaccSplitGetOtherSplit only
;; returns on a two-split txn :)
;; FIXME!! not implemented in basis-builder yet!
((and (gnc-numeric-zero-p txn-units) (not (null? (xaccSplitGetOtherSplit s))))
(if (same-account? current (xaccSplitGetAccount s))
(set! basis-list (basis-builder basis-list split-units (gnc:gnc-monetary-amount