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 #565348: Patch to include subaccounts in the all columns in the account page

Browse Source 
Patch by James Duerr:

Patch to include subaccounts in all columns, not just present column, and also
to sort including sub-account totals, rather than without.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20011 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2010-12-31 12:06:49 +00:00
parent 516175b9e2
commit e6e8cdf852
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/gnome-utils/gnc-tree-model-account.c
View File

@ -644,19 +644,19 @@ gnc_tree_model_account_get_value (GtkTreeModel *tree_model,
case GNC_TREE_MODEL_ACCOUNT_COL_PRESENT:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_balance(xaccAccountGetPresentBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
g_value_take_string (value, string);
break;
case GNC_TREE_MODEL_ACCOUNT_COL_PRESENT_REPORT:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_report_balance(xaccAccountGetPresentBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
g_value_take_string (value, string);
break;
case GNC_TREE_MODEL_ACCOUNT_COL_COLOR_PRESENT:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_balance(xaccAccountGetPresentBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
gnc_tree_model_account_set_color(model, negative, value);
g_free(string);
break;
@ -664,19 +664,19 @@ gnc_tree_model_account_get_value (GtkTreeModel *tree_model,
case GNC_TREE_MODEL_ACCOUNT_COL_BALANCE:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_balance(xaccAccountGetBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
g_value_take_string (value, string);
break;
case GNC_TREE_MODEL_ACCOUNT_COL_BALANCE_REPORT:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_report_balance(xaccAccountGetBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
g_value_take_string (value, string);
break;
case GNC_TREE_MODEL_ACCOUNT_COL_COLOR_BALANCE:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_balance(xaccAccountGetBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
gnc_tree_model_account_set_color(model, negative, value);
g_free(string);
break;
@ -715,13 +715,13 @@ gnc_tree_model_account_get_value (GtkTreeModel *tree_model,
case GNC_TREE_MODEL_ACCOUNT_COL_RECONCILED:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_balance(xaccAccountGetReconciledBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
g_value_take_string (value, string);
break;
case GNC_TREE_MODEL_ACCOUNT_COL_RECONCILED_REPORT:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_report_balance(xaccAccountGetReconciledBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
g_value_take_string (value, string);
break;
case GNC_TREE_MODEL_ACCOUNT_COL_RECONCILED_DATE:
@ -735,7 +735,7 @@ gnc_tree_model_account_get_value (GtkTreeModel *tree_model,
case GNC_TREE_MODEL_ACCOUNT_COL_COLOR_RECONCILED:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_balance(xaccAccountGetReconciledBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
gnc_tree_model_account_set_color(model, negative, value);
g_free (string);
break;
@ -743,19 +743,19 @@ gnc_tree_model_account_get_value (GtkTreeModel *tree_model,
case GNC_TREE_MODEL_ACCOUNT_COL_FUTURE_MIN:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_balance(xaccAccountGetProjectedMinimumBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
g_value_take_string (value, string);
break;
case GNC_TREE_MODEL_ACCOUNT_COL_FUTURE_MIN_REPORT:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_report_balance(xaccAccountGetProjectedMinimumBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
g_value_take_string (value, string);
break;
case GNC_TREE_MODEL_ACCOUNT_COL_COLOR_FUTURE_MIN:
g_value_init (value, G_TYPE_STRING);
string = gnc_ui_account_get_print_balance(xaccAccountGetProjectedMinimumBalanceInCurrency,
account, FALSE, &negative);
account, TRUE, &negative);
gnc_tree_model_account_set_color(model, negative, value);
g_free (string);
break;

10
src/gnome-utils/gnc-tree-view-account.c
View File

@ -338,7 +338,7 @@ sort_by_present_value (GtkTreeModel *f_model,
GtkTreeIter *f_iter_b,
gpointer user_data)
{
return sort_by_xxx_value (xaccAccountGetPresentBalanceInCurrency, FALSE,
return sort_by_xxx_value (xaccAccountGetPresentBalanceInCurrency, TRUE,
f_model, f_iter_a, f_iter_b, user_data);
}
@ -348,7 +348,7 @@ sort_by_balance_value (GtkTreeModel *f_model,
GtkTreeIter *f_iter_b,
gpointer user_data)
{
return sort_by_xxx_value (xaccAccountGetBalanceInCurrency, FALSE,
return sort_by_xxx_value (xaccAccountGetBalanceInCurrency, TRUE,
f_model, f_iter_a, f_iter_b, user_data);
}
@ -358,7 +358,7 @@ sort_by_cleared_value (GtkTreeModel *f_model,
GtkTreeIter *f_iter_b,
gpointer user_data)
{
return sort_by_xxx_value (xaccAccountGetClearedBalanceInCurrency, FALSE,
return sort_by_xxx_value (xaccAccountGetClearedBalanceInCurrency, TRUE,
f_model, f_iter_a, f_iter_b, user_data);
}
@ -368,7 +368,7 @@ sort_by_reconciled_value (GtkTreeModel *f_model,
GtkTreeIter *f_iter_b,
gpointer user_data)
{
return sort_by_xxx_value (xaccAccountGetReconciledBalanceInCurrency, FALSE,
return sort_by_xxx_value (xaccAccountGetReconciledBalanceInCurrency, TRUE,
f_model, f_iter_a, f_iter_b, user_data);
}
@ -378,7 +378,7 @@ sort_by_future_min_value (GtkTreeModel *f_model,
GtkTreeIter *f_iter_b,
gpointer user_data)
{
return sort_by_xxx_value (xaccAccountGetProjectedMinimumBalanceInCurrency, FALSE,
return sort_by_xxx_value (xaccAccountGetProjectedMinimumBalanceInCurrency, TRUE,
f_model, f_iter_a, f_iter_b, user_data);
}