mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Use same test for payment dialog transfer accounts and assign as payment checks
This commit is contained in:
@@ -784,6 +784,14 @@ gnc_payment_leave_amount_cb (GtkWidget *widget, GdkEventFocus *event,
|
||||
gnc_payment_window_check_payment (pw);
|
||||
}
|
||||
|
||||
static gboolean AccountTypeOkForPayments (GNCAccountType type)
|
||||
{
|
||||
if (xaccAccountIsAssetLiabType(type))
|
||||
return TRUE;
|
||||
else
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* Select the list of accounts to show in the tree */
|
||||
static void
|
||||
gnc_payment_set_account_types (GncTreeViewAccount *tree)
|
||||
@@ -794,19 +802,7 @@ gnc_payment_set_account_types (GncTreeViewAccount *tree)
|
||||
gnc_tree_view_account_get_view_info (tree, &avi);
|
||||
|
||||
for (i = 0; i < NUM_ACCOUNT_TYPES; i++)
|
||||
switch (i)
|
||||
{
|
||||
case ACCT_TYPE_BANK:
|
||||
case ACCT_TYPE_CASH:
|
||||
case ACCT_TYPE_CREDIT:
|
||||
case ACCT_TYPE_ASSET:
|
||||
case ACCT_TYPE_LIABILITY:
|
||||
avi.include_type[i] = TRUE;
|
||||
break;
|
||||
default:
|
||||
avi.include_type[i] = FALSE;
|
||||
break;
|
||||
}
|
||||
avi.include_type[i] = AccountTypeOkForPayments (i);
|
||||
|
||||
gnc_tree_view_account_set_view_info (tree, &avi);
|
||||
}
|
||||
@@ -1123,7 +1119,7 @@ static void increment_if_asset_account (gpointer data,
|
||||
int *r = user_data;
|
||||
const Split *split = data;
|
||||
const Account *account = xaccSplitGetAccount(split);
|
||||
if (xaccAccountIsAssetLiabType(xaccAccountGetType(account)))
|
||||
if (AccountTypeOkForPayments(xaccAccountGetType (account)))
|
||||
++(*r);
|
||||
}
|
||||
static int countAssetAccounts(SplitList* slist)
|
||||
@@ -1138,7 +1134,7 @@ static gint predicate_is_asset_account(gconstpointer a,
|
||||
{
|
||||
const Split *split = a;
|
||||
const Account *account = xaccSplitGetAccount(split);
|
||||
if (xaccAccountIsAssetLiabType(xaccAccountGetType(account)))
|
||||
if (AccountTypeOkForPayments(xaccAccountGetType(account)))
|
||||
return 0;
|
||||
else
|
||||
return -1;
|
||||
|
||||
Reference in New Issue
Block a user