gnucash maint: Multiple changes pushed
Robert Fewell
bobit at code.gnucash.org
Sun Jan 19 09:00:38 EST 2020
Updated via https://github.com/Gnucash/gnucash/commit/2c45e0ec (commit)
via https://github.com/Gnucash/gnucash/commit/253707e1 (commit)
from https://github.com/Gnucash/gnucash/commit/b9601e01 (commit)
commit 2c45e0ecba111e1435ea623f74c228a9e6b48610
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Sun Jan 19 13:26:02 2020 +0000
The clear cached account model should be after the test
for book and root account
diff --git a/gnucash/gnome-utils/gnc-tree-model-account.c b/gnucash/gnome-utils/gnc-tree-model-account.c
index 90e2dc983..c0044b6d9 100644
--- a/gnucash/gnome-utils/gnc-tree-model-account.c
+++ b/gnucash/gnome-utils/gnc-tree-model-account.c
@@ -1434,10 +1434,6 @@ gnc_tree_model_account_event_handler (QofInstance *entity,
account = GNC_ACCOUNT(entity);
- /* clear the cached model values for account */
- if (event_type != QOF_EVENT_ADD)
- gnc_tree_model_account_clear_cached_values (model, account);
-
if (gnc_account_get_book (account) != priv->book)
{
LEAVE("not in this book");
@@ -1448,6 +1444,11 @@ gnc_tree_model_account_event_handler (QofInstance *entity,
LEAVE("not in this model");
return;
}
+
+ /* clear the cached model values for account */
+ if (event_type != QOF_EVENT_ADD)
+ gnc_tree_model_account_clear_cached_values (model, account);
+
/* What to do, that to do. */
switch (event_type)
{
commit 253707e1994a31662c2bfad3af38fea627bd4944
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Sun Jan 19 13:25:03 2020 +0000
Fix some account template issues
diff --git a/data/accounts/he/acctchrt_brokerage.gnucash-xea b/data/accounts/he/acctchrt_brokerage.gnucash-xea
index b489bfffd..f3be9d369 100644
--- a/data/accounts/he/acctchrt_brokerage.gnucash-xea
+++ b/data/accounts/he/acctchrt_brokerage.gnucash-xea
@@ -70,7 +70,7 @@
<cmdty:id>USD</cmdty:id>
</act:commodity>
<act:description>×שקע×ת</act:description>
- <act:parent type="new">c942789c77cfdd65bc6e4c12900f0805</act:parent>
+ <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
@@ -300,7 +300,7 @@
<cmdty:id>USD</cmdty:id>
</act:commodity>
<act:description>××× ×¡×ת ×××××× ×</act:description>
- <act:parent type="new">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+ <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>××ª× ×ת ×©× ×ª×§×××</act:name>
@@ -311,7 +311,7 @@
<cmdty:id>USD</cmdty:id>
</act:commodity>
<act:description>××ª× ×ת ×©× ×ª×§×××</act:description>
- <act:parent type="new">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+ <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>××× ×¡×ת ר×××ת</act:name>
@@ -322,7 +322,7 @@
<cmdty:id>USD</cmdty:id>
</act:commodity>
<act:description>××× ×¡×ת ר×××ת</act:description>
- <act:parent type="new">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+ <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>ר×××ת ×××"×</act:name>
@@ -427,6 +427,6 @@
<cmdty:id>USD</cmdty:id>
</act:commodity>
<act:description>××× × ××××</act:description>
- <act:parent type="new">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+ <act:parent type="new">77fdffddc79c662c93c482cefa5a4744</act:parent>
</gnc:account>
</gnc-account-example>
diff --git a/data/accounts/hr/acctchrt_car.gnucash-xea b/data/accounts/hr/acctchrt_car.gnucash-xea
index a3d609107..bd85a2a94 100644
--- a/data/accounts/hr/acctchrt_car.gnucash-xea
+++ b/data/accounts/hr/acctchrt_car.gnucash-xea
@@ -91,7 +91,6 @@
<act:description>Osobno vozilo</act:description>
<act:parent type="new">8d1440efb8cd42d9a23e606fac6f2870</act:parent>
</gnc:account>
-
<gnc:account version="2.0.0">
<act:name>Obveze</act:name>
<act:id type="new">cca4bedbdfde4421a586be15765eb072</act:id>
@@ -107,7 +106,7 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="new">5f1a637ad17146839faf0ae35ec06ec4</act:parent>
+ <act:parent type="new">8315c26e871c497c9d192aaa0fc7398d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Krediti</act:name>
@@ -137,7 +136,6 @@
<act:description>Kredit za auto</act:description>
<act:parent type="new">1ec09bc1aeb940d6803026f155862ef6</act:parent>
</gnc:account>
-
<gnc:account version="2.0.0">
<act:name>Rashod</act:name>
<act:id type="new">62cf4cfb2aa047e7a584dd0c3f8a860a</act:id>
diff --git a/data/accounts/it/acctchrt_otherloan.gnucash-xea b/data/accounts/it/acctchrt_otherloan.gnucash-xea
index eda32042c..f6ee08fe0 100644
--- a/data/accounts/it/acctchrt_otherloan.gnucash-xea
+++ b/data/accounts/it/acctchrt_otherloan.gnucash-xea
@@ -68,7 +68,7 @@
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
- <cmdty:id></cmdty:id>
+ <cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:description>Mutui</act:description>
<act:parent type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:parent>
Summary of changes:
data/accounts/he/acctchrt_brokerage.gnucash-xea | 10 +++++-----
data/accounts/hr/acctchrt_car.gnucash-xea | 4 +---
data/accounts/it/acctchrt_otherloan.gnucash-xea | 2 +-
gnucash/gnome-utils/gnc-tree-model-account.c | 9 +++++----
4 files changed, 12 insertions(+), 13 deletions(-)
More information about the gnucash-changes
mailing list