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

Merge branch 'maint'

Browse Source
This commit is contained in:
Geert Janssens 2023-01-30 14:26:05 +01:00
commit ea95580b42
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnucash/gnome/dialog-payment.c
View File

@ -215,7 +215,7 @@ gnc_payment_window_refresh_handler (G_GNUC_UNUSED GHashTable *changes, gpointer
PaymentWindow *pw = data;
gnc_payment_window_fill_docs_list (pw);
pw->post_acct = gnc_account_select_combo_fill (pw->post_combo, pw->book, pw->acct_types, pw->acct_commodities);
pw->post_acct = gnc_account_select_combo_fill (pw->post_combo, pw->book, pw->acct_types, NULL);
}
static gboolean
@ -629,7 +629,7 @@ gnc_payment_dialog_owner_changed (PaymentWindow *pw)
if (gncOwnerIsValid(owner))
pw->acct_commodities = gncOwnerGetCommoditiesList (owner);
pw->post_acct = gnc_account_select_combo_fill (pw->post_combo, pw->book, pw->acct_types, pw->acct_commodities);
pw->post_acct = gnc_account_select_combo_fill (pw->post_combo, pw->book, pw->acct_types, NULL);
if (gncOwnerEqual(&pw->owner, &pw->tx_info->owner) && pw->tx_info->post_acct)
{
pw->post_acct = pw->tx_info->post_acct;

4
gnucash/register/ledger-core/split-register-layout.c
View File

@ -197,6 +197,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, DEBT_CELL, 0, 6);
gnc_table_layout_set_cell (layout, curs, CRED_CELL, 0, 7);
gnc_table_layout_set_cell (layout, curs, BALN_CELL, 0, 8);
gnc_table_layout_set_cell (layout, curs, RATE_CELL, 0, 9);
curs_last = curs;
curs = gnc_table_layout_get_cursor (layout,
@ -229,6 +230,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, TDEBT_CELL, 0, 6);
gnc_table_layout_set_cell (layout, curs, TCRED_CELL, 0, 7);
gnc_table_layout_set_cell (layout, curs, TBALN_CELL, 0, 8);
gnc_table_layout_set_cell (layout, curs, RATE_CELL, 0, 9);
curs_last = curs;
curs = gnc_table_layout_get_cursor (layout,
@ -575,7 +577,7 @@ gnc_split_register_layout_add_cursors (SplitRegister* reg,
case PAYABLE_REGISTER:
case RECEIVABLE_REGISTER:
num_cols = 9;
num_cols = 10;
break;
case INCOME_LEDGER:

4
gnucash/register/ledger-core/split-register-model.c
View File

@ -1680,13 +1680,13 @@ gnc_split_reg_has_rate_cell (SplitRegisterType type)
case GENERAL_JOURNAL:
case INCOME_LEDGER:
case SEARCH_LEDGER:
case RECEIVABLE_REGISTER:
case PAYABLE_REGISTER:
return TRUE;
case STOCK_REGISTER:
case CURRENCY_REGISTER:
case PORTFOLIO_LEDGER:
case RECEIVABLE_REGISTER:
case PAYABLE_REGISTER:
default:
return FALSE;
}