gnucash master: Multiple changes pushed
Mike Alexander
mta at code.gnucash.org
Sun May 25 18:38:13 EDT 2014
Updated via https://github.com/Gnucash/gnucash/commit/81fb7738 (commit)
via https://github.com/Gnucash/gnucash/commit/f8139efa (commit)
via https://github.com/Gnucash/gnucash/commit/985fecb0 (commit)
from https://github.com/Gnucash/gnucash/commit/cac3b5c2 (commit)
commit 81fb773856ae3dc1da17e648dd03b32e5e532519
Merge: cac3b5c f8139ef
Author: Mike Alexander <mta at umich.edu>
Date: Sun May 25 19:10:03 2014 -0400
Merge branch 'maint'
commit f8139efad18f3b6cea36da9209e7d225eee97d67
Author: Mike Alexander <mta at umich.edu>
Date: Sun May 25 18:48:44 2014 -0400
Always use the price we display to calculate the current value of an account.
diff --git a/src/report/standard-reports/advanced-portfolio.scm b/src/report/standard-reports/advanced-portfolio.scm
index 77953eb..101b0f2 100644
--- a/src/report/standard-reports/advanced-portfolio.scm
+++ b/src/report/standard-reports/advanced-portfolio.scm
@@ -438,12 +438,13 @@
)
(define (my-exchange-fn fromunits tocurrency)
- (if (and use-txn
- (gnc-commodity-equiv currency tocurrency)
+ (if (and (gnc-commodity-equiv currency tocurrency)
(gnc-commodity-equiv (gnc:gnc-monetary-commodity fromunits) commodity))
(gnc:make-gnc-monetary tocurrency
(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))
(exchange-fn fromunits tocurrency)))
commit 985fecb0321d0ad5739bece151c8f85b3147e846
Author: Michalis Kamprianis <michalis at linuxmail.org>
Date: Sat May 10 01:04:03 2014 +0200
Bug 719457 - Template for Home Mortgage Loan isn't properly nested.
Several account templates containted accounts with two parents, resulting to incorrect nesting.
modified: accounts/C/acctchrt_homeloan.gnucash-xea
modified: accounts/C/acctchrt_otherloan.gnucash-xea
modified: accounts/C/acctchrt_retiremt.gnucash-xea
modified: accounts/C/acctchrt_spouseretire.gnucash-xea
modified: accounts/en_GB/acctchrt_homeloan.gnucash-xea
modified: accounts/en_GB/acctchrt_otherloan.gnucash-xea
modified: accounts/en_GB/acctchrt_retiremt.gnucash-xea
modified: accounts/en_GB/acctchrt_spouseretire.gnucash-xea
diff --git a/accounts/C/acctchrt_homeloan.gnucash-xea b/accounts/C/acctchrt_homeloan.gnucash-xea
index d3850e3..ed5a7af 100644
--- a/accounts/C/acctchrt_homeloan.gnucash-xea
+++ b/accounts/C/acctchrt_homeloan.gnucash-xea
@@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Mortgage Loan</act:name>
diff --git a/accounts/C/acctchrt_otherloan.gnucash-xea b/accounts/C/acctchrt_otherloan.gnucash-xea
index 60f7adb..50907b2 100644
--- a/accounts/C/acctchrt_otherloan.gnucash-xea
+++ b/accounts/C/acctchrt_otherloan.gnucash-xea
@@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Other Loan</act:name>
diff --git a/accounts/C/acctchrt_retiremt.gnucash-xea b/accounts/C/acctchrt_retiremt.gnucash-xea
index d591164..a0dbff8 100644
--- a/accounts/C/acctchrt_retiremt.gnucash-xea
+++ b/accounts/C/acctchrt_retiremt.gnucash-xea
@@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Retirement</act:name>
diff --git a/accounts/C/acctchrt_spouseretire.gnucash-xea b/accounts/C/acctchrt_spouseretire.gnucash-xea
index 8cdff46..77cd377 100644
--- a/accounts/C/acctchrt_spouseretire.gnucash-xea
+++ b/accounts/C/acctchrt_spouseretire.gnucash-xea
@@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Spouse Retirement</act:name>
diff --git a/accounts/en_GB/acctchrt_homeloan.gnucash-xea b/accounts/en_GB/acctchrt_homeloan.gnucash-xea
index d3850e3..ed5a7af 100644
--- a/accounts/en_GB/acctchrt_homeloan.gnucash-xea
+++ b/accounts/en_GB/acctchrt_homeloan.gnucash-xea
@@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Mortgage Loan</act:name>
diff --git a/accounts/en_GB/acctchrt_otherloan.gnucash-xea b/accounts/en_GB/acctchrt_otherloan.gnucash-xea
index 60f7adb..50907b2 100644
--- a/accounts/en_GB/acctchrt_otherloan.gnucash-xea
+++ b/accounts/en_GB/acctchrt_otherloan.gnucash-xea
@@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Other Loan</act:name>
diff --git a/accounts/en_GB/acctchrt_retiremt.gnucash-xea b/accounts/en_GB/acctchrt_retiremt.gnucash-xea
index d591164..a0dbff8 100644
--- a/accounts/en_GB/acctchrt_retiremt.gnucash-xea
+++ b/accounts/en_GB/acctchrt_retiremt.gnucash-xea
@@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Retirement</act:name>
diff --git a/accounts/en_GB/acctchrt_spouseretire.gnucash-xea b/accounts/en_GB/acctchrt_spouseretire.gnucash-xea
index 8cdff46..77cd377 100644
--- a/accounts/en_GB/acctchrt_spouseretire.gnucash-xea
+++ b/accounts/en_GB/acctchrt_spouseretire.gnucash-xea
@@ -48,7 +48,6 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Spouse Retirement</act:name>
Summary of changes:
accounts/C/acctchrt_homeloan.gnucash-xea | 1 -
accounts/C/acctchrt_otherloan.gnucash-xea | 1 -
accounts/C/acctchrt_retiremt.gnucash-xea | 1 -
accounts/C/acctchrt_spouseretire.gnucash-xea | 1 -
accounts/en_GB/acctchrt_homeloan.gnucash-xea | 1 -
accounts/en_GB/acctchrt_otherloan.gnucash-xea | 1 -
accounts/en_GB/acctchrt_retiremt.gnucash-xea | 1 -
accounts/en_GB/acctchrt_spouseretire.gnucash-xea | 1 -
src/report/standard-reports/advanced-portfolio.scm | 7 ++++---
9 files changed, 4 insertions(+), 11 deletions(-)
More information about the gnucash-changes
mailing list