diff --git a/sale_order_invoicing_grouping_criteria/README.rst b/sale_order_invoicing_grouping_criteria/README.rst
index 12b41ed3fd54..124527517bf4 100644
--- a/sale_order_invoicing_grouping_criteria/README.rst
+++ b/sale_order_invoicing_grouping_criteria/README.rst
@@ -74,9 +74,9 @@ the whole company:
 Usage
 =====
 
-1. Go to *Sales > Invoicing > Orders to Invoice*.
+1. Go to *Sales > To Invoice > Orders to Invoice*.
 2. Select sales orders whose invoicing you want to do.
-3. Click on *Action > Invoice Order*.
+3. Click on *Action > Create Invoices*.
 4. Click on "Create and View Invoices" button.
 5. On that moment, the grouping criteria will be applied, and you will
    see different invoices if the criteria doesn't match for them.
diff --git a/sale_order_invoicing_grouping_criteria/__manifest__.py b/sale_order_invoicing_grouping_criteria/__manifest__.py
index b59953464bae..cc4fcb98e2e4 100644
--- a/sale_order_invoicing_grouping_criteria/__manifest__.py
+++ b/sale_order_invoicing_grouping_criteria/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Sales order invoicing grouping criteria",
-    "version": "16.0.1.0.0",
+    "version": "17.0.1.0.0",
     "category": "Sales Management",
     "license": "AGPL-3",
     "author": "Tecnativa, " "Odoo Community Association (OCA)",
diff --git a/sale_order_invoicing_grouping_criteria/models/res_config_settings.py b/sale_order_invoicing_grouping_criteria/models/res_config_settings.py
index e3749617b935..550be1a4c029 100644
--- a/sale_order_invoicing_grouping_criteria/models/res_config_settings.py
+++ b/sale_order_invoicing_grouping_criteria/models/res_config_settings.py
@@ -8,5 +8,5 @@ class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
     res_default_sale_invoicing_grouping_criteria_id = fields.Many2one(
-        related="company_id.default_sale_invoicing_grouping_criteria_id", readonly=False
+        related="company_id.default_sale_invoicing_grouping_criteria_id"
     )
diff --git a/sale_order_invoicing_grouping_criteria/tests/test_sale_order_invoicing_group_criteria.py b/sale_order_invoicing_grouping_criteria/tests/test_sale_order_invoicing_group_criteria.py
index 6b039b162ecf..4a46e65e628c 100644
--- a/sale_order_invoicing_grouping_criteria/tests/test_sale_order_invoicing_group_criteria.py
+++ b/sale_order_invoicing_grouping_criteria/tests/test_sale_order_invoicing_group_criteria.py
@@ -1,12 +1,13 @@
 # Copyright 2019 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo.tests import TransactionCase
+from odoo.tests import TransactionCase, requests
 
 
 class TestSaleOrderInvoicingGroupingCriteria(TransactionCase):
     @classmethod
     def setUpClass(cls):
+        cls._super_send = requests.Session.send
         super().setUpClass()
         cls.env = cls.env(
             context=dict(
diff --git a/sale_order_invoicing_grouping_criteria/views/res_config_settings_views.xml b/sale_order_invoicing_grouping_criteria/views/res_config_settings_views.xml
index ec1202777d0a..2a9c28f711d7 100644
--- a/sale_order_invoicing_grouping_criteria/views/res_config_settings_views.xml
+++ b/sale_order_invoicing_grouping_criteria/views/res_config_settings_views.xml
@@ -6,29 +6,23 @@
         <field name="inherit_id" ref="account.res_config_settings_view_form" />
         <field name="model">res.config.settings</field>
         <field name="arch" type="xml">
-            <div id="invoicing_settings" position="after">
-                <h2>Sales Order Invoicing</h2>
-                <div
-                    class="row mt16 o_settings_container"
-                    id="sale_order_invoicing_settings"
-                >
-                    <div class="col-12 col-lg-6 o_setting_box">
-                        <div class="o_setting_left_pane" />
-                        <div class="o_setting_right_pane">
-                            <label
-                                string="Default Grouping Criteria"
-                                for="res_default_sale_invoicing_grouping_criteria_id"
-                            />
-                            <div
-                                class="text-muted"
-                            >If empty, invoicing address, company and currency will be applied.</div>
-                            <field
-                                name="res_default_sale_invoicing_grouping_criteria_id"
-                            />
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <block id="invoicing_settings" position="after">
+                <block title="Sales Order Invoicing" id="sale_order_invoicing_settings">
+                    <block>
+                        <label
+                            string="Default Grouping Criteria"
+                            for="res_default_sale_invoicing_grouping_criteria_id"
+                        />
+                        <div
+                            class="text-muted"
+                        >If empty, invoicing address, company and currency will be applied.</div>
+                        <field
+                            name="res_default_sale_invoicing_grouping_criteria_id"
+                            readonly="0"
+                        />
+                    </block>
+                </block>
+            </block>
         </field>
     </record>
 </odoo>