IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2024-11-26 19:00:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug #695423: Fix OFX Commodity Account handling.

Browse Source 
Patch by Burke.
BP

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22825 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2013-03-09 10:22:18 +00:00
parent 94708c3fb8
commit 614e6f347f
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/import-export/ofx/gnc-ofx-import.c
View File

@ -318,7 +318,10 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void * transaction_u
Account *account; Account *account;
Account *investment_account = NULL; Account *investment_account = NULL;
Account *income_account = NULL; Account *income_account = NULL;
gchar *investment_account_text; /***CPC 20130207 ref: OFX Commodity Account Patch, Burke***
gchar *investment_account_text;************************/
/***CPC 20130207 ref: OFX Commodity Account Patch, Burke***/
gchar *investment_account_text, *investment_account_onlineid;
gnc_commodity *currency = NULL; gnc_commodity *currency = NULL;
gnc_commodity *investment_commodity = NULL; gnc_commodity *investment_commodity = NULL;
gnc_numeric gnc_amount, gnc_units; gnc_numeric gnc_amount, gnc_units;
@ -531,13 +534,28 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void * transaction_u
in any translations. */ in any translations. */
_("Stock account for security \"%s\""), _("Stock account for security \"%s\""),
data.security_data_ptr->secname); data.security_data_ptr->secname);
/***CPC 20130207 ref: OFX Commodity Account Patch, Burke***/
investment_account_onlineid = g_strdup_printf( "%s%s", data.account_id, data.unique_id);
// @FIXME: Add the automated selection or creation of account here! /***CPC 20130207 ref: OFX Commodity Account Patch, Burke***
* // @FIXME: Add the automated selection or creation of account here!
*
* // First check whether we can find the right investment_account without asking the user
* investment_account = gnc_import_select_account(NULL,
* data.unique_id, FALSE, investment_account_text,
* investment_commodity, ACCT_TYPE_STOCK, NULL, NULL);
***********************************************************/
/***CPC 20130207 ref: OFX Commodity Account Patch, Burke***/
investment_account = gnc_import_select_account(NULL,
investment_account_onlineid,
1,
investment_account_text,
investment_commodity,
ACCT_TYPE_STOCK,
NULL,
NULL);
// First check whether we can find the right investment_account without asking the user
investment_account = gnc_import_select_account(NULL,
data.unique_id, FALSE, investment_account_text,
investment_commodity, ACCT_TYPE_STOCK, NULL, NULL);
// but use it only if that's really the right commodity // but use it only if that's really the right commodity
if (investment_account if (investment_account
&& xaccAccountGetCommodity(investment_account) != investment_commodity) && xaccAccountGetCommodity(investment_account) != investment_commodity)
@ -622,6 +640,8 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void * transaction_u
PERR("No investment account found for text: %s\n", investment_account_text); PERR("No investment account found for text: %s\n", investment_account_text);
} }
g_free (investment_account_text); g_free (investment_account_text);
/***CPC 20130207 ref: OFX Commodity Account Patch, Burke***/
g_free (investment_account_onlineid);
investment_account_text = NULL; investment_account_text = NULL;
if (investment_account != NULL && if (investment_account != NULL &&