IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revised handling of obsolete security elements, made log messages better.

Browse Source 
Accounts with security elements would only use the security to update the 
commodity if there wasn't a commodity; however, the files in the tests had 
accounts which had a security and a commodity, where the commodity was a 
currency. That's wrong. so now if the commodity is a currency, the security 
will overwrite it.

Added the account name and element name to the log message to assist in 
troubleshooting, should that be needed.



git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19743 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
John Ralls
2010-11-02 18:21:50 +00:00
parent ff67038cde
commit 81cc53b59b
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/xml/gnc-account-xml-v2.c
+19 -6
View File
@@ -301,7 +301,8 @@ deprecated_account_currency_handler (xmlNodePtr node, gpointer act_pdata)
struct account_pdata *pdata = act_pdata;
gnc_commodity *ref;
PWARN("Obsolete xml tag will not be preserved.");
PWARN("Account %s: Obsolete xml tag 'act:currency' will not be preserved.",
xaccAccountGetName( pdata->account ));
ref = dom_tree_to_commodity_ref_no_engine(node, pdata->book);
DxaccAccountSetCurrency(pdata->account, ref);
@@ -311,7 +312,9 @@ deprecated_account_currency_handler (xmlNodePtr node, gpointer act_pdata)
static gboolean
deprecated_account_currency_scu_handler (xmlNodePtr node, gpointer act_pdata)
{
PWARN("Obsolete xml tag will not be preserved.");
struct account_pdata *pdata = act_pdata;
PWARN("Account %s: Obsolete xml tag 'act:currency-scu' will not be preserved.",
xaccAccountGetName( pdata->account ));
return TRUE;
}
@@ -319,13 +322,22 @@ static gboolean
deprecated_account_security_handler (xmlNodePtr node, gpointer act_pdata)
{
struct account_pdata *pdata = act_pdata;
gnc_commodity *ref;
gnc_commodity *ref, *orig = xaccAccountGetCommodity(pdata->account);
PWARN("Obsolete xml tag will not be preserved.");
if (!xaccAccountGetCommodity(pdata->account))
PWARN("Account %s: Obsolete xml tag 'act:security' will not be preserved.",
xaccAccountGetName( pdata->account ));
/* If the account has both a commodity and a security elemet, and
the commodity is a currecny, then the commodity is probably
wrong. In that case we want to replace it with the
security. jralls 2010-11-02 */
if (!orig || gnc_commodity_is_currency( orig ) )
{
ref = dom_tree_to_commodity_ref_no_engine(node, pdata->book);
xaccAccountSetCommodity(pdata->account, ref);
/* If the SCU was set, it was probably wrong, so zero it out
so that the SCU handler can fix it if there's a
security-scu element. jralls 2010-11-02 */
xaccAccountSetCommoditySCU(pdata->account, 0);
}
return TRUE;
@@ -337,7 +349,8 @@ deprecated_account_security_scu_handler (xmlNodePtr node, gpointer act_pdata)
struct account_pdata *pdata = act_pdata;
gint64 val;
PWARN("Obsolete xml tag will not be preserved.");
PWARN("Account %s: Obsolete xml tag 'act:security-scu' will not be preserved.",
xaccAccountGetName( pdata->account ));
if (!xaccAccountGetCommoditySCU(pdata->account))
{
dom_tree_to_integer(node, &val);