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 'maint'

Browse Source
This commit is contained in:
Mike Alexander 2014-05-25 19:10:03 -04:00
commit 81fb773856
9 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
accounts/C/acctchrt_homeloan.gnucash-xea
View File

@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value> <slot:value type="string">true</slot:value>
</slot> </slot>
</act:slots> </act:slots>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Mortgage Loan</act:name> <act:name>Mortgage Loan</act:name>

1
accounts/C/acctchrt_otherloan.gnucash-xea
View File

@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value> <slot:value type="string">true</slot:value>
</slot> </slot>
</act:slots> </act:slots>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Other Loan</act:name> <act:name>Other Loan</act:name>

1
accounts/C/acctchrt_retiremt.gnucash-xea
View File

@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value> <slot:value type="string">true</slot:value>
</slot> </slot>
</act:slots> </act:slots>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Retirement</act:name> <act:name>Retirement</act:name>

1
accounts/C/acctchrt_spouseretire.gnucash-xea
View File

@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value> <slot:value type="string">true</slot:value>
</slot> </slot>
</act:slots> </act:slots>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Spouse Retirement</act:name> <act:name>Spouse Retirement</act:name>

1
accounts/en_GB/acctchrt_homeloan.gnucash-xea
View File

@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value> <slot:value type="string">true</slot:value>
</slot> </slot>
</act:slots> </act:slots>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Mortgage Loan</act:name> <act:name>Mortgage Loan</act:name>

1
accounts/en_GB/acctchrt_otherloan.gnucash-xea
View File

@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value> <slot:value type="string">true</slot:value>
</slot> </slot>
</act:slots> </act:slots>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Other Loan</act:name> <act:name>Other Loan</act:name>

1
accounts/en_GB/acctchrt_retiremt.gnucash-xea
View File

@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value> <slot:value type="string">true</slot:value>
</slot> </slot>
</act:slots> </act:slots>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Retirement</act:name> <act:name>Retirement</act:name>

1
accounts/en_GB/acctchrt_spouseretire.gnucash-xea
View File

@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value> <slot:value type="string">true</slot:value>
</slot> </slot>
</act:slots> </act:slots>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Spouse Retirement</act:name> <act:name>Spouse Retirement</act:name>

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

@ -438,12 +438,13 @@
) )
(define (my-exchange-fn fromunits tocurrency) (define (my-exchange-fn fromunits tocurrency)
(if (and use-txn (if (and (gnc-commodity-equiv currency tocurrency)
(gnc-commodity-equiv currency tocurrency)
(gnc-commodity-equiv (gnc:gnc-monetary-commodity fromunits) commodity)) (gnc-commodity-equiv (gnc:gnc-monetary-commodity fromunits) commodity))
(gnc:make-gnc-monetary tocurrency (gnc:make-gnc-monetary tocurrency
(gnc-numeric-mul (gnc:gnc-monetary-amount fromunits) (gnc-numeric-mul (gnc:gnc-monetary-amount fromunits)
(gnc:gnc-monetary-amount price) (if use-txn
(gnc:gnc-monetary-amount price)
(gnc-price-get-value price))
currency-frac GNC-RND-ROUND)) currency-frac GNC-RND-ROUND))
(exchange-fn fromunits tocurrency))) (exchange-fn fromunits tocurrency)))