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

Correct detection of marker commodity splits.

Browse Source 
The splits don't have an amount until after the formula is parsed, so
use the absence of both a credit and debit formula to indicate a marker.
This commit is contained in:
John Ralls
2015-12-17 16:38:35 -08:00
parent 5f0cb0731f
commit 8d904c1209
1 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/app-utils/gnc-sx-instance-model.c
View File

@@ -193,7 +193,7 @@ _get_vars_helper(Transaction *txn, void *var_hash_data)
gnc_commodity *split_cmdty = NULL;
GncGUID *acct_guid;
Account *acct;
gnc_numeric split_amount;
gboolean split_is_marker = TRUE;
s = (Split*)split_list->data;
kvpf = xaccSplitGetSlots(s);
@@ -204,13 +204,40 @@ _get_vars_helper(Transaction *txn, void *var_hash_data)
acct_guid = kvp_value_get_guid(kvp_val);
acct = xaccAccountLookup(acct_guid, gnc_get_current_book());
split_cmdty = xaccAccountGetCommodity(acct);
split_amount = xaccSplitGetAmount(s);
if (!gnc_numeric_zero_p(split_amount) && first_cmdty == NULL)
// existing... ------------------------------------------
kvp_val = kvp_frame_get_slot_path(kvpf,
GNC_SX_ID,
GNC_SX_CREDIT_FORMULA,
NULL);
if (kvp_val != NULL)
{
str = kvp_value_get_string(kvp_val);
if (str && strlen(str) != 0)
{
gnc_sx_parse_vars_from_formula(str, var_hash, NULL);
split_is_marker = FALSE;
}
}
kvp_val = kvp_frame_get_slot_path(kvpf,
GNC_SX_ID,
GNC_SX_DEBIT_FORMULA,
NULL);
if (kvp_val != NULL)
{
str = kvp_value_get_string(kvp_val);
if (str && strlen(str) != 0)
{
gnc_sx_parse_vars_from_formula(str, var_hash, NULL);
split_is_marker = FALSE;
}
}
if (!split_is_marker && first_cmdty == NULL)
{
first_cmdty = split_cmdty;
}
if (!gnc_numeric_zero_p(split_amount) &&
if (!split_is_marker &&
! gnc_commodity_equal(split_cmdty, first_cmdty))
{
GncSxVariable *var;
@@ -228,32 +255,6 @@ _get_vars_helper(Transaction *txn, void *var_hash_data)
g_string_free(var_name, TRUE);
}
// existing... ------------------------------------------
kvp_val = kvp_frame_get_slot_path(kvpf,
GNC_SX_ID,
GNC_SX_CREDIT_FORMULA,
NULL);
if (kvp_val != NULL)
{
str = kvp_value_get_string(kvp_val);
if (str && strlen(str) != 0)
{
gnc_sx_parse_vars_from_formula(str, var_hash, NULL);
}
}
kvp_val = kvp_frame_get_slot_path(kvpf,
GNC_SX_ID,
GNC_SX_DEBIT_FORMULA,
NULL);
if (kvp_val != NULL)
{
str = kvp_value_get_string(kvp_val);
if (str && strlen(str) != 0)
{
gnc_sx_parse_vars_from_formula(str, var_hash, NULL);
}
}
}
return 0;