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

More OFX_INVBANKTRANS fixes.

Browse Source 
Includes fixing broken build if libofx is < v 0.10.
This commit is contained in:
John Ralls
2021-09-23 12:03:08 -07:00
parent 09da6aa183
commit 09b2533c0d
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gnucash/import-export/ofx/gnc-ofx-import.c
View File

@@ -214,6 +214,10 @@ static const gchar *gnc_ofx_invttype_to_str(InvTransactionType t)
return "SPLIT (Stock or mutial fund split)";
case OFX_TRANSFER:
return "TRANSFER (Transfer holdings in and out of the investment account)";
#ifdef HAVE_LIBOFX_VERSION_0_10
case OFX_INVBANKTRAN:
return "Transfer cash in and out of the investment account";
#endif
default:
return "ERROR, this investment transaction type is unknown. This is a bug in ofxdump";
}
@@ -586,8 +590,12 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void *user_data)
xaccTransSetCurrency(transaction, currency);
if (data.amount_valid)
{
if (!data.invtransactiontype_valid ||
data.invtransactiontype == OFX_INVBANKTRAN)
if (!data.invtransactiontype_valid
#ifdef HAVE_LIBOFX_VERSION_0_10
|| data.invtransactiontype == OFX_INVBANKTRAN)
#else
)
#endif
{
double amount = data.amount;
#ifdef HAVE_LIBOFX_VERSION_0_10
@@ -1057,7 +1065,9 @@ double ofx_get_investment_amount(const struct OfxTransactionData* data)
{
double amount = data->amount;
#ifdef HAVE_LIBOFX_VERSION_0_10
if (data->currency_ratio_valid && data->currency_ratio != 0)
if (data->invtransactiontype == OFX_INVBANKTRAN)
return 0.0;
if (data->currency_ratio_valid && data->currency_ratio != 0)
amount *= data->currency_ratio;
#endif
g_assert(data);