gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/ea95580b (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8a167d18 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/849aea31 (commit)
	from  https://github.com/Gnucash/gnucash/commit/11935675 (commit)



commit ea95580b42fe6b58c3d81656ce2bc1519170e62d
Merge: 119356752 8a167d186
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Jan 30 14:26:05 2023 +0100

    Merge branch 'maint'


commit 8a167d186bcfecbef381a791089afebe8a74a607
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Jan 30 13:48:19 2023 +0100

    Payment dialog - always list all possible post accounts
    
    Before only the post account in the currency of the selected
    vendor or customer was available.
    
    This was reported in bug 797487n comment 17.

diff --git a/gnucash/gnome/dialog-payment.c b/gnucash/gnome/dialog-payment.c
index fa9a403ac..cbd2dd21f 100644
--- a/gnucash/gnome/dialog-payment.c
+++ b/gnucash/gnome/dialog-payment.c
@@ -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;

commit 849aea31efb0e617c1a55a6eda95deecffdba8e2
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Jan 30 12:07:39 2023 +0100

    Bug 797477 - Manual foreign transaction from APAR to another doesn't trigger price input

diff --git a/gnucash/register/ledger-core/split-register-layout.c b/gnucash/register/ledger-core/split-register-layout.c
index 6f7f2bef9..a552d5d58 100644
--- a/gnucash/register/ledger-core/split-register-layout.c
+++ b/gnucash/register/ledger-core/split-register-layout.c
@@ -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:
diff --git a/gnucash/register/ledger-core/split-register-model.c b/gnucash/register/ledger-core/split-register-model.c
index 20e086ed3..5857cf8b3 100644
--- a/gnucash/register/ledger-core/split-register-model.c
+++ b/gnucash/register/ledger-core/split-register-model.c
@@ -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;
     }



Summary of changes:
 gnucash/gnome/dialog-payment.c                       | 4 ++--
 gnucash/register/ledger-core/split-register-layout.c | 4 +++-
 gnucash/register/ledger-core/split-register-model.c  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)