diff --git a/README.md b/README.md
index 8d2300296..49dc3ef14 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,10 @@ Available addons
 addon | version | maintainers | summary
 --- | --- | --- | ---
 [product_warranty](product_warranty/) | 17.0.1.0.0 | <a href='https://github.com/osi-scampbell'><img src='https://github.com/osi-scampbell.png' width='32' height='32' style='border-radius:50%;' alt='osi-scampbell'/></a> <a href='https://github.com/max3903'><img src='https://github.com/max3903.png' width='32' height='32' style='border-radius:50%;' alt='max3903'/></a> | Product Warranty
-[rma](rma/) | 17.0.3.2.4 | <a href='https://github.com/pedrobaeza'><img src='https://github.com/pedrobaeza.png' width='32' height='32' style='border-radius:50%;' alt='pedrobaeza'/></a> <a href='https://github.com/chienandalu'><img src='https://github.com/chienandalu.png' width='32' height='32' style='border-radius:50%;' alt='chienandalu'/></a> | Return Merchandise Authorization (RMA)
+[rma](rma/) | 17.0.3.3.0 | <a href='https://github.com/pedrobaeza'><img src='https://github.com/pedrobaeza.png' width='32' height='32' style='border-radius:50%;' alt='pedrobaeza'/></a> <a href='https://github.com/chienandalu'><img src='https://github.com/chienandalu.png' width='32' height='32' style='border-radius:50%;' alt='chienandalu'/></a> | Return Merchandise Authorization (RMA)
 [rma_lot](rma_lot/) | 17.0.1.1.0 |  | Manage lot in RMA
 [rma_repair](rma_repair/) | 17.0.1.0.2 | <a href='https://github.com/peluko00'><img src='https://github.com/peluko00.png' width='32' height='32' style='border-radius:50%;' alt='peluko00'/></a> | Create a repair order from rma
-[rma_sale](rma_sale/) | 17.0.2.0.4 | <a href='https://github.com/pedrobaeza'><img src='https://github.com/pedrobaeza.png' width='32' height='32' style='border-radius:50%;' alt='pedrobaeza'/></a> | Sale Order - Return Merchandise Authorization (RMA)
+[rma_sale](rma_sale/) | 17.0.2.1.0 | <a href='https://github.com/pedrobaeza'><img src='https://github.com/pedrobaeza.png' width='32' height='32' style='border-radius:50%;' alt='pedrobaeza'/></a> | Sale Order - Return Merchandise Authorization (RMA)
 
 [//]: # (end addons)
 
diff --git a/rma/README.rst b/rma/README.rst
index 6a8c856b8..eab3dd7ba 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -11,7 +11,7 @@ Return Merchandise Authorization Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:63c689f5f9c88980405397fbb086c29687d0233798f8b704dbb6d738f582938c
+   !! source digest: sha256:9c75ca73757489d4d7fe02611a8ca76598f2b849ef16a37488efc147494d11f7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 6fab1becf..b650f434e 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "17.0.3.2.4",
+    "version": "17.0.3.3.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/de.po b/rma/i18n/de.po
index acb0ae645..62eb19d49 100644
--- a/rma/i18n/de.po
+++ b/rma/i18n/de.po
@@ -953,6 +953,11 @@ msgstr ""
 "Eine E-Mail wird an die Kunden gesendet, wenn eine RMA über das Portal "
 "aufgegeben wird"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -1002,11 +1007,6 @@ msgstr "RMA manuell abschließen"
 msgid "Finish RMA manually choosing a reason"
 msgstr "Schließen Sie die RMA manuell ab, indem Sie einen Grund auswählen"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr "Schließen Sie RMAs manuell ab"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1378,6 +1378,7 @@ msgstr ""
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr ""
 
@@ -1972,11 +1973,6 @@ msgstr "Verantwortlicher Benutzer"
 msgid "Return Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr ""
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -2066,25 +2062,6 @@ msgstr "RMA-Empfangsbestätigung senden"
 msgid "Send RMA draft Confirmation"
 msgstr "RMA-Bestätigungsentwurf senden"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr "Senden Sie automatische RMA-Informationen an den Kunden"
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-"Senden Sie eine automatische Benachrichtigung über den Empfang von RMA-"
-"Produkten an den Kunden"
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
-"Senden Sie eine automatische Benachrichtigung, wenn der Kunde eine RMA "
-"aufgibt"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2513,8 +2490,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
@@ -2607,6 +2584,22 @@ msgstr ""
 "{{object.company_id.name}} Ihre RMA wurde erfolgreich erstellt (Ref "
 "{{object.name or 'n/a' }})"
 
+#~ msgid "Finish RMAs manually"
+#~ msgstr "Schließen Sie RMAs manuell ab"
+
+#~ msgid "Send automatic RMA info to customer"
+#~ msgstr "Senden Sie automatische RMA-Informationen an den Kunden"
+
+#~ msgid "Send automatic RMA products reception notification to customer"
+#~ msgstr ""
+#~ "Senden Sie eine automatische Benachrichtigung über den Empfang von RMA-"
+#~ "Produkten an den Kunden"
+
+#~ msgid "Send automatic notification when the customer places an RMA"
+#~ msgstr ""
+#~ "Senden Sie eine automatische Benachrichtigung, wenn der Kunde eine RMA "
+#~ "aufgibt"
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
diff --git a/rma/i18n/de_AT.po b/rma/i18n/de_AT.po
index 274c9ca60..42c91b7a7 100644
--- a/rma/i18n/de_AT.po
+++ b/rma/i18n/de_AT.po
@@ -894,6 +894,11 @@ msgstr ""
 msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -943,11 +948,6 @@ msgstr ""
 msgid "Finish RMA manually choosing a reason"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1305,6 +1305,7 @@ msgstr ""
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr ""
 
@@ -1878,11 +1879,6 @@ msgstr ""
 msgid "Return Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr ""
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1970,21 +1966,6 @@ msgstr ""
 msgid "Send RMA draft Confirmation"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2391,8 +2372,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 80b636ce5..47b9aaf84 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -1001,8 +1001,8 @@ msgstr "Plantilla de correo de confirmación de recepción RMA"
 #: model:ir.model.fields,help:rma.field_rma_team__alias_domain
 msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
 msgstr ""
-"Dominio del correo electrónico, por ejemplo “example.com” en “"
-"odoo@example.com”"
+"Dominio del correo electrónico, por ejemplo “example.com” en "
+"“odoo@example.com”"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
@@ -1024,6 +1024,11 @@ msgstr ""
 "Enviar correo de confirmación al cliente una vez se tramite el RMA desde el "
 "portal"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -1075,11 +1080,6 @@ msgstr "Finalizar RMA manualmente"
 msgid "Finish RMA manually choosing a reason"
 msgstr "Finalizar RMA manualmente eligiendo un motivo"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr "Finalizar RMAs manualmente"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1456,6 +1456,7 @@ msgstr "Operación"
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr "Operaciones"
 
@@ -2052,11 +2053,6 @@ msgstr "Usuario responsable"
 msgid "Return Location"
 msgstr "Lugar de devolución"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr "Gestión de autorizaciones de devolución de mercancía (RMA)"
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -2146,22 +2142,6 @@ msgstr "Enviar confirmación de recepción de RMA"
 msgid "Send RMA draft Confirmation"
 msgstr "Enviar confirmación de borrador RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr "Enviar información automática de RMA al cliente"
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-"Enviar notificación automática de recepción de productos RMA al cliente"
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr "Enviar una notificación automática cuando el cliente solicita un RMA"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2590,12 +2570,9 @@ msgstr "Cuando se confirme un RMA, enviar un correo informativo automático."
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
-"Cuando se recibe el RMA, se permite finalizar manualmente eligiendo\n"
-"\n"
-"                                    un motivo de finalización."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -2685,6 +2662,31 @@ msgstr ""
 "{{object.company_id.name}} Su RMA se ha creado con éxito (Ref {{object.name "
 "or 'n/a' }})"
 
+#~ msgid "Finish RMAs manually"
+#~ msgstr "Finalizar RMAs manualmente"
+
+#~ msgid "Return Merchandise Authorization Management"
+#~ msgstr "Gestión de autorizaciones de devolución de mercancía (RMA)"
+
+#~ msgid "Send automatic RMA info to customer"
+#~ msgstr "Enviar información automática de RMA al cliente"
+
+#~ msgid "Send automatic RMA products reception notification to customer"
+#~ msgstr ""
+#~ "Enviar notificación automática de recepción de productos RMA al cliente"
+
+#~ msgid "Send automatic notification when the customer places an RMA"
+#~ msgstr ""
+#~ "Enviar una notificación automática cuando el cliente solicita un RMA"
+
+#~ msgid ""
+#~ "When the RMA is receive, allow to finsish it manually choosing\n"
+#~ "                                    a finalization reason."
+#~ msgstr ""
+#~ "Cuando se recibe el RMA, se permite finalizar manualmente eligiendo\n"
+#~ "\n"
+#~ "                                    un motivo de finalización."
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
diff --git a/rma/i18n/fr.po b/rma/i18n/fr.po
index dd33d5538..f86910b16 100644
--- a/rma/i18n/fr.po
+++ b/rma/i18n/fr.po
@@ -1020,6 +1020,11 @@ msgstr "Email envoyé au client une fois les produits RMA reçus."
 msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr "E-mail envoyé au client lorsqu'il passe un RMA depuis le portail"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -1069,11 +1074,6 @@ msgstr "Terminer RMA manuellement"
 msgid "Finish RMA manually choosing a reason"
 msgstr "Terminer RMA manuellement en choisissant une raison"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr "Terminer RMA manuellement"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1442,6 +1442,7 @@ msgstr ""
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr ""
 
@@ -2026,11 +2027,6 @@ msgstr "Utilisateur responsable"
 msgid "Return Location"
 msgstr "Emplacement de retour"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr ""
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -2120,24 +2116,6 @@ msgstr "Envoyer confirmation de réception RMA"
 msgid "Send RMA draft Confirmation"
 msgstr "Envoyer confirmation brouillon RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr "Envoyer automatiquement les infos RMA au client"
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-"Envoyer automatiquement les notifications de réceptions produits RMA au "
-"client"
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
-"Envoyer automatiquement une notification quand le client demande une RMA"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2557,8 +2535,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
@@ -2647,6 +2625,21 @@ msgstr ""
 "{{object.company_id.name}} Votre RMA a été crée avec succès(Ref "
 "{{object.name or 'n/a' }})"
 
+#~ msgid "Finish RMAs manually"
+#~ msgstr "Terminer RMA manuellement"
+
+#~ msgid "Send automatic RMA info to customer"
+#~ msgstr "Envoyer automatiquement les infos RMA au client"
+
+#~ msgid "Send automatic RMA products reception notification to customer"
+#~ msgstr ""
+#~ "Envoyer automatiquement les notifications de réceptions produits RMA au "
+#~ "client"
+
+#~ msgid "Send automatic notification when the customer places an RMA"
+#~ msgstr ""
+#~ "Envoyer automatiquement une notification quand le client demande une RMA"
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 98bf4a4b9..e78d05298 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -1019,6 +1019,11 @@ msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 "l'e-mail sarà inviata al cliente quando si inserisce una RMA dal portale"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -1070,11 +1075,6 @@ msgstr "Chiudi RMA manualmente"
 msgid "Finish RMA manually choosing a reason"
 msgstr "Chiudi RMA manualmente indicando un motivo"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr "Chiudi RMAs manualmente"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1449,6 +1449,7 @@ msgstr "Operazione"
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr "Operazioni"
 
@@ -2044,11 +2045,6 @@ msgstr "Utente responsabile"
 msgid "Return Location"
 msgstr "Ubicazione di reso"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr "Gestione autorizzazione reso merce"
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -2138,22 +2134,6 @@ msgstr "Invia conferma ricevuta RMA"
 msgid "Send RMA draft Confirmation"
 msgstr "Invia conferma bozza RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr "Invio automatico informazioni RMA al cliente"
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-"Invio automatico di una notifica di ricezione dei prodotti RMA al cliente"
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr "Invia una notifica automatica quando il cliente inserisce una RMA"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2583,11 +2563,11 @@ msgstr "Quando l'RMA è confermata, inviare un'e-mail informativa automatica."
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
-"Quando si riceve l'RMA, permette di chiuderla manualmente scegliendo\n"
-"                                    un motivo per la chiusura."
+"Quando si riceve l'RMA, consente di chiuderlo manualmente scegliendo un "
+"motivo per la chiusura."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -2674,6 +2654,29 @@ msgstr ""
 "{{object.company_id.name}} La vostra RMA è stata creata con successo (rif. "
 "{{object.name or 'n/a' }})"
 
+#~ msgid "Finish RMAs manually"
+#~ msgstr "Chiudi RMAs manualmente"
+
+#~ msgid "Return Merchandise Authorization Management"
+#~ msgstr "Gestione autorizzazione reso merce"
+
+#~ msgid "Send automatic RMA info to customer"
+#~ msgstr "Invio automatico informazioni RMA al cliente"
+
+#~ msgid "Send automatic RMA products reception notification to customer"
+#~ msgstr ""
+#~ "Invio automatico di una notifica di ricezione dei prodotti RMA al cliente"
+
+#~ msgid "Send automatic notification when the customer places an RMA"
+#~ msgstr "Invia una notifica automatica quando il cliente inserisce una RMA"
+
+#~ msgid ""
+#~ "When the RMA is receive, allow to finsish it manually choosing\n"
+#~ "                                    a finalization reason."
+#~ msgstr ""
+#~ "Quando si riceve l'RMA, permette di chiuderla manualmente scegliendo\n"
+#~ "                                    un motivo per la chiusura."
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
@@ -2681,13 +2684,6 @@ msgstr ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui "
 #~ "sono specifici per azienda.\" groups=\"base.group_multi_company\"/>"
 
-#~ msgid ""
-#~ "When the RMA is receive, allow to finsish it manually choosing a "
-#~ "finalization reason."
-#~ msgstr ""
-#~ "Quando si riceve l'RMA, consente di chiuderlo manualmente scegliendo un "
-#~ "motivo per la chiusura."
-
 #~ msgid "<strong>Delivered qty:</strong>"
 #~ msgstr "<strong>Quantità consegnata:</strong>"
 
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index 6f2f60475..132e51d58 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -894,6 +894,11 @@ msgstr ""
 msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -943,11 +948,6 @@ msgstr ""
 msgid "Finish RMA manually choosing a reason"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1305,6 +1305,7 @@ msgstr ""
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr ""
 
@@ -1878,11 +1879,6 @@ msgstr ""
 msgid "Return Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr ""
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1970,21 +1966,6 @@ msgstr ""
 msgid "Send RMA draft Confirmation"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2391,8 +2372,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
diff --git a/rma/i18n/pt.po b/rma/i18n/pt.po
index 417727c0c..c1b43d38d 100644
--- a/rma/i18n/pt.po
+++ b/rma/i18n/pt.po
@@ -904,6 +904,11 @@ msgstr ""
 msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -953,11 +958,6 @@ msgstr ""
 msgid "Finish RMA manually choosing a reason"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1319,6 +1319,7 @@ msgstr ""
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr ""
 
@@ -1903,11 +1904,6 @@ msgstr "Utilizador Responsável"
 msgid "Return Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr ""
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1995,21 +1991,6 @@ msgstr ""
 msgid "Send RMA draft Confirmation"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr "Enviar informações automáticas de RMA ao cliente"
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2427,8 +2408,8 @@ msgstr "Quando a RMA é confirmada, enviar um e-mail automático de informação
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
@@ -2511,6 +2492,9 @@ msgid ""
 "{{object.name or 'n/a' }})"
 msgstr ""
 
+#~ msgid "Send automatic RMA info to customer"
+#~ msgstr "Enviar informações automáticas de RMA ao cliente"
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 0b7eb9137..8cd9457a0 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -904,6 +904,11 @@ msgstr ""
 msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -953,11 +958,6 @@ msgstr ""
 msgid "Finish RMA manually choosing a reason"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1319,6 +1319,7 @@ msgstr ""
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr ""
 
@@ -1903,11 +1904,6 @@ msgstr "Usuário Responsável"
 msgid "Return Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr ""
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1995,21 +1991,6 @@ msgstr ""
 msgid "Send RMA draft Confirmation"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2427,8 +2408,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 953607a5f..b602e2813 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -886,6 +886,11 @@ msgstr ""
 msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -935,11 +940,6 @@ msgstr ""
 msgid "Finish RMA manually choosing a reason"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1298,6 +1298,7 @@ msgstr ""
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr ""
 
@@ -1870,11 +1871,6 @@ msgstr ""
 msgid "Return Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr ""
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1962,21 +1958,6 @@ msgstr ""
 msgid "Send RMA draft Confirmation"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2383,8 +2364,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index ebeda6e09..854964286 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -909,6 +909,11 @@ msgstr ""
 msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -958,11 +963,6 @@ msgstr ""
 msgid "Finish RMA manually choosing a reason"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1324,6 +1324,7 @@ msgstr ""
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr ""
 
@@ -1901,11 +1902,6 @@ msgstr ""
 msgid "Return Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr ""
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1993,21 +1989,6 @@ msgstr ""
 msgid "Send RMA draft Confirmation"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2415,8 +2396,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
index bb9e1db03..d68512873 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -896,6 +896,11 @@ msgstr ""
 msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Emails"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_operation__auto_confirm_reception
 msgid ""
@@ -945,11 +950,6 @@ msgstr ""
 msgid "Finish RMA manually choosing a reason"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Finish RMAs manually"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
@@ -1307,6 +1307,7 @@ msgstr ""
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_operation_act_window
 #: model:ir.ui.menu,name:rma.rma_operation_menu
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Operations"
 msgstr ""
 
@@ -1880,11 +1881,6 @@ msgstr ""
 msgid "Return Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Return Merchandise Authorization Management"
-msgstr ""
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1972,21 +1968,6 @@ msgstr ""
 msgid "Send RMA draft Confirmation"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA info to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -2393,8 +2374,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                                    a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index 45417db85..94843141c 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -372,7 +372,7 @@ <h1>Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:63c689f5f9c88980405397fbb086c29687d0233798f8b704dbb6d738f582938c
+!! source digest: sha256:9c75ca73757489d4d7fe02611a8ca76598f2b849ef16a37488efc147494d11f7
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/rma/tree/17.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to manage <a class="reference external" href="https://en.wikipedia.org/wiki/Return_merchandise_authorization">Return Merchandise Authorization
diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index e8254bef8..9bb39161a 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -6,160 +6,102 @@
         <field name="arch" type="xml">
             <xpath expr="//form" position="inside">
                 <app string="RMA" groups="rma.rma_group_manager" name="rma">
-                    <h2>Return Merchandise Authorization Management</h2>
-                    <div
-                        class="row mt16 o_settings_container"
-                        name="operations_setting_container"
-                    >
-                        <div
-                            class="col-12 col-lg-6 o_setting_box"
-                            title="Finish RMAs manually"
+                    <block name="rma_operations_block" title="Operations">
+                        <setting
+                            help="When the RMA is receive, allow to finsish it manually choosing a finalization reason."
                         >
-                            <div class="o_setting_left_pane">
-                                <field name="group_rma_manual_finalization" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="group_rma_manual_finalization"
-                                    string="RMA Manual Finalization"
-                                />
-                                <div class="text-muted">
-                                    When the RMA is receive, allow to finsish it manually choosing
-                                    a finalization reason.
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="rma_return_grouping" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="rma_return_grouping" />
-                                <span
-                                    class="fa fa-lg fa-building-o"
-                                    title="Values set here are company-specific."
-                                    groups="base.group_multi_company"
-                                />
-                                <div
-                                    class="text-muted"
-                                >Group RMA returns by customer and warehouse.</div>
-                            </div>
-                        </div>
-                        <div
-                            class="col-12 col-lg-6 o_setting_box"
-                            title="Send automatic RMA info to customer"
+                            <field
+                                name="group_rma_manual_finalization"
+                                string="RMA Manual Finalization"
+                            />
+                        </setting>
+                        <setting
+                            help="Group RMA returns by customer and warehouse."
+                            company_specific="1"
                         >
-                            <div class="o_setting_left_pane">
-                                <field name="send_rma_confirmation" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="send_rma_confirmation"
-                                    string="RMA Confirmation Email"
-                                />
-                                <span
-                                    class="fa fa-lg fa-building-o"
-                                    title="Values set here are company-specific."
-                                    groups="base.group_multi_company"
-                                />
-                                <div
-                                    class="text-muted"
-                                >When the RMA is confirmed, send an automatic information email.</div>
-                                <div
-                                    class="row mt16"
-                                    invisible="not send_rma_confirmation"
-                                >
+                            <field
+                                name="rma_return_grouping"
+                                title="Values set here are company-specific."
+                            />
+                        </setting>
+                    </block>
+                    <block name="rma_mail_block" title="Emails">
+                        <setting
+                            help="When the RMA is confirmed, send an automatic information email."
+                            company_specific="1"
+                        >
+                            <field
+                                name="send_rma_confirmation"
+                                string="RMA Confirmation Email"
+                            />
+                            <div
+                                class="content-group"
+                                invisible="not send_rma_confirmation"
+                            >
+                                <div class="row mt16">
                                     <label
-                                        for="rma_mail_confirmation_template_id"
                                         string="Email Template"
+                                        for="rma_mail_confirmation_template_id"
                                         class="col-lg-4 o_light_label"
                                     />
                                     <field
                                         name="rma_mail_confirmation_template_id"
-                                        class="oe_inline"
                                         required="send_rma_confirmation"
-                                        context="{'default_model': 'rma'}"
                                     />
                                 </div>
                             </div>
-                        </div>
-                        <div
-                            class="col-12 col-lg-6 o_setting_box"
-                            title="Send automatic RMA products reception notification to customer"
+                        </setting>
+                        <setting
+                            help="When the RMA products are received, send an automatic information email."
+                            company_specific="1"
                         >
-                            <div class="o_setting_left_pane">
-                                <field name="send_rma_receipt_confirmation" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="send_rma_receipt_confirmation"
-                                    string="RMA Receipt Confirmation Email"
-                                />
-                                <span
-                                    class="fa fa-lg fa-building-o"
-                                    title="Values set here are company-specific."
-                                    groups="base.group_multi_company"
-                                />
-                                <div
-                                    class="text-muted"
-                                >When the RMA products are received, send an automatic information email.</div>
-                                <div
-                                    class="row mt16"
-                                    invisible="not send_rma_receipt_confirmation"
-                                >
+                            <field
+                                name="send_rma_receipt_confirmation"
+                                string="RMA Receipt Confirmation Email"
+                            />
+                            <div
+                                class="content-group"
+                                invisible="not send_rma_receipt_confirmation"
+                            >
+                                <div class="row mt16">
                                     <label
-                                        for="rma_mail_receipt_confirmation_template_id"
                                         string="Email Template"
+                                        for="rma_mail_receipt_confirmation_template_id"
                                         class="col-lg-4 o_light_label"
                                     />
                                     <field
                                         name="rma_mail_receipt_confirmation_template_id"
-                                        class="oe_inline"
                                         required="send_rma_receipt_confirmation"
-                                        context="{'default_model': 'rma'}"
                                     />
                                 </div>
                             </div>
-                        </div>
-                        <div
-                            class="col-12 col-lg-6 o_setting_box"
-                            title="Send automatic notification when the customer places an RMA"
+                        </setting>
+                        <setting
+                            help="When customers themselves place an RMA from the portal, send an automatic notification acknowleging it."
+                            company_specific="1"
                         >
-                            <div class="o_setting_left_pane">
-                                <field name="send_rma_draft_confirmation" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label
-                                    for="send_rma_draft_confirmation"
-                                    string="RMA draft notification Email"
-                                />
-                                <span
-                                    class="fa fa-lg fa-building-o"
-                                    title="Values set here are company-specific."
-                                    groups="base.group_multi_company"
-                                />
-                                <div
-                                    class="text-muted"
-                                >When customers themselves place an RMA from the portal, send an automatic notification acknowleging it.</div>
-                                <div
-                                    class="row mt16"
-                                    invisible="not send_rma_draft_confirmation"
-                                >
+                            <field
+                                name="send_rma_draft_confirmation"
+                                string="RMA draft notification Email"
+                            />
+                            <div
+                                class="content-group"
+                                invisible="not send_rma_draft_confirmation"
+                            >
+                                <div class="row mt16">
                                     <label
-                                        for="rma_mail_draft_confirmation_template_id"
                                         string="Email Template"
+                                        for="rma_mail_draft_confirmation_template_id"
                                         class="col-lg-4 o_light_label"
                                     />
                                     <field
                                         name="rma_mail_draft_confirmation_template_id"
-                                        class="oe_inline"
                                         required="send_rma_draft_confirmation"
-                                        context="{'default_model': 'rma'}"
                                     />
                                 </div>
                             </div>
-                        </div>
-                    </div>
+                        </setting>
+                    </block>
                 </app>
             </xpath>
         </field>
diff --git a/rma_sale/README.rst b/rma_sale/README.rst
index 475777822..7f8a8fa30 100644
--- a/rma_sale/README.rst
+++ b/rma_sale/README.rst
@@ -11,7 +11,7 @@ Return Merchandise Authorization Management - Link with Sales
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:f59ef207e09bf5d059c15b9e5a56d093913967270700a97cb3655373af2ac850
+   !! source digest: sha256:6b9bde575af88d587df80cb33c90f9ca996a9cdf003b5d043fd3bd884566a4d3
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/rma_sale/__manifest__.py b/rma_sale/__manifest__.py
index 3602c0b12..6653768d8 100644
--- a/rma_sale/__manifest__.py
+++ b/rma_sale/__manifest__.py
@@ -6,7 +6,7 @@
 {
     "name": "Return Merchandise Authorization Management - Link with Sales",
     "summary": "Sale Order - Return Merchandise Authorization (RMA)",
-    "version": "17.0.2.0.4",
+    "version": "17.0.2.1.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma_sale/i18n/de.po b/rma_sale/i18n/de.po
index 8d4b87b47..40f2be3d1 100644
--- a/rma_sale/i18n/de.po
+++ b/rma_sale/i18n/de.po
@@ -418,11 +418,6 @@ msgstr "Wählen Sie die Produktmenge und den gewünschten Vorgang aus"
 msgid "Shipping Address"
 msgstr "Versandadresse"
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Show portal RMA request in a single page"
-msgstr "RMA-Anfrage im Portal auf einer einzigen Seite anzeigen"
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid "Single page RMA request"
@@ -457,11 +452,6 @@ msgstr ""
 "Werte, die aus benutzerdefinierten Feldern für RMA-Anforderungsformulare des "
 "Portals stammen"
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Values set here are company-specific."
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid ""
@@ -522,6 +512,9 @@ msgstr ""
 "Sie sind dabei, eine RMA-Anfrage durchzuführen. Unser Team wird es "
 "bearbeiten und Sie erreichen, sobald es validiert ist. Denk daran, dass:"
 
+#~ msgid "Show portal RMA request in a single page"
+#~ msgstr "RMA-Anfrage im Portal auf einer einzigen Seite anzeigen"
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
diff --git a/rma_sale/i18n/es.po b/rma_sale/i18n/es.po
index 56aff6f6c..da1fba9a7 100644
--- a/rma_sale/i18n/es.po
+++ b/rma_sale/i18n/es.po
@@ -421,11 +421,6 @@ msgstr "Selecciones la cantidad de producto y la operación solicitada"
 msgid "Shipping Address"
 msgstr "Dirección de envío"
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Show portal RMA request in a single page"
-msgstr "Mostrar la solicitud de RMA del portal en una sola página"
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid "Single page RMA request"
@@ -459,11 +454,6 @@ msgstr ""
 "Valores provenientes de campos personalizados del formulario de solicitud "
 "RMA del portal"
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Values set here are company-specific."
-msgstr "Los valores establecidos aquí son específicos de la empresa."
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid ""
@@ -521,6 +511,12 @@ msgstr ""
 "Va a realizar una petición de RMA. Nuestro equipo la procesará y se pondrá "
 "en contacto con usted una vez validad. Tenga en cuenta que:"
 
+#~ msgid "Show portal RMA request in a single page"
+#~ msgstr "Mostrar la solicitud de RMA del portal en una sola página"
+
+#~ msgid "Values set here are company-specific."
+#~ msgstr "Los valores establecidos aquí son específicos de la empresa."
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
diff --git a/rma_sale/i18n/fr.po b/rma_sale/i18n/fr.po
index eb724d73d..ee234d09c 100644
--- a/rma_sale/i18n/fr.po
+++ b/rma_sale/i18n/fr.po
@@ -417,11 +417,6 @@ msgstr "Sélectionnez la quantité de produit et l'opération demandée"
 msgid "Shipping Address"
 msgstr "Adresse de livraison"
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Show portal RMA request in a single page"
-msgstr "Afficher la demande RMA du portail sur une seule page"
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid "Single page RMA request"
@@ -455,11 +450,6 @@ msgstr ""
 "Valeurs provenant des champs personnalisés du formulaire de demande RMA du "
 "portail"
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Values set here are company-specific."
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid ""
@@ -518,6 +508,9 @@ msgstr ""
 "Vous êtes sur le point d'effectuer une demande RMA. Notre équipe le traitera "
 "et vous parviendra une fois validé. Garde en tête que:"
 
+#~ msgid "Show portal RMA request in a single page"
+#~ msgstr "Afficher la demande RMA du portail sur une seule page"
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
diff --git a/rma_sale/i18n/it.po b/rma_sale/i18n/it.po
index 1407a4859..b5537d870 100644
--- a/rma_sale/i18n/it.po
+++ b/rma_sale/i18n/it.po
@@ -421,11 +421,6 @@ msgstr "Seleziona la quantità prodotto e l'operazione richiesta"
 msgid "Shipping Address"
 msgstr "Indirizzo di spedizione"
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Show portal RMA request in a single page"
-msgstr "Mostra il portale della richiesta RMA in una singola pagina"
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid "Single page RMA request"
@@ -457,11 +452,6 @@ msgstr ""
 "Valori provenienti dai campi personalizzati del modulo di richiesta RMA del "
 "portale"
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Values set here are company-specific."
-msgstr "I valori impostati qui sono specifici per azienda."
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid ""
@@ -518,6 +508,12 @@ msgstr ""
 "Stai per eseguire una richiesta RMA. Il nostro team lo elaborerà e ti "
 "arriverà una volta convalidato. Tieni presente che:"
 
+#~ msgid "Show portal RMA request in a single page"
+#~ msgstr "Mostra il portale della richiesta RMA in una singola pagina"
+
+#~ msgid "Values set here are company-specific."
+#~ msgstr "I valori impostati qui sono specifici per azienda."
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
diff --git a/rma_sale/i18n/nl.po b/rma_sale/i18n/nl.po
index 850551ebe..9e9116e8a 100644
--- a/rma_sale/i18n/nl.po
+++ b/rma_sale/i18n/nl.po
@@ -411,11 +411,6 @@ msgstr "Selecteer het productaantal en de gewenste handeling"
 msgid "Shipping Address"
 msgstr ""
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Show portal RMA request in a single page"
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid "Single page RMA request"
@@ -446,11 +441,6 @@ msgstr ""
 msgid "Values coming from portal RMA request form custom fields"
 msgstr ""
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Values set here are company-specific."
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid ""
diff --git a/rma_sale/i18n/pt.po b/rma_sale/i18n/pt.po
index 207075eb1..15a8c952b 100644
--- a/rma_sale/i18n/pt.po
+++ b/rma_sale/i18n/pt.po
@@ -417,11 +417,6 @@ msgstr "Selecione a quantidade de produto e a operação solicitada"
 msgid "Shipping Address"
 msgstr "Endereço de Envio"
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Show portal RMA request in a single page"
-msgstr "Mostrar pedido de RMA do portal numa única página"
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid "Single page RMA request"
@@ -454,11 +449,6 @@ msgstr ""
 "Valores provenientes de campos personalizados do formulário de solicitação "
 "de RMA do portal"
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Values set here are company-specific."
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid ""
@@ -517,6 +507,9 @@ msgstr ""
 "Você está prestes a realizar um pedido de RMA. A nossa equipa irá processá-"
 "lo e entrará em contacto assim que for validado. Tenha presente que:"
 
+#~ msgid "Show portal RMA request in a single page"
+#~ msgstr "Mostrar pedido de RMA do portal numa única página"
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
diff --git a/rma_sale/i18n/pt_BR.po b/rma_sale/i18n/pt_BR.po
index d8a3cb7f4..c1c666908 100644
--- a/rma_sale/i18n/pt_BR.po
+++ b/rma_sale/i18n/pt_BR.po
@@ -412,11 +412,6 @@ msgstr ""
 msgid "Shipping Address"
 msgstr ""
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Show portal RMA request in a single page"
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid "Single page RMA request"
@@ -444,11 +439,6 @@ msgstr ""
 msgid "Values coming from portal RMA request form custom fields"
 msgstr ""
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Values set here are company-specific."
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid ""
diff --git a/rma_sale/i18n/rma_sale.pot b/rma_sale/i18n/rma_sale.pot
index e0ad444d3..e8c8ad508 100644
--- a/rma_sale/i18n/rma_sale.pot
+++ b/rma_sale/i18n/rma_sale.pot
@@ -404,11 +404,6 @@ msgstr ""
 msgid "Shipping Address"
 msgstr ""
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Show portal RMA request in a single page"
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid "Single page RMA request"
@@ -436,11 +431,6 @@ msgstr ""
 msgid "Values coming from portal RMA request form custom fields"
 msgstr ""
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Values set here are company-specific."
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid ""
diff --git a/rma_sale/i18n/ro.po b/rma_sale/i18n/ro.po
index f34837507..48c1fa537 100644
--- a/rma_sale/i18n/ro.po
+++ b/rma_sale/i18n/ro.po
@@ -417,11 +417,6 @@ msgstr "Selectați cantitatea produsului și operațiunea solicitată"
 msgid "Shipping Address"
 msgstr ""
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Show portal RMA request in a single page"
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid "Single page RMA request"
@@ -452,11 +447,6 @@ msgstr ""
 msgid "Values coming from portal RMA request form custom fields"
 msgstr ""
 
-#. module: rma_sale
-#: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
-msgid "Values set here are company-specific."
-msgstr ""
-
 #. module: rma_sale
 #: model_terms:ir.ui.view,arch_db:rma_sale.res_config_settings_view_form
 msgid ""
diff --git a/rma_sale/static/description/index.html b/rma_sale/static/description/index.html
index 7e4b1a628..23a41b620 100644
--- a/rma_sale/static/description/index.html
+++ b/rma_sale/static/description/index.html
@@ -372,7 +372,7 @@ <h1>Return Merchandise Authorization Management - Link with Sales</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:f59ef207e09bf5d059c15b9e5a56d093913967270700a97cb3655373af2ac850
+!! source digest: sha256:6b9bde575af88d587df80cb33c90f9ca996a9cdf003b5d043fd3bd884566a4d3
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/rma/tree/17.0/rma_sale"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma_sale"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to link a sales order to an RMA. This can be done
diff --git a/rma_sale/views/account_move_views.xml b/rma_sale/views/account_move_views.xml
index 96dd435b6..4ce1fb04d 100644
--- a/rma_sale/views/account_move_views.xml
+++ b/rma_sale/views/account_move_views.xml
@@ -6,10 +6,10 @@
         <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='invoice_line_ids']/tree" position="inside">
-                <field name="sale_line_ids" readonly="0" invisible="1" />
+                <field name="sale_line_ids" readonly="0" column_invisible="1" />
             </xpath>
             <xpath expr="//field[@name='line_ids']/tree" position="inside">
-                <field name="sale_line_ids" readonly="0" invisible="1" />
+                <field name="sale_line_ids" readonly="0" column_invisible="1" />
             </xpath>
         </field>
     </record>
diff --git a/rma_sale/views/res_config_settings_views.xml b/rma_sale/views/res_config_settings_views.xml
index fecc6e4fd..6c24e4879 100644
--- a/rma_sale/views/res_config_settings_views.xml
+++ b/rma_sale/views/res_config_settings_views.xml
@@ -5,28 +5,15 @@
         <field name="inherit_id" ref="sale.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <block name="catalog_setting_container" position="inside">
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
-                    title="Show portal RMA request in a single page"
+                <setting
+                    help="When we hit the RMA request button from the portal sale page, open in a single page instead of a popup."
+                    company_specific="1"
                 >
-                    <div class="o_setting_left_pane">
-                        <field name="show_full_page_sale_rma" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label
-                            for="show_full_page_sale_rma"
-                            string="Single page RMA request"
-                        />
-                        <span
-                            class="fa fa-lg fa-building-o"
-                            title="Values set here are company-specific."
-                            groups="base.group_multi_company"
-                        />
-                        <div class="text-muted">
-                            When we hit the RMA request button from the portal sale page, open in a single page instead of a popup.
-                        </div>
-                    </div>
-                </div>
+                    <field
+                        name="show_full_page_sale_rma"
+                        string="Single page RMA request"
+                    />
+                </setting>
             </block>
         </field>
     </record>