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

Bug#333532: Add multi-commodity SX support.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13509 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Joshua Sled 2006-03-07 03:40:02 +00:00
parent 2f97e55f9f
commit 3ffc0a28a5
2 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-03-06 Joshua Sled <jsled@asynchronous.org> 2006-03-06 Joshua Sled <jsled@asynchronous.org>
* src/gnome/dialog-sxsincelast.c (create_each_transaction_helper):
Add multi-commodity SX support. Bug#333532.
* packaging/gnucash-1.9.x.ebuild (SRC_URI): Mods for ebuild to be * packaging/gnucash-1.9.x.ebuild (SRC_URI): Mods for ebuild to be
used as an SVN ebuild. used as an SVN ebuild.

69
src/gnome/dialog-sxsincelast.c
View File

@ -2449,7 +2449,7 @@ create_each_transaction_helper( Transaction *t, void *d )
gboolean errFlag; gboolean errFlag;
createData *createUD; createData *createUD;
toCreateInstance *tci; toCreateInstance *tci;
gnc_commodity *commonCommodity = NULL; gnc_commodity *first_cmdty = NULL;
GHashTable *actualVars; GHashTable *actualVars;
gnc_numeric *varIValue; gnc_numeric *varIValue;
@ -2506,6 +2506,7 @@ create_each_transaction_helper( Transaction *t, void *d )
for ( ; sList && osList; sList = sList->next, osList = osList->next) for ( ; sList && osList; sList = sList->next, osList = osList->next)
{ {
Account *acct; Account *acct;
gnc_commodity *split_cmdty = NULL;
split = (Split*)sList->data; split = (Split*)sList->data;
@ -2548,20 +2549,13 @@ create_each_transaction_helper( Transaction *t, void *d )
break; break;
} }
if ( commonCommodity != NULL ) { split_cmdty = xaccAccountGetCommodity(acct);
if ( commonCommodity != xaccAccountGetCommodity( acct ) ) { if (first_cmdty == NULL)
GString *err = g_string_new("");
g_string_printf(err, "Common-commodity difference for SX [%s]: old=[%s], new=[%s]\n",
xaccSchedXactionGetName(createUD->tci->parentTCT->sx),
gnc_commodity_get_mnemonic(commonCommodity),
gnc_commodity_get_mnemonic(xaccAccountGetCommodity(acct)));
*createUD->creation_errors = g_list_append(*createUD->creation_errors, err);
}
}
else
{ {
commonCommodity = xaccAccountGetCommodity( acct ); first_cmdty = split_cmdty;
xaccTransSetCurrency(newT, first_cmdty);
} }
xaccAccountBeginEdit(acct); xaccAccountBeginEdit(acct);
xaccAccountInsertSplit(acct, split); xaccAccountInsertSplit(acct, split);
} }
@ -2626,10 +2620,46 @@ create_each_transaction_helper( Transaction *t, void *d )
final = gnc_numeric_create(0, 1); final = gnc_numeric_create(0, 1);
} }
xaccSplitSetValue( split, final ); xaccSplitSetValue(split, final);
xaccSplitScrub( split ); if (! gnc_commodity_equal(split_cmdty, first_cmdty))
{
GNCPriceDB *price_db = gnc_pricedb_get_db(gnc_get_current_book());
GNCPrice *price;
gnc_numeric exchange, amt;
price = gnc_pricedb_lookup_latest(price_db, first_cmdty, split_cmdty);
if (price == NULL)
{
price = gnc_pricedb_lookup_latest(price_db, split_cmdty, first_cmdty);
if (price == NULL)
{
GString *err = g_string_new("");
g_string_printf(err, "could not find pricedb entry for commodity-pair (%s, %s).",
gnc_commodity_get_mnemonic(first_cmdty),
gnc_commodity_get_mnemonic(split_cmdty));
exchange = gnc_numeric_create(1, 1);
*createUD->creation_errors = g_list_append(*createUD->creation_errors, err);
}
else
{
exchange = gnc_numeric_div(gnc_numeric_create(1,1),
gnc_price_get_value(price),
1000, GNC_HOW_RND_ROUND);
}
}
else
{
exchange = gnc_price_get_value(price);
} }
amt = gnc_numeric_mul(final,
exchange,
1000,
GNC_HOW_RND_ROUND);
xaccSplitSetAmount(split, amt);
}
xaccSplitScrub( split );
}
xaccAccountCommitEdit( acct ); xaccAccountCommitEdit( acct );
} }
@ -2642,15 +2672,6 @@ create_each_transaction_helper( Transaction *t, void *d )
actualVars = NULL; actualVars = NULL;
} }
if (commonCommodity == NULL) {
GString *err = g_string_new("");
g_string_printf(err, "Unable to find common currency/commodity for SX [%s]; using default.",
xaccSchedXactionGetName(createUD->tci->parentTCT->sx));
*createUD->creation_errors = g_list_append(*createUD->creation_errors, err);
commonCommodity = gnc_default_currency();
}
xaccTransSetCurrency(newT, commonCommodity);
if (errFlag) { if (errFlag) {
PERR("Some error in new transaction creation..."); PERR("Some error in new transaction creation...");
xaccTransDestroy(newT); xaccTransDestroy(newT);