diff --git a/modules/account/view/configuration_form.xml b/modules/account/view/configuration_form.xml
index 37d5260159..edcd300e8c 100644
--- a/modules/account/view/configuration_form.xml
+++ b/modules/account/view/configuration_form.xml
@@ -20,7 +20,7 @@ this repository contains the full copyright notices and license terms. -->
 
     <separator id="currency_exchange" string="Currency Exchange" colspan="4"/>
     <label name="currency_exchange_journal" string="Journal"/>
-    <field name="currency_exchange_journal"/>
+    <field name="currency_exchange_journal" widget="selection"/>
     <newline/>
     <label name="currency_exchange_credit_account" string="Credit Account"/>
     <field name="currency_exchange_credit_account"/>
diff --git a/modules/account/view/fiscalyear_balance_non_deferral_start_form.xml b/modules/account/view/fiscalyear_balance_non_deferral_start_form.xml
index 0d5b3d70e9..6426b59af6 100644
--- a/modules/account/view/fiscalyear_balance_non_deferral_start_form.xml
+++ b/modules/account/view/fiscalyear_balance_non_deferral_start_form.xml
@@ -6,7 +6,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="fiscalyear"/>
     <newline/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="period"/>
     <field name="period"/>
     <label name="credit_account"/>
diff --git a/modules/account/view/journal_period_form.xml b/modules/account/view/journal_period_form.xml
index bf75dc9971..7f8427590f 100644
--- a/modules/account/view/journal_period_form.xml
+++ b/modules/account/view/journal_period_form.xml
@@ -3,7 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <form col="6">
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="period"/>
     <field name="period"/>
     <label name="active"/>
diff --git a/modules/account/view/move_form.xml b/modules/account/view/move_form.xml
index c7204b87f4..1adcbdd338 100644
--- a/modules/account/view/move_form.xml
+++ b/modules/account/view/move_form.xml
@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="post_number"/>
     <field name="post_number"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="period"/>
     <field name="period"/>
     <label name="date"/>
diff --git a/modules/account/view/move_line_delegate_start_form.xml b/modules/account/view/move_line_delegate_start_form.xml
index 4e4a0699bd..e0e11c8a64 100644
--- a/modules/account/view/move_line_delegate_start_form.xml
+++ b/modules/account/view/move_line_delegate_start_form.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="party"/>
     <field name="party"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
 
     <label name="description"/>
     <field name="description" colspan="3"/>
diff --git a/modules/account/view/move_line_form.xml b/modules/account/view/move_line_form.xml
index b196daadfd..ef29f030ab 100644
--- a/modules/account/view/move_line_form.xml
+++ b/modules/account/view/move_line_form.xml
@@ -8,7 +8,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="period"/>
 
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="move"/>
     <field name="move"/>
 
diff --git a/modules/account/view/move_line_group_start_form.xml b/modules/account/view/move_line_group_start_form.xml
index 319b18e0e9..0d045b809c 100644
--- a/modules/account/view/move_line_group_start_form.xml
+++ b/modules/account/view/move_line_group_start_form.xml
@@ -3,7 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <form>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <newline/>
     <label name="description"/>
     <field name="description" colspan="3"/>
diff --git a/modules/account/view/move_line_reschedule_preview_form.xml b/modules/account/view/move_line_reschedule_preview_form.xml
index 0436c4fe43..f65c44b468 100644
--- a/modules/account/view/move_line_reschedule_preview_form.xml
+++ b/modules/account/view/move_line_reschedule_preview_form.xml
@@ -3,7 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <form>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <newline/>
 
     <label name="description"/>
diff --git a/modules/account/view/move_template_form.xml b/modules/account/view/move_template_form.xml
index 843863b8b3..13f6958345 100644
--- a/modules/account/view/move_template_form.xml
+++ b/modules/account/view/move_template_form.xml
@@ -11,7 +11,7 @@ this repository contains the full copyright notices and license terms. -->
             <label name="company"/>
             <field name="company"/>
             <label name="journal"/>
-            <field name="journal"/>
+            <field name="journal" widget="selection"/>
             <label name="description"/>
             <field name="description" colspan="3"/>
             <field name="lines" colspan="4"/>
diff --git a/modules/account/view/open_journal_ask_form.xml b/modules/account/view/open_journal_ask_form.xml
index 5389e9cd99..1a4073e0f6 100644
--- a/modules/account/view/open_journal_ask_form.xml
+++ b/modules/account/view/open_journal_ask_form.xml
@@ -3,7 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <form>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="period"/>
     <field name="period"/>
 </form>
diff --git a/modules/account/view/reconcile_lines_writeoff_form.xml b/modules/account/view/reconcile_lines_writeoff_form.xml
index c3f375b71a..40868202c7 100644
--- a/modules/account/view/reconcile_lines_writeoff_form.xml
+++ b/modules/account/view/reconcile_lines_writeoff_form.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
-<form cursor="journal">
+<form cursor="writeoff">
     <label name="amount"/>
     <field name="amount"/>
     <label name="date"/>
     <field name="date"/>
     <label name="writeoff"/>
-    <field name="writeoff"/>
+    <field name="writeoff" widget="selection"/>
     <newline/>
     <label name="description"/>
     <field name="description" colspan="3"/>
diff --git a/modules/account/view/writeoff_form.xml b/modules/account/view/writeoff_form.xml
index 1a0b5ef923..fef5abcb5f 100644
--- a/modules/account/view/writeoff_form.xml
+++ b/modules/account/view/writeoff_form.xml
@@ -7,7 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="active"/>
     <field name="active"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="company"/>
     <field name="company"/>
     <label name="debit_account"/>
diff --git a/modules/account_asset/view/asset_form.xml b/modules/account_asset/view/asset_form.xml
index 2793326354..a77ac386a7 100644
--- a/modules/account_asset/view/asset_form.xml
+++ b/modules/account_asset/view/asset_form.xml
@@ -28,7 +28,7 @@
             <label name="company"/>
             <field name="company"/>
             <label name="account_journal"/>
-            <field name="account_journal"/>
+            <field name="account_journal" widget="selection"/>
             <label name="depreciation_method"/>
             <field name="depreciation_method"/>
             <label name="frequency"/>
diff --git a/modules/account_dunning_fee/view/dunning_fee_form.xml b/modules/account_dunning_fee/view/dunning_fee_form.xml
index e938bbfc5a..c77cdcebbe 100644
--- a/modules/account_dunning_fee/view/dunning_fee_form.xml
+++ b/modules/account_dunning_fee/view/dunning_fee_form.xml
@@ -9,7 +9,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="product"/>
     <field name="product"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="compute_method"/>
     <field name="compute_method"/>
     <newline/>
diff --git a/modules/account_invoice/view/invoice_form.xml b/modules/account_invoice/view/invoice_form.xml
index b953c3f294..b06cf84d63 100644
--- a/modules/account_invoice/view/invoice_form.xml
+++ b/modules/account_invoice/view/invoice_form.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="type"/>
     <field name="type"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="number"/>
     <field name="number"/>
     <label name="party"/>
diff --git a/modules/account_invoice/view/payment_method_form.xml b/modules/account_invoice/view/payment_method_form.xml
index 1a0b5ef923..fef5abcb5f 100644
--- a/modules/account_invoice/view/payment_method_form.xml
+++ b/modules/account_invoice/view/payment_method_form.xml
@@ -7,7 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="active"/>
     <field name="active"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="company"/>
     <field name="company"/>
     <label name="debit_account"/>
diff --git a/modules/account_invoice_defer/view/invoice_deferred_form.xml b/modules/account_invoice_defer/view/invoice_deferred_form.xml
index 987cc495ca..1c024ef664 100644
--- a/modules/account_invoice_defer/view/invoice_deferred_form.xml
+++ b/modules/account_invoice_defer/view/invoice_deferred_form.xml
@@ -8,7 +8,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="type"/>
 
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="amount"/>
     <field name="amount"/>
 
diff --git a/modules/account_move_line_grouping/view/move_line_group_form.xml b/modules/account_move_line_grouping/view/move_line_group_form.xml
index 193773b832..2e75289348 100644
--- a/modules/account_move_line_grouping/view/move_line_group_form.xml
+++ b/modules/account_move_line_grouping/view/move_line_group_form.xml
@@ -8,7 +8,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="period"/>
 
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="move"/>
     <field name="move"/>
 
diff --git a/modules/account_payment/view/move_line_pay_ask_journal_form.xml b/modules/account_payment/view/move_line_pay_ask_journal_form.xml
index fea8aafd01..a19e8db449 100644
--- a/modules/account_payment/view/move_line_pay_ask_journal_form.xml
+++ b/modules/account_payment/view/move_line_pay_ask_journal_form.xml
@@ -5,6 +5,6 @@ this repository contains the full copyright notices and license terms. -->
     <label name="currency"/>
     <field name="currency"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <field name="journals" colspan="4" invisible="1"/>
 </form>
diff --git a/modules/account_payment/view/party_reception_direct_debit_form.xml b/modules/account_payment/view/party_reception_direct_debit_form.xml
index 5dc66ff95c..3e8d86de86 100644
--- a/modules/account_payment/view/party_reception_direct_debit_form.xml
+++ b/modules/account_payment/view/party_reception_direct_debit_form.xml
@@ -8,7 +8,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="sequence"/>
 
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="currency"/>
     <field name="currency"/>
 </form>
diff --git a/modules/account_payment/view/payment_form.xml b/modules/account_payment/view/payment_form.xml
index 1bd2af6fd7..62246e4952 100644
--- a/modules/account_payment/view/payment_form.xml
+++ b/modules/account_payment/view/payment_form.xml
@@ -3,7 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <form>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="kind"/>
     <field name="kind"/>
     <label name="party"/>
diff --git a/modules/account_payment/view/payment_group_form.xml b/modules/account_payment/view/payment_group_form.xml
index e0aeeaaf9d..9465e616a3 100644
--- a/modules/account_payment/view/payment_group_form.xml
+++ b/modules/account_payment/view/payment_group_form.xml
@@ -7,7 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="company"/>
     <field name="company"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="kind"/>
     <field name="kind"/>
     <separator id="payments" string="Payments Info" colspan="4"/>
diff --git a/modules/account_payment_clearing/view/payment_journal_form.xml b/modules/account_payment_clearing/view/payment_journal_form.xml
index 22f3792465..d7024090ee 100644
--- a/modules/account_payment_clearing/view/payment_journal_form.xml
+++ b/modules/account_payment_clearing/view/payment_journal_form.xml
@@ -7,7 +7,7 @@ this repository contains the full copyright notices and license terms. -->
         <label name="clearing_account"/>
         <field name="clearing_account"/>
         <label name="clearing_journal"/>
-        <field name="clearing_journal"/>
+        <field name="clearing_journal" widget="selection"/>
         <label name="clearing_posting_delay"/>
         <field name="clearing_posting_delay"/>
     </xpath>
diff --git a/modules/account_receivable_rule/view/account_receivable_rule_form.xml b/modules/account_receivable_rule/view/account_receivable_rule_form.xml
index 4e71d1c112..aefe0c7dc6 100644
--- a/modules/account_receivable_rule/view/account_receivable_rule_form.xml
+++ b/modules/account_receivable_rule/view/account_receivable_rule_form.xml
@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="account"/>
     <field name="account"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
 
     <label name="priorities"/>
     <field name="priorities"/>
diff --git a/modules/account_statement/view/line_group_form.xml b/modules/account_statement/view/line_group_form.xml
index 24c045781e..7c2f6245cd 100644
--- a/modules/account_statement/view/line_group_form.xml
+++ b/modules/account_statement/view/line_group_form.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="statement"/>
     <field name="statement"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="number"/>
     <field name="number"/>
     <label name="date"/>
diff --git a/modules/account_statement/view/statement_form.xml b/modules/account_statement/view/statement_form.xml
index 7df721474b..362ab1c4ab 100644
--- a/modules/account_statement/view/statement_form.xml
+++ b/modules/account_statement/view/statement_form.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="name"/>
     <field name="name" colspan="3"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="date"/>
     <field name="date"/>
     <label name="start_balance"/>
diff --git a/modules/account_statement/view/statement_journal_form.xml b/modules/account_statement/view/statement_journal_form.xml
index 3c91f07bd4..0f7e5a607c 100644
--- a/modules/account_statement/view/statement_journal_form.xml
+++ b/modules/account_statement/view/statement_journal_form.xml
@@ -7,7 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="active"/>
     <field name="active"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="currency"/>
     <field name="currency"/>
     <label name="company"/>
diff --git a/modules/account_statement_rule/view/rule_form.xml b/modules/account_statement_rule/view/rule_form.xml
index 992a39655d..883ea62310 100644
--- a/modules/account_statement_rule/view/rule_form.xml
+++ b/modules/account_statement_rule/view/rule_form.xml
@@ -10,7 +10,7 @@ this repository contains the full copyright notices and license terms. -->
             <label name="company"/>
             <field name="company"/>
             <label name="journal"/>
-            <field name="journal"/>
+            <field name="journal" widget="selection"/>
 
             <label id="between" string="Between"/>
             <group id="range" col="-1" colspan="3">
diff --git a/modules/account_stock_continental/view/configuration_form.xml b/modules/account_stock_continental/view/configuration_form.xml
index 1d5ba1857c..8716f27873 100644
--- a/modules/account_stock_continental/view/configuration_form.xml
+++ b/modules/account_stock_continental/view/configuration_form.xml
@@ -5,7 +5,7 @@ this repository contains the full copyright notices and license terms. -->
     <xpath expr="/form" position="inside">
         <separator id="stock" string="Stock" colspan="4"/>
         <label name="stock_journal"/>
-        <field name="stock_journal"/>
+        <field name="stock_journal" widget="selection"/>
         <newline/>
     </xpath>
 </data>
diff --git a/modules/analytic_account/view/rule_form.xml b/modules/analytic_account/view/rule_form.xml
index a45fd27227..b644bdfe80 100644
--- a/modules/analytic_account/view/rule_form.xml
+++ b/modules/analytic_account/view/rule_form.xml
@@ -11,7 +11,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="party"/>
     <field name="party"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <separator id="analytic_accounts" colspan="4"/>
     <field name="analytic_accounts" colspan="4"/>
 </form>
diff --git a/modules/sale_point/view/cash_transfer_type_form.xml b/modules/sale_point/view/cash_transfer_type_form.xml
index 84328a197a..a20ea8c98e 100644
--- a/modules/sale_point/view/cash_transfer_type_form.xml
+++ b/modules/sale_point/view/cash_transfer_type_form.xml
@@ -8,7 +8,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="company"/>
 
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="account"/>
     <field name="account"/>
 </form>
diff --git a/modules/sale_point/view/point_form.xml b/modules/sale_point/view/point_form.xml
index 9984aad38e..a7c7c8232e 100644
--- a/modules/sale_point/view/point_form.xml
+++ b/modules/sale_point/view/point_form.xml
@@ -7,7 +7,7 @@ this repository contains the full copyright notices and license terms. -->
     <label name="company"/>
     <field name="company"/>
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="tax_included"/>
     <field name="tax_included"/>
     <label name="sequence"/>
diff --git a/modules/web_shop_shopify/view/shop_shopify_payment_journal_form.xml b/modules/web_shop_shopify/view/shop_shopify_payment_journal_form.xml
index 10837cbddf..27f3ddc2b9 100644
--- a/modules/web_shop_shopify/view/shop_shopify_payment_journal_form.xml
+++ b/modules/web_shop_shopify/view/shop_shopify_payment_journal_form.xml
@@ -6,7 +6,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="shop" colspan="3"/>
 
     <label name="journal"/>
-    <field name="journal"/>
+    <field name="journal" widget="selection"/>
     <label name="sequence"/>
     <field name="sequence"/>
 
diff --git a/modules/web_shop_vue_storefront_stripe/view/shop_form.xml b/modules/web_shop_vue_storefront_stripe/view/shop_form.xml
index c92a484d44..0d8252eafe 100644
--- a/modules/web_shop_vue_storefront_stripe/view/shop_form.xml
+++ b/modules/web_shop_vue_storefront_stripe/view/shop_form.xml
@@ -4,6 +4,6 @@ this repository contains the full copyright notices and license terms. -->
 <data>
     <xpath expr="//notebook/page[@id='vsf']" position="inside">
         <label name="stripe_journal"/>
-        <field name="stripe_journal"/>
+        <field name="stripe_journal" widget="selection"/>
     </xpath>
 </data>