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

Replace unnecessary indirection in calling gnc_pricedb_convert_balance...

Browse Source
This commit is contained in:
John Ralls 2015-10-29 15:02:09 -07:00
parent 8877f862d3
commit e391cce1af
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app-utils/gnc-ui-balances.c
View File

@ -185,6 +185,8 @@ gnc_ui_account_get_balance_as_of_date (Account *account,
time64 date, time64 date,
gboolean include_children) gboolean include_children)
{ {
QofBook *book = gnc_account_get_book (account);
GNCPriceDB *pdb = gnc_pricedb_get_db (book);
gnc_numeric balance; gnc_numeric balance;
gnc_commodity *currency; gnc_commodity *currency;
@ -209,8 +211,10 @@ gnc_ui_account_get_balance_as_of_date (Account *account,
child = node->data; child = node->data;
child_currency = xaccAccountGetCommodity (child); child_currency = xaccAccountGetCommodity (child);
child_balance = xaccAccountGetBalanceAsOfDate (child, date); child_balance = xaccAccountGetBalanceAsOfDate (child, date);
child_balance = xaccAccountConvertBalanceToCurrency (child, child_balance =
child_balance, child_currency, currency); gnc_pricedb_convert_balance_latest_price (pdb, child_balance,
child_currency,
currency);
balance = gnc_numeric_add_fixed (balance, child_balance); balance = gnc_numeric_add_fixed (balance, child_balance);
} }
@ -316,4 +320,3 @@ gnc_ui_owner_get_print_report_balance (GncOwner *owner,
print_info = gnc_commodity_print_info (report_commodity, TRUE); print_info = gnc_commodity_print_info (report_commodity, TRUE);
return g_strdup (xaccPrintAmount (balance, print_info)); return g_strdup (xaccPrintAmount (balance, print_info));
} }

42
src/gnome-utils/window-main-summarybar.c
View File

@ -148,20 +148,23 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
for (node = children; node; node = g_list_next(node)) for (node = children; node; node = g_list_next(node))
{ {
Account *account = node->data; Account *account = node->data;
QofBook *book = gnc_account_get_book (account);
GNCPriceDB *pricedb = gnc_pricedb_get_db (book);
gnc_commodity *to_curr = options.default_currency;
account_type = xaccAccountGetType(account); account_type = xaccAccountGetType(account);
account_currency = xaccAccountGetCommodity(account); account_currency = xaccAccountGetCommodity(account);
if (options.grand_total) if (options.grand_total)
grand_total_accum = gnc_ui_get_currency_accumulator(currency_list, grand_total_accum = gnc_ui_get_currency_accumulator(currency_list,
options.default_currency, to_curr,
TOTAL_GRAND_TOTAL); TOTAL_GRAND_TOTAL);
if (!gnc_commodity_is_currency(account_currency)) if (!gnc_commodity_is_currency(account_currency))
{ {
non_currency = TRUE; non_currency = TRUE;
non_curr_accum = gnc_ui_get_currency_accumulator(currency_list, non_curr_accum = gnc_ui_get_currency_accumulator(currency_list,
options.default_currency, to_curr,
TOTAL_NON_CURR_TOTAL); TOTAL_NON_CURR_TOTAL);
} }
@ -186,9 +189,10 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
end_amount = xaccAccountGetBalanceAsOfDate(account, options.end_date); end_amount = xaccAccountGetBalanceAsOfDate(account, options.end_date);
timespecFromTime64(&end_timespec, options.end_date); timespecFromTime64(&end_timespec, options.end_date);
end_amount_default_currency = end_amount_default_currency =
xaccAccountConvertBalanceToCurrencyAsOfDate gnc_pricedb_convert_balance_nearest_price (pricedb, end_amount,
(account, end_amount, account_currency, options.default_currency, account_currency,
timespecToTime64(timespecCanonicalDayTime(end_timespec))); to_curr,
end_timespec);
if (!non_currency || options.non_currency) if (!non_currency || options.non_currency)
{ {
@ -202,7 +206,7 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
{ {
non_curr_accum->assets = non_curr_accum->assets =
gnc_numeric_add (non_curr_accum->assets, end_amount_default_currency, gnc_numeric_add (non_curr_accum->assets, end_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency), gnc_commodity_get_fraction (to_curr),
GNC_HOW_RND_ROUND_HALF_UP); GNC_HOW_RND_ROUND_HALF_UP);
} }
@ -210,7 +214,7 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
{ {
grand_total_accum->assets = grand_total_accum->assets =
gnc_numeric_add (grand_total_accum->assets, end_amount_default_currency, gnc_numeric_add (grand_total_accum->assets, end_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency), gnc_commodity_get_fraction (to_curr),
GNC_HOW_RND_ROUND_HALF_UP); GNC_HOW_RND_ROUND_HALF_UP);
} }
@ -221,15 +225,18 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
start_amount = xaccAccountGetBalanceAsOfDate(account, options.start_date); start_amount = xaccAccountGetBalanceAsOfDate(account, options.start_date);
timespecFromTime64(&start_timespec, options.start_date); timespecFromTime64(&start_timespec, options.start_date);
start_amount_default_currency = start_amount_default_currency =
xaccAccountConvertBalanceToCurrencyAsOfDate gnc_pricedb_convert_balance_nearest_price (pricedb,
(account, start_amount, account_currency, options.default_currency, start_amount,
timespecToTime64(timespecCanonicalDayTime(start_timespec))); account_currency,
to_curr,
start_timespec);
end_amount = xaccAccountGetBalanceAsOfDate(account, options.end_date); end_amount = xaccAccountGetBalanceAsOfDate(account, options.end_date);
timespecFromTime64(&end_timespec, options.end_date); timespecFromTime64(&end_timespec, options.end_date);
end_amount_default_currency = end_amount_default_currency =
xaccAccountConvertBalanceToCurrencyAsOfDate gnc_pricedb_convert_balance_nearest_price (pricedb, end_amount,
(account, end_amount, account_currency, options.default_currency, account_currency,
timespecToTime64(timespecCanonicalDayTime(end_timespec))); to_curr,
end_timespec);
if (!non_currency || options.non_currency) if (!non_currency || options.non_currency)
{ {
@ -247,11 +254,11 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
{ {
non_curr_accum->profits = non_curr_accum->profits =
gnc_numeric_add (non_curr_accum->profits, start_amount_default_currency, gnc_numeric_add (non_curr_accum->profits, start_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency), gnc_commodity_get_fraction (to_curr),
GNC_HOW_RND_ROUND_HALF_UP); GNC_HOW_RND_ROUND_HALF_UP);
non_curr_accum->profits = non_curr_accum->profits =
gnc_numeric_sub (non_curr_accum->profits, end_amount_default_currency, gnc_numeric_sub (non_curr_accum->profits, end_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency), gnc_commodity_get_fraction (to_curr),
GNC_HOW_RND_ROUND_HALF_UP); GNC_HOW_RND_ROUND_HALF_UP);
} }
@ -260,12 +267,12 @@ gnc_ui_accounts_recurse (Account *parent, GList **currency_list,
grand_total_accum->profits = grand_total_accum->profits =
gnc_numeric_add (grand_total_accum->profits, gnc_numeric_add (grand_total_accum->profits,
start_amount_default_currency, start_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency), gnc_commodity_get_fraction (to_curr),
GNC_HOW_RND_ROUND_HALF_UP); GNC_HOW_RND_ROUND_HALF_UP);
grand_total_accum->profits = grand_total_accum->profits =
gnc_numeric_sub (grand_total_accum->profits, gnc_numeric_sub (grand_total_accum->profits,
end_amount_default_currency, end_amount_default_currency,
gnc_commodity_get_fraction (options.default_currency), gnc_commodity_get_fraction (to_curr),
GNC_HOW_RND_ROUND_HALF_UP); GNC_HOW_RND_ROUND_HALF_UP);
} }
@ -568,4 +575,3 @@ gnc_main_window_summary_new (void)
return retval->hbox; return retval->hbox;
} }