diff --git a/sale_order_invoicing_grouping_criteria/README.rst b/sale_order_invoicing_grouping_criteria/README.rst
index 12b41ed3fd5..a99060a7538 100644
--- a/sale_order_invoicing_grouping_criteria/README.rst
+++ b/sale_order_invoicing_grouping_criteria/README.rst
@@ -106,6 +106,11 @@ Contributors
 
    -  Pedro M. Baeza
 
+-  `Sygel <https://www.sygel.es/>`__:
+
+   -  Valentin Vinagre valentin.vinagre@sygel.es
+   -  Roger Sans roger.sans@sygel.es
+
 Maintainers
 -----------
 
diff --git a/sale_order_invoicing_grouping_criteria/__manifest__.py b/sale_order_invoicing_grouping_criteria/__manifest__.py
index b59953464ba..cc4fcb98e2e 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 e3749617b93..550be1a4c02 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/readme/CONTRIBUTORS.md b/sale_order_invoicing_grouping_criteria/readme/CONTRIBUTORS.md
index 9f68fe41c08..0bc0c62626f 100644
--- a/sale_order_invoicing_grouping_criteria/readme/CONTRIBUTORS.md
+++ b/sale_order_invoicing_grouping_criteria/readme/CONTRIBUTORS.md
@@ -1,2 +1,8 @@
 - [Tecnativa](https://www.tecnativa.com):
+
   - Pedro M. Baeza
+
+- [Sygel](https://www.sygel.es/):
+
+  - Valentin Vinagre <valentin.vinagre@sygel.es>
+  - Roger Sans <roger.sans@sygel.es>
\ No newline at end of file
diff --git a/sale_order_invoicing_grouping_criteria/static/description/index.html b/sale_order_invoicing_grouping_criteria/static/description/index.html
index a5fb5ab63dc..0482bdbb520 100644
--- a/sale_order_invoicing_grouping_criteria/static/description/index.html
+++ b/sale_order_invoicing_grouping_criteria/static/description/index.html
@@ -454,6 +454,11 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <li>Pedro M. Baeza</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://www.sygel.es/">Sygel</a>:<ul>
+<li>Valentin Vinagre <a class="reference external" href="mailto:valentin.vinagre&#64;sygel.es">valentin.vinagre&#64;sygel.es</a></li>
+<li>Roger Sans <a class="reference external" href="mailto:roger.sans&#64;sygel.es">roger.sans&#64;sygel.es</a></li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
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 ec1202777d0..2a9c28f711d 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>