diff --git a/rma/README.rst b/rma/README.rst
index d0ef4f57..a229daba 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -2,10 +2,13 @@
 Return Merchandise Authorization Management
 ===========================================
 
-.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:4b518f08c3f67013102d103bf4cfa29044b508456a38a8405d92ae01faa8d88e
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
@@ -14,16 +17,16 @@ Return Merchandise Authorization Management
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github
-    :target: https://github.com/OCA/rma/tree/15.0/rma
+    :target: https://github.com/OCA/rma/tree/16.0/rma
     :alt: OCA/rma
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/rma-15-0/rma-15-0-rma
+    :target: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/145/15.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/rma&target_branch=16.0
+    :alt: Try me on Runboat
 
-|badge1| |badge2| |badge3| |badge4| |badge5| 
+|badge1| |badge2| |badge3| |badge4| |badge5|
 
 This module allows you to manage `Return Merchandise Authorization (RMA)
 <https://en.wikipedia.org/wiki/Return_merchandise_authorization>`_.
@@ -137,8 +140,8 @@ Bug Tracker
 
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/rma/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -176,14 +179,14 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-.. |maintainer-ernestotejeda| image:: https://github.com/ernestotejeda.png?size=40px
-    :target: https://github.com/ernestotejeda
-    :alt: ernestotejeda
+.. |maintainer-pedrobaeza| image:: https://github.com/pedrobaeza.png?size=40px
+    :target: https://github.com/pedrobaeza
+    :alt: pedrobaeza
 
 Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-ernestotejeda| 
+|maintainer-pedrobaeza| 
 
-This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/15.0/rma>`_ project on GitHub.
+This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/16.0/rma>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 0f46d6e6..9b3d4a1d 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -1,14 +1,16 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2021-2023 Tecnativa - David Vidal
+# Copyright 2021-2023 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "15.0.1.1.3",
+    "version": "16.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
     "author": "Tecnativa, Odoo Community Association (OCA)",
-    "maintainers": ["ernestotejeda"],
+    "maintainers": ["pedrobaeza"],
     "license": "AGPL-3",
     "depends": ["stock_account"],
     "data": [
diff --git a/rma/i18n/de.po b/rma/i18n/de.po
index 29804a24..9b360b2f 100644
--- a/rma/i18n/de.po
+++ b/rma/i18n/de.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2023-04-05 07:26+0000\n"
-"Last-Translator: Nikolaus Weingartmair <nikolaus.weingartmair@grueneerde.com>"
-"\n"
+"Last-Translator: Nikolaus Weingartmair <nikolaus.weingartmair@grueneerde."
+"com>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.14.1\n"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
@@ -29,6 +30,7 @@ msgid "(object._get_report_base_filename())"
 msgstr "(object._get_report_base_filename())"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -42,55 +44,26 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Here is the RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    from\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    .\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-"                <p style=\"box-sizing:border-box;margin: 0px; padding: 0px; "
-"font-size: 13px;\">\n"
-"                    Sehr geehrte/r\n"
-"                    <t t-out=\"object.partner_id.name\" data-oe-t-inline="
-"\"true\"></t>\n"
-"                    <t t-if=\"object.partner_id.parent_id\" data-oe-t-group-"
-"active=\"true\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\" data-"
-"oe-t-inline=\"true\"></t>\n"
-"                    </t>\n"
-"                    <br>\n"
-"                    <br>\n"
-"                    Hiermit übermitteln wie Ihnen unseren RMA Auftrag\n"
-"                    <strong style=\"box-sizing:border-box;font-weight:500;\">"
-"\n"
-"                        <t t-out=\"object.name\" data-oe-t-inline=\"true\""
-"></t>\n"
-"                    </strong>\n"
-"                    von\n"
-"                    <t t-out=\"object.company_id.name\" data-oe-t-inline="
-"\"true\"></t>\n"
-"                    .\n"
-"                    <br>\n"
-"                    <br>\n"
-"                    Zögern Sie nicht uns zu kontaktieren.\n"
-"                </p>\n"
-"            </div>\n"
-"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
@@ -98,49 +71,26 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    The products for your RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    from\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    have been received in our warehouse.\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"                    Sehr geehrte/r\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
-"                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
-"                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
-"Die Produkte für ihren RMA\n"
-"                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
-"                    </strong>\n"
-"                    von\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
-"wurden in unserem Lager erfolgreich entgegen genommen.\n"
-"                    <br/>\n"
-"                    <br/>\n"
-"                    Zögern Sie nicht uns bei weiteren Fragen erneut zu "
-"kontaktieren\n"
-"                </p>\n"
-"            </div>\n"
-"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
@@ -148,61 +98,33 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    You've succesfully placed your RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    on\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
-"                    . Our team will check it and will validate it as soon as possible.\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    . Our team will check it and will validate it as soon as "
+"possible.\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-"                <p style=\"box-sizing:border-box;margin: 0px; padding: 0px; "
-"font-size: 13px;\">\n"
-"                    Sehr geehrte/r\n"
-"                    <t t-out=\"object.partner_id.name\" data-oe-t-inline="
-"\"true\"></t>\n"
-"                    <t t-if=\"object.partner_id.parent_id\" data-oe-t-group-"
-"active=\"true\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\" data-"
-"oe-t-inline=\"true\"></t>\n"
-"                    </t>\n"
-"                    <br>\n"
-"                    <br>\n"
-"                    Sie haben erfolgreich ihren Reklamationsauftrag "
-"eingebracht.\n"
-"                    <strong style=\"box-sizing:border-box;font-weight:500;\">"
-"\n"
-"                        <t t-out=\"object.name\" data-oe-t-inline=\"true\""
-"></t>\n"
-"                    </strong>\n"
-"                    für\n"
-"                    <t t-out=\"object.company_id.name\" data-oe-t-inline="
-"\"true\"></t>\n"
-"                    . Unser Team wird die Anfrage bearbeiten uns sich so "
-"bald wie möglich bei Ihnen melden.\n"
-"                    <br>\n"
-"                    <br>\n"
-"Zögern Sie nicht uns bei weiteren Fragen erneut zu kontaktieren\n"
-"                </p>\n"
-"            </div>\n"
-"        "
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-msgid "<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\"Download\"/>"
+msgid ""
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
+"\"Download\"/>"
 msgstr ""
 "<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
 "\"Download\"/>"
@@ -228,8 +150,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\""
-" title=\"Download\"/>"
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 msgstr ""
 "<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
 "title=\"Download\"/>"
@@ -237,8 +159,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" "
-"title=\"Download\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
+"\"Download\"/>"
 msgstr ""
 "<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
 "\"Download\"/>"
@@ -247,13 +169,14 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
 "<span class=\"badge badge-danger label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-times\"/>\n"
+"                                            <i class=\"fa fa-fw fa-times\"/"
+">\n"
 "                                            Cancelled\n"
 "                                        </span>"
 msgstr ""
 "<span class=\"badge badge-danger label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-times\"/>"
-"\n"
+"                                            <i class=\"fa fa-fw fa-times\"/"
+">\n"
 "                                            Storniert\n"
 "                                        </span>"
 
@@ -274,13 +197,14 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
 "<span class=\"badge badge-info label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
 "                                            Preparation\n"
 "                                        </span>"
 msgstr ""
 "<span class=\"badge badge-info label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-clock-o\""
-"/>\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
 "                                            in Vorbereitung\n"
 "                                        </span>"
 
@@ -301,13 +225,14 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
 "<span class=\"badge badge-success label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
 "                                            Shipped\n"
 "                                        </span>"
 msgstr ""
 "<span class=\"badge badge-success label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-truck\"/>"
-"\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
 "                                            Versendet\n"
 "                                        </span>"
 
@@ -328,13 +253,14 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
 "<span class=\"badge badge-warning label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
 "                                            Partially Available\n"
 "                                        </span>"
 msgstr ""
 "<span class=\"badge badge-warning label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-clock-o\""
-"/>\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
 "                                            nur teilweise verfügbar\n"
 "                                        </span>"
 
@@ -764,6 +690,7 @@ msgid "Custom Bounced Message"
 msgstr "Benutzerdefinierte Bounce Message"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
@@ -776,6 +703,7 @@ msgid "Customer Portal URL"
 msgstr "Kundenportal URL"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -915,6 +843,7 @@ msgstr ""
 "aufgegeben wird"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
@@ -1020,8 +949,8 @@ msgstr "ID"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_thread_id
 msgid ""
-"ID of the parent record holding the alias (example: project holding the task"
-" creation alias)"
+"ID of the parent record holding the alias (example: project holding the task "
+"creation alias)"
 msgstr ""
 "ID des übergeordneten Datensatzes, der den Alias enthält (Beispiel: Projekt "
 "enthält den Alias für die Aufgabenerstellung)"
@@ -1038,9 +967,7 @@ msgstr "Symbol zur Anzeige einer Ausnahmeaktivität."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
-#: model:ir.model.fields,help:rma.field_rma__message_unread
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 "Wenn diese Option aktiviert ist, erfordern neue Nachrichten Ihre "
@@ -1048,9 +975,7 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
-#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
-#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 "Wenn diese Option aktiviert ist, weisen einige Nachrichten einen "
@@ -1075,6 +1000,7 @@ msgstr ""
 "ausblenden, ohne es zu entfernen."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
@@ -1218,6 +1144,7 @@ msgid "My Activity Deadline"
 msgstr "Meine Aktivitätsfrist"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
@@ -1227,8 +1154,8 @@ msgid "Name"
 msgstr "Name"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
-#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
+#. odoo-python
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
 msgstr "Neu"
@@ -1249,12 +1176,14 @@ msgid "Next Activity Type"
 msgstr "Nächster Aktivitätstyp"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Keiner der ausgewählten RMAs kann einen Austausch durchführen."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
@@ -1280,8 +1209,8 @@ msgstr "Anzahl der Fehler"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr "Anzahl der Nachrichten, die eine Aktion erfordern"
+msgid "Number of messages requiring action"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
@@ -1289,12 +1218,6 @@ msgstr "Anzahl der Nachrichten, die eine Aktion erfordern"
 msgid "Number of messages with delivery error"
 msgstr "Anzahl der Nachrichten mit Zustellfehler"
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread_counter
-msgid "Number of unread messages"
-msgstr "Anzahl der ungelesenen Nachrichten"
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
@@ -1344,8 +1267,8 @@ msgstr "Thread-ID des übergeordneten Datensatzes"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_model_id
 msgid ""
-"Parent model holding the alias. The model holding the alias reference is not"
-" necessarily the model given by alias_model_id (example: project "
+"Parent model holding the alias. The model holding the alias reference is not "
+"necessarily the model given by alias_model_id (example: project "
 "(parent_model) and task (model))"
 msgstr ""
 "Übergeordnetes Modell mit dem Alias. Das Modell, das die Alias-Referenz "
@@ -1363,7 +1286,8 @@ msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
 "- partners: only authenticated partners\n"
-"- followers: only followers of the related document or members of following channels\n"
+"- followers: only followers of the related document or members of following "
+"channels\n"
 msgstr ""
 "Richtlinie zum Posten einer Nachricht im Dokument über das Mailgateway.\n"
 "- Jeder: Jeder kann Posten\n"
@@ -1414,6 +1338,7 @@ msgid "Quantity"
 msgstr "Menge"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_delivery.py:0
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
@@ -1426,6 +1351,7 @@ msgid "Quantity to extract"
 msgstr "Zu extrahierende Menge"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1460,6 +1386,7 @@ msgid "RMA #"
 msgstr "RMA #"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
@@ -1481,6 +1408,7 @@ msgid "RMA Deadline"
 msgstr "RMA-Frist"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
@@ -1568,6 +1496,7 @@ msgid "RMA Receipt Notification"
 msgstr "RMA-Empfangsbenachrichtigung"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
@@ -1711,6 +1640,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referenz des Dokuments, das diese RMA erstellt hat."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1767,20 +1697,22 @@ msgid "Replaced"
 msgstr "Ersetzt"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
-"id=\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-"
-"model=\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>)"
-" has been created."
+"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+"\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) has "
+"been created."
 msgstr ""
-"Ersatz: Buchung <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\""
-"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-model=\"stock."
-"picking\" data-oe-id=\"%(picking_id)d\">%(picking_name)s</a>) wurde "
+"Ersatz: Buchung <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+"\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\">%(picking_name)s</a>) wurde "
 "erstellt.."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1805,6 +1737,7 @@ msgid "Requested operation"
 msgstr "Angeforderter Vorgang"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
@@ -1821,6 +1754,11 @@ msgstr "Verantwortlich"
 msgid "Responsible User"
 msgstr "Verantwortlicher Benutzer"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
+msgid "Return Location"
+msgstr ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1834,14 +1772,15 @@ msgid "Return to customer"
 msgstr "Zurück zum Kunden"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
-"id=\"%(id)d\">%(name)s</a> has been created."
+"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> has been created."
 msgstr ""
-"Rückgabe: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\""
-">%(name)s</a> wurde erstellt."
+"Rückgabe: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d"
+"\">%(name)s</a> wurde erstellt."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1859,10 +1798,9 @@ msgid "Rma Count"
 msgstr "Anzahl RMA"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr "SMS-Zustellungsfehler"
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
+msgid "Rma Location"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
@@ -1932,12 +1870,14 @@ msgid "Sequence"
 msgstr "Sequenz"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr "Reihenfolge RMA ein"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
@@ -1980,11 +1920,12 @@ msgid "Split RMA"
 msgstr "Geteilter RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-"
-"id=\"%(id)d\">%(name)s</a> has been created."
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
+"a> has been created."
 msgstr ""
 "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
 "a> wurde erstellt."
@@ -1996,6 +1937,7 @@ msgid "State"
 msgstr "Status"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
@@ -2071,9 +2013,9 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
 msgid ""
-"The model (Odoo Document Kind) to which this alias corresponds. Any incoming"
-" email that does not reply to an existing record will cause the creation of "
-"a new record of this model (e.g. a Project Task)"
+"The model (Odoo Document Kind) to which this alias corresponds. Any incoming "
+"email that does not reply to an existing record will cause the creation of a "
+"new record of this model (e.g. a Project Task)"
 msgstr ""
 "Das Modell (Art des Odoo-Dokuments), dem dieser Alias entspricht. Jede "
 "eingehende E-Mail, die nicht auf einen vorhandenen Datensatz antwortet, "
@@ -2086,8 +2028,8 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
 msgstr ""
-"Der Name des E-Mail-Alias, z. „Jobs“, wenn Sie E-Mails für <jobs@"
-"example.odoo.com> abfangen möchten"
+"Der Name des E-Mail-Alias, z. „Jobs“, wenn Sie E-Mails für <jobs@example."
+"odoo.com> abfangen möchten"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
@@ -2104,6 +2046,7 @@ msgstr ""
 "Adresse gefunden wird."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_move.py:0
 #, python-format
 msgid ""
@@ -2115,6 +2058,7 @@ msgstr ""
 "(%(name)s) verknüpft ist."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
@@ -2126,28 +2070,32 @@ msgid "The tag is visible in the portal view"
 msgstr "Das Tag ist in der Portalansicht sichtbar"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/account_move.py:0
 #, python-format
 msgid ""
-"There is at least one invoice lines whose quantity is less than the quantity"
-" specified in its linked RMA."
+"There is at least one invoice lines whose quantity is less than the quantity "
+"specified in its linked RMA."
 msgstr ""
 "Es gibt mindestens einen Rechnungsposten, dessen Menge geringer ist als die "
 "Menge, die in der verknüpften RMA angegeben ist."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Diese RMA kann nicht aufgeteilt werden."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Diese RMA kann keinen Ersatz leisten."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
@@ -2195,18 +2143,6 @@ msgstr "Maßeinheit"
 msgid "Unlock"
 msgstr "Freischalten"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread
-msgid "Unread Messages"
-msgstr "ungelesene Nachrichten"
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr "Zähler für ungelesene Nachrichten"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
@@ -2222,6 +2158,11 @@ msgstr "UoM (ME)"
 msgid "Urgent"
 msgstr "Dringend"
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "User"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
@@ -2232,11 +2173,6 @@ msgstr "Benutzer: Alle Dokumente"
 msgid "User: Own Documents Only"
 msgstr "Benutzer: Nur eigene Dokumente"
 
-#. module: rma
-#: model:ir.model,name:rma.model_res_users
-msgid "Users"
-msgstr "Benutzer"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2301,15 +2237,14 @@ msgstr ""
 msgid ""
 "When the RMA products are received, send an automatic information email."
 msgstr ""
-"Senden Sie nach Erhalt der RMA-Produkte eine automatische "
-"Informations-E-Mail."
+"Senden Sie nach Erhalt der RMA-Produkte eine automatische Informations-E-"
+"Mail."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_receipt_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_receipt_confirmation
 msgid ""
-"When the RMA receipt is confirmed, send a confirmation email to the "
-"customer."
+"When the RMA receipt is confirmed, send a confirmation email to the customer."
 msgstr ""
 "Wenn der RMA-Eingang bestätigt ist, senden Sie eine Bestätigungs-E-Mail an "
 "den Kunden."
@@ -2324,6 +2259,7 @@ msgstr ""
 "Kunden."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
@@ -2331,6 +2267,7 @@ msgstr ""
 "RMAs, die sich nicht im Entwurfsstatus befinden, können nicht gelöscht werden"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
@@ -2389,5 +2326,189 @@ msgid ""
 "{{object.company_id.name}} Your RMA has been succesfully created (Ref "
 "{{object.name or 'n/a' }})"
 msgstr ""
-"{{object.company_id.name}} Ihre RMA wurde erfolgreich erstellt (Ref {{"
-"object.name or 'n/a' }})"
+"{{object.company_id.name}} Ihre RMA wurde erfolgreich erstellt (Ref {{object."
+"name or 'n/a' }})"
+
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "                    Dear\n"
+#~ "                    <t t-out=\"object.partner_id.name\"/>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+#~ "                    </t>\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Here is the RMA\n"
+#~ "                    <strong>\n"
+#~ "                        <t t-out=\"object.name\"/>\n"
+#~ "                    </strong>\n"
+#~ "                    from\n"
+#~ "                    <t t-out=\"object.company_id.name\"/>\n"
+#~ "                    .\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Do not hesitate to contact us if you have any "
+#~ "question.\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"box-sizing:border-box;margin: 0px; padding: "
+#~ "0px; font-size: 13px;\">\n"
+#~ "                    Sehr geehrte/r\n"
+#~ "                    <t t-out=\"object.partner_id.name\" data-oe-t-inline="
+#~ "\"true\"></t>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\" data-oe-t-"
+#~ "group-active=\"true\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\" "
+#~ "data-oe-t-inline=\"true\"></t>\n"
+#~ "                    </t>\n"
+#~ "                    <br>\n"
+#~ "                    <br>\n"
+#~ "                    Hiermit übermitteln wie Ihnen unseren RMA Auftrag\n"
+#~ "                    <strong style=\"box-sizing:border-box;font-weight:500;"
+#~ "\">\n"
+#~ "                        <t t-out=\"object.name\" data-oe-t-inline=\"true"
+#~ "\"></t>\n"
+#~ "                    </strong>\n"
+#~ "                    von\n"
+#~ "                    <t t-out=\"object.company_id.name\" data-oe-t-inline="
+#~ "\"true\"></t>\n"
+#~ "                    .\n"
+#~ "                    <br>\n"
+#~ "                    <br>\n"
+#~ "                    Zögern Sie nicht uns zu kontaktieren.\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "                    Dear\n"
+#~ "                    <t t-out=\"object.partner_id.name\"/>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+#~ "                    </t>\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    The products for your RMA\n"
+#~ "                    <strong>\n"
+#~ "                        <t t-out=\"object.name\"/>\n"
+#~ "                    </strong>\n"
+#~ "                    from\n"
+#~ "                    <t t-out=\"object.company_id.name\"/>\n"
+#~ "                    have been received in our warehouse.\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Do not hesitate to contact us if you have any "
+#~ "question.\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "                    Sehr geehrte/r\n"
+#~ "                    <t t-out=\"object.partner_id.name\"/>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+#~ "                    </t>\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "Die Produkte für ihren RMA\n"
+#~ "                    <strong>\n"
+#~ "                        <t t-out=\"object.name\"/>\n"
+#~ "                    </strong>\n"
+#~ "                    von\n"
+#~ "                    <t t-out=\"object.company_id.name\"/>\n"
+#~ "wurden in unserem Lager erfolgreich entgegen genommen.\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Zögern Sie nicht uns bei weiteren Fragen erneut zu "
+#~ "kontaktieren\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "                    Dear\n"
+#~ "                    <t t-out=\"object.partner_id.name\"/>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+#~ "                    </t>\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    You've succesfully placed your RMA\n"
+#~ "                    <strong>\n"
+#~ "                        <t t-out=\"object.name\"/>\n"
+#~ "                    </strong>\n"
+#~ "                    on\n"
+#~ "                    <t t-out=\"object.company_id.name\"/>\n"
+#~ "                    . Our team will check it and will validate it as soon "
+#~ "as possible.\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Do not hesitate to contact us if you have any "
+#~ "question.\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"box-sizing:border-box;margin: 0px; padding: "
+#~ "0px; font-size: 13px;\">\n"
+#~ "                    Sehr geehrte/r\n"
+#~ "                    <t t-out=\"object.partner_id.name\" data-oe-t-inline="
+#~ "\"true\"></t>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\" data-oe-t-"
+#~ "group-active=\"true\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\" "
+#~ "data-oe-t-inline=\"true\"></t>\n"
+#~ "                    </t>\n"
+#~ "                    <br>\n"
+#~ "                    <br>\n"
+#~ "                    Sie haben erfolgreich ihren Reklamationsauftrag "
+#~ "eingebracht.\n"
+#~ "                    <strong style=\"box-sizing:border-box;font-weight:500;"
+#~ "\">\n"
+#~ "                        <t t-out=\"object.name\" data-oe-t-inline=\"true"
+#~ "\"></t>\n"
+#~ "                    </strong>\n"
+#~ "                    für\n"
+#~ "                    <t t-out=\"object.company_id.name\" data-oe-t-inline="
+#~ "\"true\"></t>\n"
+#~ "                    . Unser Team wird die Anfrage bearbeiten uns sich so "
+#~ "bald wie möglich bei Ihnen melden.\n"
+#~ "                    <br>\n"
+#~ "                    <br>\n"
+#~ "Zögern Sie nicht uns bei weiteren Fragen erneut zu kontaktieren\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+
+#~ msgid "Number of messages which requires an action"
+#~ msgstr "Anzahl der Nachrichten, die eine Aktion erfordern"
+
+#~ msgid "Number of unread messages"
+#~ msgstr "Anzahl der ungelesenen Nachrichten"
+
+#~ msgid "SMS Delivery error"
+#~ msgstr "SMS-Zustellungsfehler"
+
+#~ msgid "Unread Messages"
+#~ msgstr "ungelesene Nachrichten"
+
+#~ msgid "Unread Messages Counter"
+#~ msgstr "Zähler für ungelesene Nachrichten"
+
+#~ msgid "Users"
+#~ msgstr "Benutzer"
diff --git a/rma/i18n/de_AT.po b/rma/i18n/de_AT.po
index 3ee7866b..0c6573e9 100644
--- a/rma/i18n/de_AT.po
+++ b/rma/i18n/de_AT.po
@@ -15,6 +15,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
@@ -26,6 +27,7 @@ msgid "(object._get_report_base_filename())"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -38,21 +40,21 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Here is the RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    from\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    .\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
@@ -65,21 +67,21 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    The products for your RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    from\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    have been received in our warehouse.\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
@@ -92,21 +94,22 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    You've succesfully placed your RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    on\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
-"                    . Our team will check it and will validate it as soon as possible.\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    . Our team will check it and will validate it as soon as "
+"possible.\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
@@ -115,7 +118,9 @@ msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-msgid "<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\"Download\"/>"
+msgid ""
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
+"\"Download\"/>"
 msgstr ""
 
 #. module: rma
@@ -135,22 +140,23 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\""
-" title=\"Download\"/>"
-msgstr ""
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-msgid ""
-"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" "
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
 "title=\"Download\"/>"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
+"\"Download\"/>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
 "<span class=\"badge badge-danger label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-times\"/>\n"
+"                                            <i class=\"fa fa-fw fa-times\"/"
+">\n"
 "                                            Cancelled\n"
 "                                        </span>"
 msgstr ""
@@ -168,7 +174,8 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
 "<span class=\"badge badge-info label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
 "                                            Preparation\n"
 "                                        </span>"
 msgstr ""
@@ -186,7 +193,8 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
 "<span class=\"badge badge-success label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
 "                                            Shipped\n"
 "                                        </span>"
 msgstr ""
@@ -204,7 +212,8 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
 "<span class=\"badge badge-warning label-text-align\">\n"
-"                                            <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
 "                                            Partially Available\n"
 "                                        </span>"
 msgstr ""
@@ -623,6 +632,7 @@ msgid "Custom Bounced Message"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
@@ -635,6 +645,7 @@ msgid "Customer Portal URL"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -771,6 +782,7 @@ msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
@@ -876,8 +888,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_thread_id
 msgid ""
-"ID of the parent record holding the alias (example: project holding the task"
-" creation alias)"
+"ID of the parent record holding the alias (example: project holding the task "
+"creation alias)"
 msgstr ""
 
 #. module: rma
@@ -892,17 +904,13 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
-#: model:ir.model.fields,help:rma.field_rma__message_unread
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
-#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
-#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -921,6 +929,7 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
@@ -1060,6 +1069,7 @@ msgid "My Activity Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
@@ -1069,8 +1079,8 @@ msgid "Name"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
-#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
+#. odoo-python
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
 msgstr ""
@@ -1091,12 +1101,14 @@ msgid "Next Activity Type"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
@@ -1122,7 +1134,7 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction_counter
-msgid "Number of messages which requires an action"
+msgid "Number of messages requiring action"
 msgstr ""
 
 #. module: rma
@@ -1131,12 +1143,6 @@ msgstr ""
 msgid "Number of messages with delivery error"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
@@ -1183,8 +1189,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_model_id
 msgid ""
-"Parent model holding the alias. The model holding the alias reference is not"
-" necessarily the model given by alias_model_id (example: project "
+"Parent model holding the alias. The model holding the alias reference is not "
+"necessarily the model given by alias_model_id (example: project "
 "(parent_model) and task (model))"
 msgstr ""
 
@@ -1199,7 +1205,8 @@ msgid ""
 "Policy to post a message on the document using the mailgateway.\n"
 "- everyone: everyone can post\n"
 "- partners: only authenticated partners\n"
-"- followers: only followers of the related document or members of following channels\n"
+"- followers: only followers of the related document or members of following "
+"channels\n"
 msgstr ""
 
 #. module: rma
@@ -1245,6 +1252,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_delivery.py:0
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
@@ -1257,6 +1265,7 @@ msgid "Quantity to extract"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1289,6 +1298,7 @@ msgid "RMA #"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
@@ -1310,6 +1320,7 @@ msgid "RMA Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
@@ -1397,6 +1408,7 @@ msgid "RMA Receipt Notification"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
@@ -1540,6 +1552,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1596,16 +1609,18 @@ msgid "Replaced"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
-"id=\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-"
-"model=\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>)"
-" has been created."
+"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+"\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) has "
+"been created."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1626,6 +1641,7 @@ msgid "Requested operation"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
@@ -1642,6 +1658,11 @@ msgstr ""
 msgid "Responsible User"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
+msgid "Return Location"
+msgstr ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1655,11 +1676,12 @@ msgid "Return to customer"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
-"id=\"%(id)d\">%(name)s</a> has been created."
+"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1678,9 +1700,8 @@ msgid "Rma Count"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error
-msgid "SMS Delivery error"
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
+msgid "Rma Location"
 msgstr ""
 
 #. module: rma
@@ -1747,12 +1768,14 @@ msgid "Sequence"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
@@ -1795,11 +1818,12 @@ msgid "Split RMA"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-"
-"id=\"%(id)d\">%(name)s</a> has been created."
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
+"a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1809,6 +1833,7 @@ msgid "State"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
@@ -1878,9 +1903,9 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
 msgid ""
-"The model (Odoo Document Kind) to which this alias corresponds. Any incoming"
-" email that does not reply to an existing record will cause the creation of "
-"a new record of this model (e.g. a Project Task)"
+"The model (Odoo Document Kind) to which this alias corresponds. Any incoming "
+"email that does not reply to an existing record will cause the creation of a "
+"new record of this model (e.g. a Project Task)"
 msgstr ""
 
 #. module: rma
@@ -1900,6 +1925,7 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_move.py:0
 #, python-format
 msgid ""
@@ -1908,6 +1934,7 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
@@ -1919,26 +1946,30 @@ msgid "The tag is visible in the portal view"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/account_move.py:0
 #, python-format
 msgid ""
-"There is at least one invoice lines whose quantity is less than the quantity"
-" specified in its linked RMA."
+"There is at least one invoice lines whose quantity is less than the quantity "
+"specified in its linked RMA."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
@@ -1986,18 +2017,6 @@ msgstr ""
 msgid "Unlock"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
@@ -2013,6 +2032,11 @@ msgstr ""
 msgid "Urgent"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "User"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
@@ -2023,11 +2047,6 @@ msgstr ""
 msgid "User: Own Documents Only"
 msgstr ""
 
-#. module: rma
-#: model:ir.model,name:rma.model_res_users
-msgid "Users"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2092,8 +2111,7 @@ msgstr ""
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_receipt_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_receipt_confirmation
 msgid ""
-"When the RMA receipt is confirmed, send a confirmation email to the "
-"customer."
+"When the RMA receipt is confirmed, send a confirmation email to the customer."
 msgstr ""
 
 #. module: rma
@@ -2104,12 +2122,14 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index b595ad86..55dac8fd 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -18,6 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.17\n"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
@@ -29,14 +30,14 @@ msgid "(object._get_report_base_filename())"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, fuzzy, python-format
-#| msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
 msgid ""
 "<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
-"<b>Asunto del correo electrónico:</b> %(subject)s<br/><br/><b>Cuerpo del correo "
-"electrónico:</b><br/>%(body)s"
+"<b>Asunto del correo electrónico:</b> %(subject)s<br/><br/><b>Cuerpo del "
+"correo electrónico:</b><br/>%(body)s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
@@ -44,49 +45,26 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Here is the RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    from\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    .\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"                    Estimado/a\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
-"                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
-"                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
-"                    Aquí tiene el RMA\n"
-"                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
-"                    </strong>\n"
-"                    desde\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
-"                    .\n"
-"                    <br/>\n"
-"                    <br/>\n"
-"                    No dude en ponerse en contacto con nosotros si tiene "
-"alguna pregunta.\n"
-"                </p>\n"
-"            </div>\n"
-"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
@@ -94,49 +72,26 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    The products for your RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    from\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    have been received in our warehouse.\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"                    Estimado/a\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
-"                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
-"                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
-"                    Los productos de su RMA\n"
-"                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
-"                    </strong>\n"
-"                    desde\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
-"                    han sido recibidos en nuestro almacén.\n"
-"                    <br/>\n"
-"                    <br/>\n"
-"                    Póngase en contacto con nosotros para cualquier duda al "
-"respecto.\n"
-"                </p>\n"
-"            </div>\n"
-"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
@@ -144,51 +99,27 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    You've succesfully placed your RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    on\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    . Our team will check it and will validate it as soon as "
 "possible.\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"                    Estimado/a\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
-"                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
-"                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
-"                    Ha solicitado con éxito su RMA\n"
-"                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
-"                    </strong>\n"
-"                    en\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
-"                    . Nuestro equipo la comprobará y validará tan pronto "
-"como sea posible.\n"
-"                    <br/>\n"
-"                    <br/>\n"
-"                    Póngase en contacto con nosotros para cualquier duda al "
-"respecto.\n"
-"                </p>\n"
-"            </div>\n"
-"        "
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -234,38 +165,78 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Cancelled</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/"
+">\n"
+"                                            Cancelled\n"
+"                                        </span>"
 msgstr ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/>Cancelado</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparation</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Cancelled\n"
+"                                </span>"
 msgstr ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/>Preparación</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Shipped</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Preparation\n"
+"                                        </span>"
 msgstr ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Enviado</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Partially Available</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparation\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
+"                                            Shipped\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Shipped\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Partially Available\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Partially Available\n"
+"                                </span>"
 msgstr ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/>Disponible parcialmente</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -676,6 +647,7 @@ msgid "Custom Bounced Message"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
@@ -688,6 +660,7 @@ msgid "Customer Portal URL"
 msgstr "URL del portal de cliente"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -826,6 +799,7 @@ msgstr ""
 "portal"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
@@ -951,17 +925,13 @@ msgstr "Icono para indicar una actividad de excepción."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
-#: model:ir.model.fields,help:rma.field_rma__message_unread
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
 msgid "If checked, new messages require your attention."
 msgstr "Si está marcado, hay nuevos mensajes que requieren su atención."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
-#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
-#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr "Si se encuentra marcado, algunos mensajes tienen error de envío."
 
@@ -982,6 +952,7 @@ msgstr ""
 "sin eliminarlo."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
@@ -1125,6 +1096,7 @@ msgid "My Activity Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
@@ -1134,6 +1106,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
@@ -1155,12 +1128,14 @@ msgid "Next Activity Type"
 msgstr "Siguiente tipo de actividad"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Ninguno de los RMAs seleccionados puede realizar un reemplazo."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
@@ -1186,8 +1161,8 @@ msgstr "Número de errores"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr "Número de mensajes que requieren una acción"
+msgid "Number of messages requiring action"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
@@ -1195,12 +1170,6 @@ msgstr "Número de mensajes que requieren una acción"
 msgid "Number of messages with delivery error"
 msgstr "Número de mensajes con error de envío"
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread_counter
-msgid "Number of unread messages"
-msgstr "Número de mensajes no leidos"
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
@@ -1321,6 +1290,7 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_delivery.py:0
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
@@ -1333,6 +1303,7 @@ msgid "Quantity to extract"
 msgstr "Cantidad a extraer"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1367,6 +1338,7 @@ msgid "RMA #"
 msgstr "RMA nº"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
@@ -1388,6 +1360,7 @@ msgid "RMA Deadline"
 msgstr "RMA fecha límite"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
@@ -1475,6 +1448,7 @@ msgid "RMA Receipt Notification"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
@@ -1619,6 +1593,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referencia al documento que generó este RMA."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1675,6 +1650,7 @@ msgid "Replaced"
 msgstr "Reemplazado"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1689,6 +1665,7 @@ msgstr ""
 "ha sido creado."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1713,6 +1690,7 @@ msgid "Requested operation"
 msgstr "Operación solicitada"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
@@ -1729,6 +1707,11 @@ msgstr "Responsable"
 msgid "Responsible User"
 msgstr "Usuario responsable"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
+msgid "Return Location"
+msgstr ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1742,6 +1725,7 @@ msgid "Return to customer"
 msgstr "Devolver al cliente"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1767,10 +1751,9 @@ msgid "Rma Count"
 msgstr "Cantidad de RMAs"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr "Error de Envío de Mensaje"
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
+msgid "Rma Location"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
@@ -1836,12 +1819,14 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr "Secuencia de recepción de RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
@@ -1884,6 +1869,7 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1900,6 +1886,7 @@ msgid "State"
 msgstr "Estado"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
@@ -2005,6 +1992,7 @@ msgstr ""
 "dirección."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_move.py:0
 #, python-format
 msgid ""
@@ -2015,6 +2003,7 @@ msgstr ""
 "inicial porque el movimiento está enlazado a un RMA (%(name)s)."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
@@ -2026,6 +2015,7 @@ msgid "The tag is visible in the portal view"
 msgstr "La etiqueta es visible en la vista de portal"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/account_move.py:0
 #, python-format
 msgid ""
@@ -2036,18 +2026,21 @@ msgstr ""
 "cantidad especificada en el RMA asociado."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Este RMA no puede ser dividido."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Este RMA no puede realizar un reemplazo."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
@@ -2095,18 +2088,6 @@ msgstr "Unidad de Medida"
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread
-msgid "Unread Messages"
-msgstr "Mensajes por leer"
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr "Contador de mensajes sin leer"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
@@ -2122,6 +2103,11 @@ msgstr "UdM"
 msgid "Urgent"
 msgstr "Urgente"
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "User"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
@@ -2132,11 +2118,6 @@ msgstr "Usuario: Mostrar todos los documentos"
 msgid "User: Own Documents Only"
 msgstr "Usuario: Solo mostrar documentos propios"
 
-#. module: rma
-#: model:ir.model,name:rma.model_res_users
-msgid "Users"
-msgstr "Usuarios"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2212,12 +2193,14 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr "No puede eliminar RMAs que no estén en estado borrador"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
@@ -2278,5 +2261,206 @@ msgstr ""
 "{{object.company_id.name}} Su RMA se ha creado con éxito (Ref {{object.name "
 "or 'n/a' }})"
 
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "                    Dear\n"
+#~ "                    <t t-out=\"object.partner_id.name\"/>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+#~ "                    </t>\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Here is the RMA\n"
+#~ "                    <strong>\n"
+#~ "                        <t t-out=\"object.name\"/>\n"
+#~ "                    </strong>\n"
+#~ "                    from\n"
+#~ "                    <t t-out=\"object.company_id.name\"/>\n"
+#~ "                    .\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Do not hesitate to contact us if you have any "
+#~ "question.\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "                    Estimado/a\n"
+#~ "                    <t t-out=\"object.partner_id.name\"/>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+#~ "                    </t>\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Aquí tiene el RMA\n"
+#~ "                    <strong>\n"
+#~ "                        <t t-out=\"object.name\"/>\n"
+#~ "                    </strong>\n"
+#~ "                    desde\n"
+#~ "                    <t t-out=\"object.company_id.name\"/>\n"
+#~ "                    .\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    No dude en ponerse en contacto con nosotros si tiene "
+#~ "alguna pregunta.\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "                    Dear\n"
+#~ "                    <t t-out=\"object.partner_id.name\"/>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+#~ "                    </t>\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    The products for your RMA\n"
+#~ "                    <strong>\n"
+#~ "                        <t t-out=\"object.name\"/>\n"
+#~ "                    </strong>\n"
+#~ "                    from\n"
+#~ "                    <t t-out=\"object.company_id.name\"/>\n"
+#~ "                    have been received in our warehouse.\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Do not hesitate to contact us if you have any "
+#~ "question.\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "                    Estimado/a\n"
+#~ "                    <t t-out=\"object.partner_id.name\"/>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+#~ "                    </t>\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Los productos de su RMA\n"
+#~ "                    <strong>\n"
+#~ "                        <t t-out=\"object.name\"/>\n"
+#~ "                    </strong>\n"
+#~ "                    desde\n"
+#~ "                    <t t-out=\"object.company_id.name\"/>\n"
+#~ "                    han sido recibidos en nuestro almacén.\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Póngase en contacto con nosotros para cualquier duda "
+#~ "al respecto.\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "                    Dear\n"
+#~ "                    <t t-out=\"object.partner_id.name\"/>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+#~ "                    </t>\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    You've succesfully placed your RMA\n"
+#~ "                    <strong>\n"
+#~ "                        <t t-out=\"object.name\"/>\n"
+#~ "                    </strong>\n"
+#~ "                    on\n"
+#~ "                    <t t-out=\"object.company_id.name\"/>\n"
+#~ "                    . Our team will check it and will validate it as soon "
+#~ "as possible.\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Do not hesitate to contact us if you have any "
+#~ "question.\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "                    Estimado/a\n"
+#~ "                    <t t-out=\"object.partner_id.name\"/>\n"
+#~ "                    <t t-if=\"object.partner_id.parent_id\">\n"
+#~ "                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+#~ "                    </t>\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Ha solicitado con éxito su RMA\n"
+#~ "                    <strong>\n"
+#~ "                        <t t-out=\"object.name\"/>\n"
+#~ "                    </strong>\n"
+#~ "                    en\n"
+#~ "                    <t t-out=\"object.company_id.name\"/>\n"
+#~ "                    . Nuestro equipo la comprobará y validará tan pronto "
+#~ "como sea posible.\n"
+#~ "                    <br/>\n"
+#~ "                    <br/>\n"
+#~ "                    Póngase en contacto con nosotros para cualquier duda "
+#~ "al respecto.\n"
+#~ "                </p>\n"
+#~ "            </div>\n"
+#~ "        "
+
+#~ msgid ""
+#~ "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-times\"/> Cancelled</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-times\"/>Cancelado</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+#~ "clock-o\"/> Preparation</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+#~ "clock-o\"/>Preparación</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-truck\"/> Shipped</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-truck\"/> Enviado</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-clock-o\"/> Partially Available</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-clock-o\"/>Disponible parcialmente</span>"
+
+#~ msgid "Number of messages which requires an action"
+#~ msgstr "Número de mensajes que requieren una acción"
+
+#~ msgid "Number of unread messages"
+#~ msgstr "Número de mensajes no leidos"
+
+#~ msgid "SMS Delivery error"
+#~ msgstr "Error de Envío de Mensaje"
+
+#~ msgid "Unread Messages"
+#~ msgstr "Mensajes por leer"
+
+#~ msgid "Unread Messages Counter"
+#~ msgstr "Contador de mensajes sin leer"
+
+#~ msgid "Users"
+#~ msgstr "Usuarios"
+
 #~ msgid "Followers (Channels)"
 #~ msgstr "Seguidores (Canales)"
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 8c248320..6dbdf82b 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -17,36 +17,7 @@ msgstr ""
 "X-Generator: Weblate 4.17\n"
 
 #. module: rma
-#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
-#: model:mail.template,report_name:rma.mail_template_rma_notification
-#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
-msgid "${(object.name or '')}"
-msgstr "${(object.name or '')}"
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_notification
-msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} RMA (Rif ${object.name or 'n/a' })"
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
-msgid ""
-"${object.company_id.name} RMA (Ref ${object.name or 'n/a' }) products "
-"received"
-msgstr ""
-"${object.company_id.name} RMA (Ref ${object.name or 'n/a' }) prodotti "
-"ricevuti"
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_draft_notification
-msgid ""
-"${object.company_id.name} Your RMA has been succesfully created (Ref "
-"${object.name or 'n/a' })"
-msgstr ""
-"${object.company_id.name} Il tuo RMA è stato creato correttamente (Ref "
-"${object.name or 'n/a' })"
-
-#. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
@@ -58,111 +29,94 @@ msgid "(object._get_report_base_filename())"
 msgstr "(object._get_report_base_filename())"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
-msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
-msgstr "<b>Soggetto E-mail:</b> %s<br/><br/><b>Corpo E-mail:</b><br/>%s"
+msgid ""
+"<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
+msgstr ""
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    Here is the RMA <strong>${object.name}</strong> from ${object.company_id."
-"name}.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Here is the RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    .\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Gentile ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    Di seguito l'RMA <strong>${object.name}</strong> da ${object.company_id."
-"name}.\n"
-"    <br/><br/>\n"
-"    Non esiti a contattarci per qualsiasi domanda.\n"
-"</p>\n"
-"            </div>\n"
-"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    The products for your RMA <strong>${object.name}</strong>\n"
-"    from ${object.company_id.name} have been received in our warehouse.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    The products for your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    have been received in our warehouse.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Gentile ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    I prodotti del suo RMA <strong>${object.name}</strong>\n"
-"    da ${object.company_id.name} sono stati ricevuti nel nostro magazzino.\n"
-"    <br/><br/>\n"
-"    Non esiti a contattarci per qualsiasi domanda.\n"
-"</p>\n"
-"</div>\n"
-"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    You've succesfully placed your RMA <strong>${object.name}</strong>\n"
-"    on ${object.company_id.name}. Our team will check it and will validate\n"
-"    it as soon as possible.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    You've succesfully placed your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    on\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    . Our team will check it and will validate it as soon as "
+"possible.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Gentile ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    ha inserito con successo il suo RMA <strong>${object.name}</strong>\n"
-"    per ${object.company_id.name}. Il nostro team lo verificherà \n"
-"    il prima possibile.\n"
-"    <br/><br/>\n"
-"    Non esiti a contattarci per qualsiasi domanda.\n"
-"</p>\n"
-"</div>\n"
-"        "
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -212,38 +166,78 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Cancelled</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/"
+">\n"
+"                                            Cancelled\n"
+"                                        </span>"
 msgstr ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Cancellato</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparation</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Cancelled\n"
+"                                </span>"
 msgstr ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparazione</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Shipped</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Preparation\n"
+"                                        </span>"
 msgstr ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Spedito</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Partially Available</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparation\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
+"                                            Shipped\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Shipped\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Partially Available\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Partially Available\n"
+"                                </span>"
 msgstr ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Parzialmente disponibile</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -657,6 +651,7 @@ msgid "Custom Bounced Message"
 msgstr "Messaggio rimbalzato personalizzato"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
@@ -669,6 +664,7 @@ msgid "Customer Portal URL"
 msgstr "URL Portale Cliente"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -700,13 +696,13 @@ msgstr "Consegna"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
-msgid "Delivered qty"
-msgstr "Quantità Consegnata"
+msgid "Delivered Qty"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered qty done"
-msgstr "Quantità consegnata fatta"
+msgid "Delivered Qty Done"
+msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -730,12 +726,6 @@ msgid "Description"
 msgstr "Descrizione"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__display_name
-#: model:ir.model.fields,field_description:rma.field_account_move_line__display_name
-#: model:ir.model.fields,field_description:rma.field_res_company__display_name
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__display_name
-#: model:ir.model.fields,field_description:rma.field_res_partner__display_name
-#: model:ir.model.fields,field_description:rma.field_res_users__display_name
 #: model:ir.model.fields,field_description:rma.field_rma__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__display_name
@@ -744,11 +734,6 @@ msgstr "Descrizione"
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_tag__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_team__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_move__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_rule__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__display_name
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
@@ -817,6 +802,7 @@ msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr "l'Email sarà inviata al cliente quando si inserisce un RMA dal portale"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
@@ -873,12 +859,6 @@ msgstr "Chiuso"
 msgid "Followers"
 msgstr "Seguito da"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_channel_ids
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_channel_ids
-msgid "Followers (Channels)"
-msgstr "Seguito da (canali)"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_partner_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_partner_ids
@@ -908,12 +888,12 @@ msgid "Group RMA returns by customer and warehouse."
 msgstr "Raggruppa resi RMA per cliente e magazzino."
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__id
-#: model:ir.model.fields,field_description:rma.field_account_move_line__id
-#: model:ir.model.fields,field_description:rma.field_res_company__id
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__id
-#: model:ir.model.fields,field_description:rma.field_res_partner__id
-#: model:ir.model.fields,field_description:rma.field_res_users__id
+#: model:ir.model.fields,field_description:rma.field_rma__has_message
+#: model:ir.model.fields,field_description:rma.field_rma_team__has_message
+msgid "Has Message"
+msgstr ""
+
+#. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__id
@@ -922,11 +902,6 @@ msgstr "Raggruppa resi RMA per cliente e magazzino."
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
 #: model:ir.model.fields,field_description:rma.field_rma_team__id
-#: model:ir.model.fields,field_description:rma.field_stock_move__id
-#: model:ir.model.fields,field_description:rma.field_stock_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_rule__id
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__id
 msgid "ID"
 msgstr "ID"
 
@@ -951,17 +926,13 @@ msgstr "Icona per indicare un'attività eccezione."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
-#: model:ir.model.fields,help:rma.field_rma__message_unread
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
 msgid "If checked, new messages require your attention."
 msgstr "Se selezionata, nuovi messaggi richiedono attenzione."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
-#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
-#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr "Se selezionata, alcuni messaggi hanno un errore di consegna."
 
@@ -984,6 +955,7 @@ msgstr ""
 "Team RMA senza rimuoverlo."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
@@ -1021,12 +993,6 @@ msgid "Journal Item"
 msgstr "Movimento contabile"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move____last_update
-#: model:ir.model.fields,field_description:rma.field_account_move_line____last_update
-#: model:ir.model.fields,field_description:rma.field_res_company____last_update
-#: model:ir.model.fields,field_description:rma.field_res_config_settings____last_update
-#: model:ir.model.fields,field_description:rma.field_res_partner____last_update
-#: model:ir.model.fields,field_description:rma.field_res_users____last_update
 #: model:ir.model.fields,field_description:rma.field_rma____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_finalization____last_update
@@ -1035,11 +1001,6 @@ msgstr "Movimento contabile"
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_tag____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_team____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_move____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_rule____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse____last_update
 msgid "Last Modified on"
 msgstr "Ultima modifica il"
 
@@ -1138,6 +1099,7 @@ msgid "My Activity Deadline"
 msgstr "Scadenza mia attività"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
@@ -1147,6 +1109,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
@@ -1168,12 +1131,14 @@ msgid "Next Activity Type"
 msgstr "Tipologia prossima attività"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Nessun RMA selezionato è adatto per una sostituzione."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
@@ -1199,8 +1164,8 @@ msgstr "Numero di errori"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr "Numero di messaggi che richiedono un'azione"
+msgid "Number of messages requiring action"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
@@ -1208,12 +1173,6 @@ msgstr "Numero di messaggi che richiedono un'azione"
 msgid "Number of messages with delivery error"
 msgstr "Numero di messaggi con errore di consegna"
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread_counter
-msgid "Number of unread messages"
-msgstr "Numero di messaggi non letti"
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
@@ -1334,6 +1293,7 @@ msgid "Quantity"
 msgstr "Quantità"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_delivery.py:0
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
@@ -1346,14 +1306,13 @@ msgid "Quantity to extract"
 msgstr "Quantità da prelevare"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Quantity to extract cannot be greater than remaining delivery quantity (%s "
-"%s)"
+"Quantity to extract cannot be greater than remaining delivery quantity "
+"(%(remaining_qty)s %(product_uom)s)"
 msgstr ""
-"La quantità da prelevare non può essere superiore alla quantità di consegna "
-"rimanente (%s %s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
@@ -1380,6 +1339,7 @@ msgid "RMA #"
 msgstr "# RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
@@ -1401,6 +1361,7 @@ msgid "RMA Deadline"
 msgstr "Scadenza RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
@@ -1411,6 +1372,11 @@ msgstr "Ordini di consegna RMA"
 msgid "RMA Delivery Wizard"
 msgstr "Wizard Consegna RMA"
 
+#. module: rma
+#: model:mail.template,name:rma.mail_template_rma_draft_notification
+msgid "RMA Draft Notification"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "RMA Finalization"
@@ -1425,7 +1391,6 @@ msgstr "Motivo Chiusura RMA"
 #: model:ir.actions.act_window,name:rma.action_rma_finalization
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_finalization_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_list
 msgid "RMA Finalization Reasons"
 msgstr "Motivi chiusura RMA"
 
@@ -1452,6 +1417,7 @@ msgstr "Chiusura manuale RMA"
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+#: model:mail.template,name:rma.mail_template_rma_notification
 msgid "RMA Notification"
 msgstr "Notifica RMA"
 
@@ -1478,6 +1444,12 @@ msgid "RMA Receipt Confirmation Email"
 msgstr "E-mail di conferma ricevuta RMA"
 
 #. module: rma
+#: model:mail.template,name:rma.mail_template_rma_receipt_notification
+msgid "RMA Receipt Notification"
+msgstr ""
+
+#. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
@@ -1503,7 +1475,6 @@ msgstr "Etichetta RMA"
 #: model:ir.model,name:rma.model_rma_tag
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_tag_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_list
 msgid "RMA Tags"
 msgstr "Etichette RMA"
 
@@ -1622,6 +1593,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Riferimento del documento che ha generato questo RMA."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1630,16 +1602,16 @@ msgstr "Riferimento del documento che ha generato questo RMA."
 msgid "Refund"
 msgstr "Rimborso"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
 msgid "Refund address for current RMA."
 msgstr "Indirizzo di rimborso per questo RMA."
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
-msgid "Refund line"
-msgstr "Riga rimborso"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
 msgid "Refunded"
@@ -1678,30 +1650,26 @@ msgid "Replaced"
 msgstr "Sostituito"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
-"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
-"\"%d\">%s</a>) has been created."
+"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+"\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) has "
+"been created."
 msgstr ""
-"Sostituzione: Il trasferimento <a href=\"#\" data-oe-model=\"stock.move\" "
-"data-oe-id=\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking"
-"\" data-oe-id=\"%d\">%s</a>) è stato creato."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
-"data-oe-id=\"%d\">%s</a><br/>Quantity %f %s<br/>This replacement did not "
-"create a new move, but one of the previously created moves was updated with "
-"this data."
+"data-oe-id=\"%(id)d\">%(name)s</a><br/>Quantity %(qty)s %(uom)s<br/>This "
+"replacement did not create a new move, but one of the previously created "
+"moves was updated with this data."
 msgstr ""
-"Sostituzione:<br/>Il prodotto<a href=\"#\" data-oe-model=\"product.product\" "
-"data-oe-id=\"%d\">%s</a><br/>Quantità%f %s<br/>Questo prodotto non ha "
-"generato un nuovo trasferimento, ma uno dei trasferimenti già creati è stato "
-"aggiornato con questi dati."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
@@ -1714,6 +1682,7 @@ msgid "Requested operation"
 msgstr "Operazione richiesta"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
@@ -1730,6 +1699,11 @@ msgstr "Responsabile"
 msgid "Responsible User"
 msgstr "Utente responsabile"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
+msgid "Return Location"
+msgstr ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1743,14 +1717,13 @@ msgid "Return to customer"
 msgstr "Rendi al cliente"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
-"a> has been created."
+"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> has been created."
 msgstr ""
-"Reso: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a> "
-"è stato creato."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1768,10 +1741,9 @@ msgid "Rma Count"
 msgstr "Conteggio Rma"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr "Errore consegna SMS"
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
+msgid "Rma Location"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
@@ -1838,12 +1810,14 @@ msgid "Sequence"
 msgstr "Sequenza"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr "Sequenza RMA in ingresso"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
@@ -1886,14 +1860,13 @@ msgid "Split RMA"
 msgstr "Dividi RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
-"created."
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
+"a> has been created."
 msgstr ""
-"Divisione: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> è "
-"stato creato."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -1902,6 +1875,7 @@ msgid "State"
 msgstr "Stato"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
@@ -2007,16 +1981,16 @@ msgstr ""
 "sistema per quell'indirizzo."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_move.py:0
 #, python-format
 msgid ""
-"The quantity done for the product '%s' must be equal to its initial demand "
-"because the stock move is linked to an RMA (%s)."
+"The quantity done for the product '%(id)s' must be equal to its initial "
+"demand because the stock move is linked to an RMA (%(name)s)."
 msgstr ""
-"La quantità completata per il prodotto '%s' deve essere uguale alla quantità "
-"iniziale perchè il movimento è legato ad un RMA (%s)."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
@@ -2028,6 +2002,7 @@ msgid "The tag is visible in the portal view"
 msgstr "L'etichetta è visibile nella vista del portale"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/account_move.py:0
 #, python-format
 msgid ""
@@ -2038,18 +2013,21 @@ msgstr ""
 "specificata nella riga dell'RMA collegato."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Questo RMA non può essere diviso."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Questo RMA non può eseguire una sostituzione."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
@@ -2097,18 +2075,6 @@ msgstr "Unità di misura"
 msgid "Unlock"
 msgstr "Sblocca"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread
-msgid "Unread Messages"
-msgstr "Messaggi non letti"
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr "Numero messaggi non letti"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
@@ -2124,6 +2090,11 @@ msgstr "UdM"
 msgid "Urgent"
 msgstr "Urgente"
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "User"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
@@ -2134,11 +2105,6 @@ msgstr "Utente: tutti i documenti"
 msgid "User: Own Documents Only"
 msgstr "Utente: solo i propri documenti"
 
-#. module: rma
-#: model:ir.model,name:rma.model_res_users
-msgid "Users"
-msgstr "Utenti"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2223,12 +2189,14 @@ msgstr ""
 "Quando la consegna è confermata, invia un'e-mail di conferma al cliente."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr "Non puoi eliminare RMA che non sono in stato \"bozza\""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
@@ -2256,3 +2224,264 @@ msgid ""
 "the user will have an access to the RMA configuration as well as statistic "
 "reports."
 msgstr "l'utente avrà accesso alla configurazione RMA e ai report statistici."
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
+#: model:mail.template,report_name:rma.mail_template_rma_notification
+#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
+msgid "{{(object.name or '')}}"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_notification
+msgid "{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }})"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
+msgid ""
+"{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) products "
+"received"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_draft_notification
+msgid ""
+"{{object.company_id.name}} Your RMA has been succesfully created (Ref "
+"{{object.name or 'n/a' }})"
+msgstr ""
+
+#~ msgid "${(object.name or '')}"
+#~ msgstr "${(object.name or '')}"
+
+#~ msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
+#~ msgstr "${object.company_id.name} RMA (Rif ${object.name or 'n/a' })"
+
+#~ msgid ""
+#~ "${object.company_id.name} RMA (Ref ${object.name or 'n/a' }) products "
+#~ "received"
+#~ msgstr ""
+#~ "${object.company_id.name} RMA (Ref ${object.name or 'n/a' }) prodotti "
+#~ "ricevuti"
+
+#~ msgid ""
+#~ "${object.company_id.name} Your RMA has been succesfully created (Ref "
+#~ "${object.name or 'n/a' })"
+#~ msgstr ""
+#~ "${object.company_id.name} Il tuo RMA è stato creato correttamente (Ref "
+#~ "${object.name or 'n/a' })"
+
+#, python-format
+#~ msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
+#~ msgstr "<b>Soggetto E-mail:</b> %s<br/><br/><b>Corpo E-mail:</b><br/>%s"
+
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "    Dear ${object.partner_id.name}\n"
+#~ "    % if object.partner_id.parent_id:\n"
+#~ "        (${object.partner_id.parent_id.name})\n"
+#~ "    % endif\n"
+#~ "    <br/><br/>\n"
+#~ "    Here is the RMA <strong>${object.name}</strong> from ${object."
+#~ "company_id.name}.\n"
+#~ "    <br/><br/>\n"
+#~ "    Do not hesitate to contact us if you have any question.\n"
+#~ "</p>\n"
+#~ "            </div>\n"
+#~ "        "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "    Gentile ${object.partner_id.name}\n"
+#~ "    % if object.partner_id.parent_id:\n"
+#~ "        (${object.partner_id.parent_id.name})\n"
+#~ "    % endif\n"
+#~ "    <br/><br/>\n"
+#~ "    Di seguito l'RMA <strong>${object.name}</strong> da ${object."
+#~ "company_id.name}.\n"
+#~ "    <br/><br/>\n"
+#~ "    Non esiti a contattarci per qualsiasi domanda.\n"
+#~ "</p>\n"
+#~ "            </div>\n"
+#~ "        "
+
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+#~ "    Dear ${object.partner_id.name}\n"
+#~ "    % if object.partner_id.parent_id:\n"
+#~ "        (${object.partner_id.parent_id.name})\n"
+#~ "    % endif\n"
+#~ "    <br/><br/>\n"
+#~ "    The products for your RMA <strong>${object.name}</strong>\n"
+#~ "    from ${object.company_id.name} have been received in our warehouse.\n"
+#~ "    <br/><br/>\n"
+#~ "    Do not hesitate to contact us if you have any question.\n"
+#~ "</p>\n"
+#~ "</div>\n"
+#~ "        "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+#~ "    Gentile ${object.partner_id.name}\n"
+#~ "    % if object.partner_id.parent_id:\n"
+#~ "        (${object.partner_id.parent_id.name})\n"
+#~ "    % endif\n"
+#~ "    <br/><br/>\n"
+#~ "    I prodotti del suo RMA <strong>${object.name}</strong>\n"
+#~ "    da ${object.company_id.name} sono stati ricevuti nel nostro "
+#~ "magazzino.\n"
+#~ "    <br/><br/>\n"
+#~ "    Non esiti a contattarci per qualsiasi domanda.\n"
+#~ "</p>\n"
+#~ "</div>\n"
+#~ "        "
+
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+#~ "    Dear ${object.partner_id.name}\n"
+#~ "    % if object.partner_id.parent_id:\n"
+#~ "        (${object.partner_id.parent_id.name})\n"
+#~ "    % endif\n"
+#~ "    <br/><br/>\n"
+#~ "    You've succesfully placed your RMA <strong>${object.name}</strong>\n"
+#~ "    on ${object.company_id.name}. Our team will check it and will "
+#~ "validate\n"
+#~ "    it as soon as possible.\n"
+#~ "    <br/><br/>\n"
+#~ "    Do not hesitate to contact us if you have any question.\n"
+#~ "</p>\n"
+#~ "</div>\n"
+#~ "        "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+#~ "    Gentile ${object.partner_id.name}\n"
+#~ "    % if object.partner_id.parent_id:\n"
+#~ "        (${object.partner_id.parent_id.name})\n"
+#~ "    % endif\n"
+#~ "    <br/><br/>\n"
+#~ "    ha inserito con successo il suo RMA <strong>${object.name}</strong>\n"
+#~ "    per ${object.company_id.name}. Il nostro team lo verificherà \n"
+#~ "    il prima possibile.\n"
+#~ "    <br/><br/>\n"
+#~ "    Non esiti a contattarci per qualsiasi domanda.\n"
+#~ "</p>\n"
+#~ "</div>\n"
+#~ "        "
+
+#~ msgid ""
+#~ "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-times\"/> Cancelled</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-times\"/> Cancellato</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+#~ "clock-o\"/> Preparation</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+#~ "clock-o\"/> Preparazione</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-truck\"/> Shipped</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-truck\"/> Spedito</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-clock-o\"/> Partially Available</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-clock-o\"/> Parzialmente disponibile</span>"
+
+#~ msgid "Delivered qty"
+#~ msgstr "Quantità Consegnata"
+
+#~ msgid "Delivered qty done"
+#~ msgstr "Quantità consegnata fatta"
+
+#~ msgid "Followers (Channels)"
+#~ msgstr "Seguito da (canali)"
+
+#~ msgid "Number of messages which requires an action"
+#~ msgstr "Numero di messaggi che richiedono un'azione"
+
+#~ msgid "Number of unread messages"
+#~ msgstr "Numero di messaggi non letti"
+
+#, python-format
+#~ msgid ""
+#~ "Quantity to extract cannot be greater than remaining delivery quantity "
+#~ "(%s %s)"
+#~ msgstr ""
+#~ "La quantità da prelevare non può essere superiore alla quantità di "
+#~ "consegna rimanente (%s %s)"
+
+#~ msgid "Refund line"
+#~ msgstr "Riga rimborso"
+
+#, python-format
+#~ msgid ""
+#~ "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+#~ "\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-"
+#~ "oe-id=\"%d\">%s</a>) has been created."
+#~ msgstr ""
+#~ "Sostituzione: Il trasferimento <a href=\"#\" data-oe-model=\"stock.move\" "
+#~ "data-oe-id=\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock."
+#~ "picking\" data-oe-id=\"%d\">%s</a>) è stato creato."
+
+#, python-format
+#~ msgid ""
+#~ "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
+#~ "data-oe-id=\"%d\">%s</a><br/>Quantity %f %s<br/>This replacement did not "
+#~ "create a new move, but one of the previously created moves was updated "
+#~ "with this data."
+#~ msgstr ""
+#~ "Sostituzione:<br/>Il prodotto<a href=\"#\" data-oe-model=\"product.product"
+#~ "\" data-oe-id=\"%d\">%s</a><br/>Quantità%f %s<br/>Questo prodotto non ha "
+#~ "generato un nuovo trasferimento, ma uno dei trasferimenti già creati è "
+#~ "stato aggiornato con questi dati."
+
+#, python-format
+#~ msgid ""
+#~ "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">"
+#~ "%s</a> has been created."
+#~ msgstr ""
+#~ "Reso: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
+#~ "a> è stato creato."
+
+#~ msgid "SMS Delivery error"
+#~ msgstr "Errore consegna SMS"
+
+#, python-format
+#~ msgid ""
+#~ "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has "
+#~ "been created."
+#~ msgstr ""
+#~ "Divisione: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> è "
+#~ "stato creato."
+
+#, python-format
+#~ msgid ""
+#~ "The quantity done for the product '%s' must be equal to its initial "
+#~ "demand because the stock move is linked to an RMA (%s)."
+#~ msgstr ""
+#~ "La quantità completata per il prodotto '%s' deve essere uguale alla "
+#~ "quantità iniziale perchè il movimento è legato ad un RMA (%s)."
+
+#~ msgid "Unread Messages"
+#~ msgstr "Messaggi non letti"
+
+#~ msgid "Unread Messages Counter"
+#~ msgstr "Numero messaggi non letti"
+
+#~ msgid "Users"
+#~ msgstr "Utenti"
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index a30dcbc3..95bea25d 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -15,32 +15,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. module: rma
-#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
-#: model:mail.template,report_name:rma.mail_template_rma_notification
-#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
-msgid "${(object.name or '')}"
-msgstr ""
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_notification
-msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
-msgid ""
-"${object.company_id.name} RMA (Ref ${object.name or 'n/a' }) products "
-"received"
-msgstr ""
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_draft_notification
-msgid ""
-"${object.company_id.name} Your RMA has been succesfully created (Ref "
-"${object.name or 'n/a' })"
-msgstr ""
-
-#. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
@@ -52,9 +27,11 @@ msgid "(object._get_report_base_filename())"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
-msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
+msgid ""
+"<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
 
 #. module: rma
@@ -62,16 +39,24 @@ msgstr ""
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    Here is the RMA <strong>${object.name}</strong> from ${object.company_id."
-"name}.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Here is the RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    .\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
@@ -80,18 +65,26 @@ msgstr ""
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    The products for your RMA <strong>${object.name}</strong>\n"
-"    from ${object.company_id.name} have been received in our warehouse.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    The products for your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    have been received in our warehouse.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -99,19 +92,27 @@ msgstr ""
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    You've succesfully placed your RMA <strong>${object.name}</strong>\n"
-"    on ${object.company_id.name}. Our team will check it and will validate\n"
-"    it as soon as possible.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    You've succesfully placed your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    on\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    . Our team will check it and will validate it as soon as "
+"possible.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -153,29 +154,77 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Cancelled</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/"
+">\n"
+"                                            Cancelled\n"
+"                                        </span>"
 msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparation</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Cancelled\n"
+"                                </span>"
 msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Shipped</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Preparation\n"
+"                                        </span>"
 msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Partially Available</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparation\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
+"                                            Shipped\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Shipped\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Partially Available\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Partially Available\n"
+"                                </span>"
 msgstr ""
 
 #. module: rma
@@ -583,6 +632,7 @@ msgid "Custom Bounced Message"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
@@ -595,6 +645,7 @@ msgid "Customer Portal URL"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -626,12 +677,12 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
-msgid "Delivered qty"
+msgid "Delivered Qty"
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered qty done"
+msgid "Delivered Qty Done"
 msgstr ""
 
 #. module: rma
@@ -656,12 +707,6 @@ msgid "Description"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__display_name
-#: model:ir.model.fields,field_description:rma.field_account_move_line__display_name
-#: model:ir.model.fields,field_description:rma.field_res_company__display_name
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__display_name
-#: model:ir.model.fields,field_description:rma.field_res_partner__display_name
-#: model:ir.model.fields,field_description:rma.field_res_users__display_name
 #: model:ir.model.fields,field_description:rma.field_rma__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__display_name
@@ -670,11 +715,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_tag__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_team__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_move__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_rule__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -742,6 +782,7 @@ msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
@@ -798,12 +839,6 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_channel_ids
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_partner_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_partner_ids
@@ -833,12 +868,12 @@ msgid "Group RMA returns by customer and warehouse."
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__id
-#: model:ir.model.fields,field_description:rma.field_account_move_line__id
-#: model:ir.model.fields,field_description:rma.field_res_company__id
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__id
-#: model:ir.model.fields,field_description:rma.field_res_partner__id
-#: model:ir.model.fields,field_description:rma.field_res_users__id
+#: model:ir.model.fields,field_description:rma.field_rma__has_message
+#: model:ir.model.fields,field_description:rma.field_rma_team__has_message
+msgid "Has Message"
+msgstr ""
+
+#. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__id
@@ -847,11 +882,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
 #: model:ir.model.fields,field_description:rma.field_rma_team__id
-#: model:ir.model.fields,field_description:rma.field_stock_move__id
-#: model:ir.model.fields,field_description:rma.field_stock_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_rule__id
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__id
 msgid "ID"
 msgstr ""
 
@@ -874,17 +904,13 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
-#: model:ir.model.fields,help:rma.field_rma__message_unread
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
-#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
-#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -903,6 +929,7 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
@@ -940,12 +967,6 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move____last_update
-#: model:ir.model.fields,field_description:rma.field_account_move_line____last_update
-#: model:ir.model.fields,field_description:rma.field_res_company____last_update
-#: model:ir.model.fields,field_description:rma.field_res_config_settings____last_update
-#: model:ir.model.fields,field_description:rma.field_res_partner____last_update
-#: model:ir.model.fields,field_description:rma.field_res_users____last_update
 #: model:ir.model.fields,field_description:rma.field_rma____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_finalization____last_update
@@ -954,11 +975,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_tag____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_team____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_move____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_rule____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -1053,6 +1069,7 @@ msgid "My Activity Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
@@ -1062,6 +1079,7 @@ msgid "Name"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
@@ -1083,12 +1101,14 @@ msgid "Next Activity Type"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
@@ -1114,7 +1134,7 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction_counter
-msgid "Number of messages which requires an action"
+msgid "Number of messages requiring action"
 msgstr ""
 
 #. module: rma
@@ -1123,12 +1143,6 @@ msgstr ""
 msgid "Number of messages with delivery error"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
@@ -1238,6 +1252,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_delivery.py:0
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
@@ -1250,11 +1265,12 @@ msgid "Quantity to extract"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Quantity to extract cannot be greater than remaining delivery quantity (%s "
-"%s)"
+"Quantity to extract cannot be greater than remaining delivery quantity "
+"(%(remaining_qty)s %(product_uom)s)"
 msgstr ""
 
 #. module: rma
@@ -1282,6 +1298,7 @@ msgid "RMA #"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
@@ -1303,6 +1320,7 @@ msgid "RMA Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
@@ -1313,6 +1331,11 @@ msgstr ""
 msgid "RMA Delivery Wizard"
 msgstr ""
 
+#. module: rma
+#: model:mail.template,name:rma.mail_template_rma_draft_notification
+msgid "RMA Draft Notification"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "RMA Finalization"
@@ -1327,7 +1350,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:rma.action_rma_finalization
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_finalization_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_list
 msgid "RMA Finalization Reasons"
 msgstr ""
 
@@ -1354,6 +1376,7 @@ msgstr ""
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+#: model:mail.template,name:rma.mail_template_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
@@ -1380,6 +1403,12 @@ msgid "RMA Receipt Confirmation Email"
 msgstr ""
 
 #. module: rma
+#: model:mail.template,name:rma.mail_template_rma_receipt_notification
+msgid "RMA Receipt Notification"
+msgstr ""
+
+#. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
@@ -1405,7 +1434,6 @@ msgstr ""
 #: model:ir.model,name:rma.model_rma_tag
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_tag_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_list
 msgid "RMA Tags"
 msgstr ""
 
@@ -1524,6 +1552,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1533,13 +1562,13 @@ msgid "Refund"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
-msgid "Refund address for current RMA."
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund Line"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
-msgid "Refund line"
+#: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
+msgid "Refund address for current RMA."
 msgstr ""
 
 #. module: rma
@@ -1580,22 +1609,25 @@ msgid "Replaced"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
-"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
-"\"%d\">%s</a>) has been created."
+"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+"\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) has "
+"been created."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
-"data-oe-id=\"%d\">%s</a><br/>Quantity %f %s<br/>This replacement did not "
-"create a new move, but one of the previously created moves was updated with "
-"this data."
+"data-oe-id=\"%(id)d\">%(name)s</a><br/>Quantity %(qty)s %(uom)s<br/>This "
+"replacement did not create a new move, but one of the previously created "
+"moves was updated with this data."
 msgstr ""
 
 #. module: rma
@@ -1609,6 +1641,7 @@ msgid "Requested operation"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
@@ -1625,6 +1658,11 @@ msgstr ""
 msgid "Responsible User"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
+msgid "Return Location"
+msgstr ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1638,11 +1676,12 @@ msgid "Return to customer"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
-"a> has been created."
+"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1661,9 +1700,8 @@ msgid "Rma Count"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error
-msgid "SMS Delivery error"
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
+msgid "Rma Location"
 msgstr ""
 
 #. module: rma
@@ -1730,12 +1768,14 @@ msgid "Sequence"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
@@ -1778,11 +1818,12 @@ msgid "Split RMA"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
-"created."
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
+"a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1792,6 +1833,7 @@ msgid "State"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
@@ -1883,14 +1925,16 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_move.py:0
 #, python-format
 msgid ""
-"The quantity done for the product '%s' must be equal to its initial demand "
-"because the stock move is linked to an RMA (%s)."
+"The quantity done for the product '%(id)s' must be equal to its initial "
+"demand because the stock move is linked to an RMA (%(name)s)."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
@@ -1902,6 +1946,7 @@ msgid "The tag is visible in the portal view"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/account_move.py:0
 #, python-format
 msgid ""
@@ -1910,18 +1955,21 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
@@ -1969,18 +2017,6 @@ msgstr ""
 msgid "Unlock"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
@@ -1996,6 +2032,11 @@ msgstr ""
 msgid "Urgent"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "User"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
@@ -2006,11 +2047,6 @@ msgstr ""
 msgid "User: Own Documents Only"
 msgstr ""
 
-#. module: rma
-#: model:ir.model,name:rma.model_res_users
-msgid "Users"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2086,12 +2122,14 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
@@ -2116,3 +2154,29 @@ msgid ""
 "the user will have an access to the RMA configuration as well as statistic "
 "reports."
 msgstr ""
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
+#: model:mail.template,report_name:rma.mail_template_rma_notification
+#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
+msgid "{{(object.name or '')}}"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_notification
+msgid "{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }})"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
+msgid ""
+"{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) products "
+"received"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_draft_notification
+msgid ""
+"{{object.company_id.name}} Your RMA has been succesfully created (Ref "
+"{{object.name or 'n/a' }})"
+msgstr ""
diff --git a/rma/i18n/pt.po b/rma/i18n/pt.po
index b80fca20..e6b1d701 100644
--- a/rma/i18n/pt.po
+++ b/rma/i18n/pt.po
@@ -17,32 +17,7 @@ msgstr ""
 "X-Generator: Weblate 4.3.2\n"
 
 #. module: rma
-#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
-#: model:mail.template,report_name:rma.mail_template_rma_notification
-#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
-msgid "${(object.name or '')}"
-msgstr "${(object.name or '')}"
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_notification
-msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} RMA (Refª ${object.name or 'n/a' })"
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
-msgid ""
-"${object.company_id.name} RMA (Ref ${object.name or 'n/a' }) products "
-"received"
-msgstr ""
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_draft_notification
-msgid ""
-"${object.company_id.name} Your RMA has been succesfully created (Ref "
-"${object.name or 'n/a' })"
-msgstr ""
-
-#. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
@@ -54,9 +29,11 @@ msgid "(object._get_report_base_filename())"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
-msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
+msgid ""
+"<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
 
 #. module: rma
@@ -64,16 +41,24 @@ msgstr ""
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    Here is the RMA <strong>${object.name}</strong> from ${object.company_id."
-"name}.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Here is the RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    .\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
@@ -82,18 +67,26 @@ msgstr ""
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    The products for your RMA <strong>${object.name}</strong>\n"
-"    from ${object.company_id.name} have been received in our warehouse.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    The products for your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    have been received in our warehouse.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -101,19 +94,27 @@ msgstr ""
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    You've succesfully placed your RMA <strong>${object.name}</strong>\n"
-"    on ${object.company_id.name}. Our team will check it and will validate\n"
-"    it as soon as possible.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    You've succesfully placed your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    on\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    . Our team will check it and will validate it as soon as "
+"possible.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -161,38 +162,78 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Cancelled</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/"
+">\n"
+"                                            Cancelled\n"
+"                                        </span>"
 msgstr ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Cancelado</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparation</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Cancelled\n"
+"                                </span>"
 msgstr ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparação</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Shipped</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Preparation\n"
+"                                        </span>"
 msgstr ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Expedido</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Partially Available</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparation\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
+"                                            Shipped\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Shipped\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Partially Available\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Partially Available\n"
+"                                </span>"
 msgstr ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Parcialmente Disponível</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -603,6 +644,7 @@ msgid "Custom Bounced Message"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
@@ -615,6 +657,7 @@ msgid "Customer Portal URL"
 msgstr "URL do Portal do Cliente"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -646,13 +689,13 @@ msgstr "Entrega"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
-msgid "Delivered qty"
-msgstr "Quantidade Enviada"
+msgid "Delivered Qty"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered qty done"
-msgstr "Quantidade Envidada Concluída"
+msgid "Delivered Qty Done"
+msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -676,12 +719,6 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__display_name
-#: model:ir.model.fields,field_description:rma.field_account_move_line__display_name
-#: model:ir.model.fields,field_description:rma.field_res_company__display_name
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__display_name
-#: model:ir.model.fields,field_description:rma.field_res_partner__display_name
-#: model:ir.model.fields,field_description:rma.field_res_users__display_name
 #: model:ir.model.fields,field_description:rma.field_rma__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__display_name
@@ -690,11 +727,6 @@ msgstr "Descrição"
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_tag__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_team__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_move__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_rule__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__display_name
 msgid "Display Name"
 msgstr "Nome a Exibir"
 
@@ -762,6 +794,7 @@ msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
@@ -818,12 +851,6 @@ msgstr ""
 msgid "Followers"
 msgstr "Seguidores"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_channel_ids
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_channel_ids
-msgid "Followers (Channels)"
-msgstr "Seguidores (Canais)"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_partner_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_partner_ids
@@ -853,12 +880,12 @@ msgid "Group RMA returns by customer and warehouse."
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__id
-#: model:ir.model.fields,field_description:rma.field_account_move_line__id
-#: model:ir.model.fields,field_description:rma.field_res_company__id
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__id
-#: model:ir.model.fields,field_description:rma.field_res_partner__id
-#: model:ir.model.fields,field_description:rma.field_res_users__id
+#: model:ir.model.fields,field_description:rma.field_rma__has_message
+#: model:ir.model.fields,field_description:rma.field_rma_team__has_message
+msgid "Has Message"
+msgstr ""
+
+#. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__id
@@ -867,11 +894,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
 #: model:ir.model.fields,field_description:rma.field_rma_team__id
-#: model:ir.model.fields,field_description:rma.field_stock_move__id
-#: model:ir.model.fields,field_description:rma.field_stock_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_rule__id
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__id
 msgid "ID"
 msgstr "ID"
 
@@ -896,17 +918,13 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
-#: model:ir.model.fields,help:rma.field_rma__message_unread
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
 msgid "If checked, new messages require your attention."
 msgstr "Se marcado, há novas mensagens que pedem a sua atenção."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
-#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
-#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr "Se marcada, algumas mensagens apresentam um erro de entrega."
 
@@ -927,6 +945,7 @@ msgstr ""
 "RMA sem a remover."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
@@ -964,12 +983,6 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move____last_update
-#: model:ir.model.fields,field_description:rma.field_account_move_line____last_update
-#: model:ir.model.fields,field_description:rma.field_res_company____last_update
-#: model:ir.model.fields,field_description:rma.field_res_config_settings____last_update
-#: model:ir.model.fields,field_description:rma.field_res_partner____last_update
-#: model:ir.model.fields,field_description:rma.field_res_users____last_update
 #: model:ir.model.fields,field_description:rma.field_rma____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_finalization____last_update
@@ -978,11 +991,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_tag____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_team____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_move____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_rule____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação Em"
 
@@ -1077,6 +1085,7 @@ msgid "My Activity Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
@@ -1086,6 +1095,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
@@ -1107,12 +1117,14 @@ msgid "Next Activity Type"
 msgstr "Tipo da Próxima Atividade"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Nenhuma das RMAs selecionadas pode executar uma substituição."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
@@ -1138,8 +1150,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr "Número de Mensagens que Requerem a sua Atenção"
+msgid "Number of messages requiring action"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
@@ -1147,12 +1159,6 @@ msgstr "Número de Mensagens que Requerem a sua Atenção"
 msgid "Number of messages with delivery error"
 msgstr "Número de Mensagens com Erro de Entrega"
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread_counter
-msgid "Number of unread messages"
-msgstr "Número de Mensagens Não Lidas"
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
@@ -1273,6 +1279,7 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_delivery.py:0
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
@@ -1285,14 +1292,13 @@ msgid "Quantity to extract"
 msgstr "Quantidade a extrair"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Quantity to extract cannot be greater than remaining delivery quantity (%s "
-"%s)"
+"Quantity to extract cannot be greater than remaining delivery quantity "
+"(%(remaining_qty)s %(product_uom)s)"
 msgstr ""
-"A quantidade a extrair não pode ser maior do que a quantidade restante da "
-"entrega (%s %s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
@@ -1319,6 +1325,7 @@ msgid "RMA #"
 msgstr "RMA #"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
@@ -1340,6 +1347,7 @@ msgid "RMA Deadline"
 msgstr "Prazo da RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
@@ -1350,6 +1358,11 @@ msgstr "Pedidos de Entrega RMA"
 msgid "RMA Delivery Wizard"
 msgstr "Assistente de Entrega RMA"
 
+#. module: rma
+#: model:mail.template,name:rma.mail_template_rma_draft_notification
+msgid "RMA Draft Notification"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "RMA Finalization"
@@ -1364,7 +1377,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:rma.action_rma_finalization
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_finalization_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_list
 msgid "RMA Finalization Reasons"
 msgstr ""
 
@@ -1391,6 +1403,7 @@ msgstr ""
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+#: model:mail.template,name:rma.mail_template_rma_notification
 msgid "RMA Notification"
 msgstr "Notificação de RMA"
 
@@ -1417,6 +1430,12 @@ msgid "RMA Receipt Confirmation Email"
 msgstr ""
 
 #. module: rma
+#: model:mail.template,name:rma.mail_template_rma_receipt_notification
+msgid "RMA Receipt Notification"
+msgstr ""
+
+#. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
@@ -1442,7 +1461,6 @@ msgstr ""
 #: model:ir.model,name:rma.model_rma_tag
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_tag_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_list
 msgid "RMA Tags"
 msgstr ""
 
@@ -1561,6 +1579,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referência do documento que gerou este RMA."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1569,16 +1588,16 @@ msgstr "Referência do documento que gerou este RMA."
 msgid "Refund"
 msgstr "Reembolso"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
 msgid "Refund address for current RMA."
 msgstr "Endereço de reembolso para o RMA atual."
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
-msgid "Refund line"
-msgstr "Linha de reembolso"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
 msgid "Refunded"
@@ -1617,30 +1636,26 @@ msgid "Replaced"
 msgstr "Substituído"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
-"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
-"\"%d\">%s</a>) has been created."
+"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+"\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) has "
+"been created."
 msgstr ""
-"Substituição: Movimentação <a href=\"#\" data-oe-model=\"stock.move\" data-"
-"oe-id=\"%d\">%s</a> (A Coleta <a href=\"#\" data-oe-model=\"stock.picking\" "
-"data-oe-id=\"%d\">%s</a> foi criada."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
-"data-oe-id=\"%d\">%s</a><br/>Quantity %f %s<br/>This replacement did not "
-"create a new move, but one of the previously created moves was updated with "
-"this data."
+"data-oe-id=\"%(id)d\">%(name)s</a><br/>Quantity %(qty)s %(uom)s<br/>This "
+"replacement did not create a new move, but one of the previously created "
+"moves was updated with this data."
 msgstr ""
-"Substituição:<br/> Produto <a href=\"#\" data-oe-model=\"product.product\" "
-"data-oe-id=\"%d\">%s</a><br/> Quantidade %f%s<br/> Essa substituição não "
-"criou uma nova movimentação, mas uma das movimentos criadas anteriormente "
-"foi atualizada com esses dados."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
@@ -1653,6 +1668,7 @@ msgid "Requested operation"
 msgstr "Operação Solicitada"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
@@ -1669,6 +1685,11 @@ msgstr "Responsável"
 msgid "Responsible User"
 msgstr "Utilizador Responsável"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
+msgid "Return Location"
+msgstr ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1682,14 +1703,13 @@ msgid "Return to customer"
 msgstr "Devolver ao cliente"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
-"a> has been created."
+"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> has been created."
 msgstr ""
-"Devolução: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">"
-"%s</a> foi criada."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1707,9 +1727,8 @@ msgid "Rma Count"
 msgstr "Contagem de RMA"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error
-msgid "SMS Delivery error"
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
+msgid "Rma Location"
 msgstr ""
 
 #. module: rma
@@ -1776,12 +1795,14 @@ msgid "Sequence"
 msgstr "Sequência"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr "Sequência de Entrada RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
@@ -1824,14 +1845,13 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
-"created."
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
+"a> has been created."
 msgstr ""
-"Divisão: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> foi "
-"criada."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -1840,6 +1860,7 @@ msgid "State"
 msgstr "Situação"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
@@ -1944,16 +1965,16 @@ msgstr ""
 "nenhum utilizador do sistema for encontrado para esse endereço."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_move.py:0
 #, python-format
 msgid ""
-"The quantity done for the product '%s' must be equal to its initial demand "
-"because the stock move is linked to an RMA (%s)."
+"The quantity done for the product '%(id)s' must be equal to its initial "
+"demand because the stock move is linked to an RMA (%(name)s)."
 msgstr ""
-"A quantidade realizada para o produto '%s' deve ser igual à sua demanda "
-"inicial, porque a movimentação do stock está vinculada a uma RMA (%s)."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
@@ -1965,6 +1986,7 @@ msgid "The tag is visible in the portal view"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/account_move.py:0
 #, python-format
 msgid ""
@@ -1975,18 +1997,21 @@ msgstr ""
 "especificada na sua RMA vinculada."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Esta RMA não pode ser dividida."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Esta RMA não pode executar uma substituição."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
@@ -2034,18 +2059,6 @@ msgstr "Unidade de Medida"
 msgid "Unlock"
 msgstr "Desbloquear"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread
-msgid "Unread Messages"
-msgstr "Mensagens não lidas"
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr "Contador de Mensagens Não Lidas"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
@@ -2061,6 +2074,11 @@ msgstr "Unidade de Medida"
 msgid "Urgent"
 msgstr "Urgente"
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "User"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
@@ -2071,11 +2089,6 @@ msgstr "Utilizador: Todos os Documentos"
 msgid "User: Own Documents Only"
 msgstr "Utilizador: Apenas os Seus Documentos"
 
-#. module: rma
-#: model:ir.model,name:rma.model_res_users
-msgid "Users"
-msgstr "Utilizadores"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2152,12 +2165,14 @@ msgstr ""
 "Quando a entrega é confirmada, enviar um e-mail de confirmação ao cliente."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr "Você não pode excluir RMAs que não estejam no estado rascunho"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
@@ -2188,3 +2203,144 @@ msgid ""
 msgstr ""
 "o utilizador terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
+#: model:mail.template,report_name:rma.mail_template_rma_notification
+#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
+msgid "{{(object.name or '')}}"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_notification
+msgid "{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }})"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
+msgid ""
+"{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) products "
+"received"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_draft_notification
+msgid ""
+"{{object.company_id.name}} Your RMA has been succesfully created (Ref "
+"{{object.name or 'n/a' }})"
+msgstr ""
+
+#~ msgid "${(object.name or '')}"
+#~ msgstr "${(object.name or '')}"
+
+#~ msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
+#~ msgstr "${object.company_id.name} RMA (Refª ${object.name or 'n/a' })"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-times\"/> Cancelled</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-times\"/> Cancelado</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+#~ "clock-o\"/> Preparation</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+#~ "clock-o\"/> Preparação</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-truck\"/> Shipped</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-truck\"/> Expedido</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-clock-o\"/> Partially Available</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-clock-o\"/> Parcialmente Disponível</span>"
+
+#~ msgid "Delivered qty"
+#~ msgstr "Quantidade Enviada"
+
+#~ msgid "Delivered qty done"
+#~ msgstr "Quantidade Envidada Concluída"
+
+#~ msgid "Followers (Channels)"
+#~ msgstr "Seguidores (Canais)"
+
+#~ msgid "Number of messages which requires an action"
+#~ msgstr "Número de Mensagens que Requerem a sua Atenção"
+
+#~ msgid "Number of unread messages"
+#~ msgstr "Número de Mensagens Não Lidas"
+
+#, python-format
+#~ msgid ""
+#~ "Quantity to extract cannot be greater than remaining delivery quantity "
+#~ "(%s %s)"
+#~ msgstr ""
+#~ "A quantidade a extrair não pode ser maior do que a quantidade restante da "
+#~ "entrega (%s %s)"
+
+#~ msgid "Refund line"
+#~ msgstr "Linha de reembolso"
+
+#, python-format
+#~ msgid ""
+#~ "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+#~ "\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-"
+#~ "oe-id=\"%d\">%s</a>) has been created."
+#~ msgstr ""
+#~ "Substituição: Movimentação <a href=\"#\" data-oe-model=\"stock.move\" "
+#~ "data-oe-id=\"%d\">%s</a> (A Coleta <a href=\"#\" data-oe-model=\"stock."
+#~ "picking\" data-oe-id=\"%d\">%s</a> foi criada."
+
+#, python-format
+#~ msgid ""
+#~ "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
+#~ "data-oe-id=\"%d\">%s</a><br/>Quantity %f %s<br/>This replacement did not "
+#~ "create a new move, but one of the previously created moves was updated "
+#~ "with this data."
+#~ msgstr ""
+#~ "Substituição:<br/> Produto <a href=\"#\" data-oe-model=\"product.product"
+#~ "\" data-oe-id=\"%d\">%s</a><br/> Quantidade %f%s<br/> Essa substituição "
+#~ "não criou uma nova movimentação, mas uma das movimentos criadas "
+#~ "anteriormente foi atualizada com esses dados."
+
+#, python-format
+#~ msgid ""
+#~ "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">"
+#~ "%s</a> has been created."
+#~ msgstr ""
+#~ "Devolução: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d"
+#~ "\">%s</a> foi criada."
+
+#, python-format
+#~ msgid ""
+#~ "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has "
+#~ "been created."
+#~ msgstr ""
+#~ "Divisão: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> foi "
+#~ "criada."
+
+#, python-format
+#~ msgid ""
+#~ "The quantity done for the product '%s' must be equal to its initial "
+#~ "demand because the stock move is linked to an RMA (%s)."
+#~ msgstr ""
+#~ "A quantidade realizada para o produto '%s' deve ser igual à sua demanda "
+#~ "inicial, porque a movimentação do stock está vinculada a uma RMA (%s)."
+
+#~ msgid "Unread Messages"
+#~ msgstr "Mensagens não lidas"
+
+#~ msgid "Unread Messages Counter"
+#~ msgstr "Contador de Mensagens Não Lidas"
+
+#~ msgid "Users"
+#~ msgstr "Utilizadores"
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index a87e7285..82bcfdc9 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -17,32 +17,7 @@ msgstr ""
 "X-Generator: Weblate 3.10\n"
 
 #. module: rma
-#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
-#: model:mail.template,report_name:rma.mail_template_rma_notification
-#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
-msgid "${(object.name or '')}"
-msgstr "${(object.name or '')}"
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_notification
-msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
-msgid ""
-"${object.company_id.name} RMA (Ref ${object.name or 'n/a' }) products "
-"received"
-msgstr ""
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_draft_notification
-msgid ""
-"${object.company_id.name} Your RMA has been succesfully created (Ref "
-"${object.name or 'n/a' })"
-msgstr ""
-
-#. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
@@ -54,9 +29,11 @@ msgid "(object._get_report_base_filename())"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
-msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
+msgid ""
+"<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
 
 #. module: rma
@@ -64,16 +41,24 @@ msgstr ""
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    Here is the RMA <strong>${object.name}</strong> from ${object.company_id."
-"name}.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Here is the RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    .\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
@@ -82,18 +67,26 @@ msgstr ""
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    The products for your RMA <strong>${object.name}</strong>\n"
-"    from ${object.company_id.name} have been received in our warehouse.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    The products for your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    have been received in our warehouse.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -101,19 +94,27 @@ msgstr ""
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    You've succesfully placed your RMA <strong>${object.name}</strong>\n"
-"    on ${object.company_id.name}. Our team will check it and will validate\n"
-"    it as soon as possible.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    You've succesfully placed your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    on\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    . Our team will check it and will validate it as soon as "
+"possible.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -161,38 +162,78 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Cancelled</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/"
+">\n"
+"                                            Cancelled\n"
+"                                        </span>"
 msgstr ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Cancelado</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparation</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Cancelled\n"
+"                                </span>"
 msgstr ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparo</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Shipped</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Preparation\n"
+"                                        </span>"
 msgstr ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Embarcado</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Partially Available</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparation\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
+"                                            Shipped\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Shipped\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Partially Available\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Partially Available\n"
+"                                </span>"
 msgstr ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Parcialmente Disponível</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -601,6 +642,7 @@ msgid "Custom Bounced Message"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
@@ -613,6 +655,7 @@ msgid "Customer Portal URL"
 msgstr "URL do portal do cliente"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -644,13 +687,13 @@ msgstr "Entrega"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
-msgid "Delivered qty"
-msgstr "Quantidade Enviada"
+msgid "Delivered Qty"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered qty done"
-msgstr "Quantidade Envidada Concluída"
+msgid "Delivered Qty Done"
+msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -674,12 +717,6 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__display_name
-#: model:ir.model.fields,field_description:rma.field_account_move_line__display_name
-#: model:ir.model.fields,field_description:rma.field_res_company__display_name
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__display_name
-#: model:ir.model.fields,field_description:rma.field_res_partner__display_name
-#: model:ir.model.fields,field_description:rma.field_res_users__display_name
 #: model:ir.model.fields,field_description:rma.field_rma__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__display_name
@@ -688,11 +725,6 @@ msgstr "Descrição"
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_tag__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_team__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_move__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_rule__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__display_name
 msgid "Display Name"
 msgstr "Exibir Nome"
 
@@ -760,6 +792,7 @@ msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
@@ -816,12 +849,6 @@ msgstr ""
 msgid "Followers"
 msgstr "Seguidores"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_channel_ids
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_channel_ids
-msgid "Followers (Channels)"
-msgstr "Seguidores (Canais)"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_partner_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_partner_ids
@@ -851,12 +878,12 @@ msgid "Group RMA returns by customer and warehouse."
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__id
-#: model:ir.model.fields,field_description:rma.field_account_move_line__id
-#: model:ir.model.fields,field_description:rma.field_res_company__id
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__id
-#: model:ir.model.fields,field_description:rma.field_res_partner__id
-#: model:ir.model.fields,field_description:rma.field_res_users__id
+#: model:ir.model.fields,field_description:rma.field_rma__has_message
+#: model:ir.model.fields,field_description:rma.field_rma_team__has_message
+msgid "Has Message"
+msgstr ""
+
+#. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__id
@@ -865,11 +892,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
 #: model:ir.model.fields,field_description:rma.field_rma_team__id
-#: model:ir.model.fields,field_description:rma.field_stock_move__id
-#: model:ir.model.fields,field_description:rma.field_stock_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_rule__id
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__id
 msgid "ID"
 msgstr "ID"
 
@@ -894,17 +916,13 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
-#: model:ir.model.fields,help:rma.field_rma__message_unread
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
 msgid "If checked, new messages require your attention."
 msgstr "Se marcada, novas mensagens requerem sua atenção."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
-#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
-#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr "Se marcada, algumas mensagens apresentam um erro de entrega."
 
@@ -925,6 +943,7 @@ msgstr ""
 "sem removê-lo."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
@@ -962,12 +981,6 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move____last_update
-#: model:ir.model.fields,field_description:rma.field_account_move_line____last_update
-#: model:ir.model.fields,field_description:rma.field_res_company____last_update
-#: model:ir.model.fields,field_description:rma.field_res_config_settings____last_update
-#: model:ir.model.fields,field_description:rma.field_res_partner____last_update
-#: model:ir.model.fields,field_description:rma.field_res_users____last_update
 #: model:ir.model.fields,field_description:rma.field_rma____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_finalization____last_update
@@ -976,11 +989,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_tag____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_team____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_move____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_rule____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse____last_update
 msgid "Last Modified on"
 msgstr "Última Modificação Feita em"
 
@@ -1075,6 +1083,7 @@ msgid "My Activity Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
@@ -1084,6 +1093,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
@@ -1105,12 +1115,14 @@ msgid "Next Activity Type"
 msgstr "Tipo da Próxima Atividade"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Nenhum dos RMAs selecionados pode executar uma substituição."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
@@ -1136,8 +1148,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction_counter
-msgid "Number of messages which requires an action"
-msgstr "Número de Mensagens que Requerem sua Atenção"
+msgid "Number of messages requiring action"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
@@ -1145,12 +1157,6 @@ msgstr "Número de Mensagens que Requerem sua Atenção"
 msgid "Number of messages with delivery error"
 msgstr "Número de Mensagens com Erro de Entrega"
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread_counter
-msgid "Number of unread messages"
-msgstr "Número de Mensagens Não Lidas"
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
@@ -1271,6 +1277,7 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_delivery.py:0
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
@@ -1283,14 +1290,13 @@ msgid "Quantity to extract"
 msgstr "Quantidade a extrair"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Quantity to extract cannot be greater than remaining delivery quantity (%s "
-"%s)"
+"Quantity to extract cannot be greater than remaining delivery quantity "
+"(%(remaining_qty)s %(product_uom)s)"
 msgstr ""
-"A quantidade a extrair não pode ser maior que a quantidade de entrega "
-"restante (%s %s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
@@ -1317,6 +1323,7 @@ msgid "RMA #"
 msgstr "RMA #"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
@@ -1338,6 +1345,7 @@ msgid "RMA Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
@@ -1348,6 +1356,11 @@ msgstr "Pedidos de Entrega RMA"
 msgid "RMA Delivery Wizard"
 msgstr "Assistente de Entrega RMA"
 
+#. module: rma
+#: model:mail.template,name:rma.mail_template_rma_draft_notification
+msgid "RMA Draft Notification"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "RMA Finalization"
@@ -1362,7 +1375,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:rma.action_rma_finalization
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_finalization_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_list
 msgid "RMA Finalization Reasons"
 msgstr ""
 
@@ -1389,6 +1401,7 @@ msgstr ""
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+#: model:mail.template,name:rma.mail_template_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
@@ -1415,6 +1428,12 @@ msgid "RMA Receipt Confirmation Email"
 msgstr ""
 
 #. module: rma
+#: model:mail.template,name:rma.mail_template_rma_receipt_notification
+msgid "RMA Receipt Notification"
+msgstr ""
+
+#. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
@@ -1440,7 +1459,6 @@ msgstr ""
 #: model:ir.model,name:rma.model_rma_tag
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_tag_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_list
 msgid "RMA Tags"
 msgstr ""
 
@@ -1559,6 +1577,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referência do documento que gerou este RMA."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1567,16 +1586,16 @@ msgstr "Referência do documento que gerou este RMA."
 msgid "Refund"
 msgstr "Restituição"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
 msgid "Refund address for current RMA."
 msgstr "Endereço de reembolso para o RMA atual."
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
-msgid "Refund line"
-msgstr "Linha de Restituição"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
 msgid "Refunded"
@@ -1615,30 +1634,26 @@ msgid "Replaced"
 msgstr "Substituído"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
-"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
-"\"%d\">%s</a>) has been created."
+"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+"\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) has "
+"been created."
 msgstr ""
-"Substituição: Movimentação <a href=\"#\" data-oe-model=\"stock.move\" data-"
-"oe-id=\"%d\">%s</a> (A Coleta <a href=\"#\" data-oe-model=\"stock.picking\" "
-"data-oe-id=\"%d\">%s</a> foi criada."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
-"data-oe-id=\"%d\">%s</a><br/>Quantity %f %s<br/>This replacement did not "
-"create a new move, but one of the previously created moves was updated with "
-"this data."
+"data-oe-id=\"%(id)d\">%(name)s</a><br/>Quantity %(qty)s %(uom)s<br/>This "
+"replacement did not create a new move, but one of the previously created "
+"moves was updated with this data."
 msgstr ""
-"Substituição:<br/> Produto <a href=\"#\" data-oe-model=\"product.product\" "
-"data-oe-id=\"%d\">%s</a><br/> Quantidade %f%s<br/> Essa substituição não "
-"criou uma nova movimentação, mas uma das movimentos criadas anteriormente "
-"foi atualizada com esses dados."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
@@ -1651,6 +1666,7 @@ msgid "Requested operation"
 msgstr "Operação Solicitada"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
@@ -1667,6 +1683,11 @@ msgstr "Responsável"
 msgid "Responsible User"
 msgstr "Usuário Responsável"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
+msgid "Return Location"
+msgstr ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1680,14 +1701,13 @@ msgid "Return to customer"
 msgstr "Retornar ao cliente"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
-"a> has been created."
+"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> has been created."
 msgstr ""
-"Retorno: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
-"a> foi criado."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1705,9 +1725,8 @@ msgid "Rma Count"
 msgstr "Contagem de RMA"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error
-msgid "SMS Delivery error"
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
+msgid "Rma Location"
 msgstr ""
 
 #. module: rma
@@ -1774,12 +1793,14 @@ msgid "Sequence"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr "Sequência de Entrada RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
@@ -1822,14 +1843,13 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
-"created."
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
+"a> has been created."
 msgstr ""
-"Divisão: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> foi "
-"criada."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -1838,6 +1858,7 @@ msgid "State"
 msgstr "Situação"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
@@ -1942,16 +1963,16 @@ msgstr ""
 "nenhum usuário do sistema for encontrado para esse endereço."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_move.py:0
 #, python-format
 msgid ""
-"The quantity done for the product '%s' must be equal to its initial demand "
-"because the stock move is linked to an RMA (%s)."
+"The quantity done for the product '%(id)s' must be equal to its initial "
+"demand because the stock move is linked to an RMA (%(name)s)."
 msgstr ""
-"A quantidade realizada para o produto '%s' deve ser igual à sua demanda "
-"inicial, porque a movimentação do estoque está vinculada a uma RMA (%s)."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
@@ -1963,6 +1984,7 @@ msgid "The tag is visible in the portal view"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/account_move.py:0
 #, python-format
 msgid ""
@@ -1973,18 +1995,21 @@ msgstr ""
 "especificada na sua RMA vinculada."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Esta RMA não pode ser dividida."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Esta RMA não pode executar uma substituição."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
@@ -2032,18 +2057,6 @@ msgstr "Unidade de Medida"
 msgid "Unlock"
 msgstr "Destravar"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread
-msgid "Unread Messages"
-msgstr "Mensagens não lidas"
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr "Contador de Mensagens Não Lidas"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
@@ -2059,6 +2072,11 @@ msgstr "Unidade de Medida"
 msgid "Urgent"
 msgstr "Urgente"
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "User"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
@@ -2069,11 +2087,6 @@ msgstr "Usuário: Todos os Documentos"
 msgid "User: Own Documents Only"
 msgstr "Usuário: Somente Seus Documentos"
 
-#. module: rma
-#: model:ir.model,name:rma.model_res_users
-msgid "Users"
-msgstr "Usuários"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2149,12 +2162,14 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr "Você não pode apagar RMAs que não estejam na situação \"Rascunho\""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
@@ -2183,3 +2198,144 @@ msgid ""
 msgstr ""
 "o usuário terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
+#: model:mail.template,report_name:rma.mail_template_rma_notification
+#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
+msgid "{{(object.name or '')}}"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_notification
+msgid "{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }})"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
+msgid ""
+"{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) products "
+"received"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_draft_notification
+msgid ""
+"{{object.company_id.name}} Your RMA has been succesfully created (Ref "
+"{{object.name or 'n/a' }})"
+msgstr ""
+
+#~ msgid "${(object.name or '')}"
+#~ msgstr "${(object.name or '')}"
+
+#~ msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
+#~ msgstr "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-times\"/> Cancelled</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-times\"/> Cancelado</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+#~ "clock-o\"/> Preparation</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+#~ "clock-o\"/> Preparo</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-truck\"/> Shipped</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-truck\"/> Embarcado</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-clock-o\"/> Partially Available</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-clock-o\"/> Parcialmente Disponível</span>"
+
+#~ msgid "Delivered qty"
+#~ msgstr "Quantidade Enviada"
+
+#~ msgid "Delivered qty done"
+#~ msgstr "Quantidade Envidada Concluída"
+
+#~ msgid "Followers (Channels)"
+#~ msgstr "Seguidores (Canais)"
+
+#~ msgid "Number of messages which requires an action"
+#~ msgstr "Número de Mensagens que Requerem sua Atenção"
+
+#~ msgid "Number of unread messages"
+#~ msgstr "Número de Mensagens Não Lidas"
+
+#, python-format
+#~ msgid ""
+#~ "Quantity to extract cannot be greater than remaining delivery quantity "
+#~ "(%s %s)"
+#~ msgstr ""
+#~ "A quantidade a extrair não pode ser maior que a quantidade de entrega "
+#~ "restante (%s %s)"
+
+#~ msgid "Refund line"
+#~ msgstr "Linha de Restituição"
+
+#, python-format
+#~ msgid ""
+#~ "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+#~ "\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-"
+#~ "oe-id=\"%d\">%s</a>) has been created."
+#~ msgstr ""
+#~ "Substituição: Movimentação <a href=\"#\" data-oe-model=\"stock.move\" "
+#~ "data-oe-id=\"%d\">%s</a> (A Coleta <a href=\"#\" data-oe-model=\"stock."
+#~ "picking\" data-oe-id=\"%d\">%s</a> foi criada."
+
+#, python-format
+#~ msgid ""
+#~ "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
+#~ "data-oe-id=\"%d\">%s</a><br/>Quantity %f %s<br/>This replacement did not "
+#~ "create a new move, but one of the previously created moves was updated "
+#~ "with this data."
+#~ msgstr ""
+#~ "Substituição:<br/> Produto <a href=\"#\" data-oe-model=\"product.product"
+#~ "\" data-oe-id=\"%d\">%s</a><br/> Quantidade %f%s<br/> Essa substituição "
+#~ "não criou uma nova movimentação, mas uma das movimentos criadas "
+#~ "anteriormente foi atualizada com esses dados."
+
+#, python-format
+#~ msgid ""
+#~ "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">"
+#~ "%s</a> has been created."
+#~ msgstr ""
+#~ "Retorno: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">"
+#~ "%s</a> foi criado."
+
+#, python-format
+#~ msgid ""
+#~ "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has "
+#~ "been created."
+#~ msgstr ""
+#~ "Divisão: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> foi "
+#~ "criada."
+
+#, python-format
+#~ msgid ""
+#~ "The quantity done for the product '%s' must be equal to its initial "
+#~ "demand because the stock move is linked to an RMA (%s)."
+#~ msgstr ""
+#~ "A quantidade realizada para o produto '%s' deve ser igual à sua demanda "
+#~ "inicial, porque a movimentação do estoque está vinculada a uma RMA (%s)."
+
+#~ msgid "Unread Messages"
+#~ msgstr "Mensagens não lidas"
+
+#~ msgid "Unread Messages Counter"
+#~ msgstr "Contador de Mensagens Não Lidas"
+
+#~ msgid "Users"
+#~ msgstr "Usuários"
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 598eb848..ed42fa18 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
+"Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -14,6 +14,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
@@ -25,6 +26,7 @@ msgid "(object._get_report_base_filename())"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -37,21 +39,21 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Here is the RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    from\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    .\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
@@ -64,21 +66,21 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    The products for your RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    from\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    have been received in our warehouse.\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
@@ -91,21 +93,21 @@ msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "                    Dear\n"
-"                    <t t-out=\"object.partner_id.name\"/>\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
 "                    <t t-if=\"object.partner_id.parent_id\">\n"
-"                        <t t-out=\"object.partner_id.parent_id.name\"/>\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
 "                    </t>\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    You've succesfully placed your RMA\n"
 "                    <strong>\n"
-"                        <t t-out=\"object.name\"/>\n"
+"                        <t t-out=\"object.name\"></t>\n"
 "                    </strong>\n"
 "                    on\n"
-"                    <t t-out=\"object.company_id.name\"/>\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    . Our team will check it and will validate it as soon as possible.\n"
-"                    <br/>\n"
-"                    <br/>\n"
+"                    <br>\n"
+"                    <br>\n"
 "                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
@@ -622,6 +624,7 @@ msgid "Custom Bounced Message"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
@@ -634,6 +637,7 @@ msgid "Customer Portal URL"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -770,6 +774,7 @@ msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
@@ -891,17 +896,13 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
-#: model:ir.model.fields,help:rma.field_rma__message_unread
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
-#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
-#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -920,6 +921,7 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
@@ -1059,6 +1061,7 @@ msgid "My Activity Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
@@ -1068,6 +1071,7 @@ msgid "Name"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
 #: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
 #, python-format
@@ -1090,12 +1094,14 @@ msgid "Next Activity Type"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
@@ -1121,7 +1127,7 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction_counter
-msgid "Number of messages which requires an action"
+msgid "Number of messages requiring action"
 msgstr ""
 
 #. module: rma
@@ -1130,12 +1136,6 @@ msgstr ""
 msgid "Number of messages with delivery error"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
@@ -1244,6 +1244,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_delivery.py:0
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
@@ -1256,6 +1257,7 @@ msgid "Quantity to extract"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1288,6 +1290,7 @@ msgid "RMA #"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
@@ -1309,6 +1312,7 @@ msgid "RMA Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
@@ -1396,6 +1400,7 @@ msgid "RMA Receipt Notification"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
@@ -1539,6 +1544,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1595,6 +1601,7 @@ msgid "Replaced"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1605,6 +1612,7 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1625,6 +1633,7 @@ msgid "Requested operation"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
@@ -1641,6 +1650,11 @@ msgstr ""
 msgid "Responsible User"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
+msgid "Return Location"
+msgstr ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1654,6 +1668,7 @@ msgid "Return to customer"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1677,9 +1692,8 @@ msgid "Rma Count"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error
-msgid "SMS Delivery error"
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
+msgid "Rma Location"
 msgstr ""
 
 #. module: rma
@@ -1746,12 +1760,14 @@ msgid "Sequence"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
@@ -1794,6 +1810,7 @@ msgid "Split RMA"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
@@ -1808,6 +1825,7 @@ msgid "State"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
@@ -1899,6 +1917,7 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_move.py:0
 #, python-format
 msgid ""
@@ -1907,6 +1926,7 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
@@ -1918,6 +1938,7 @@ msgid "The tag is visible in the portal view"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/account_move.py:0
 #, python-format
 msgid ""
@@ -1926,18 +1947,21 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
@@ -1985,18 +2009,6 @@ msgstr ""
 msgid "Unlock"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
@@ -2012,6 +2024,11 @@ msgstr ""
 msgid "Urgent"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "User"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
@@ -2022,11 +2039,6 @@ msgstr ""
 msgid "User: Own Documents Only"
 msgstr ""
 
-#. module: rma
-#: model:ir.model,name:rma.model_res_users
-msgid "Users"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2103,12 +2115,14 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index bb122b14..e23220d5 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -18,32 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.3.2\n"
 
 #. module: rma
-#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
-#: model:mail.template,report_name:rma.mail_template_rma_notification
-#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
-msgid "${(object.name or '')}"
-msgstr "${(object.name or '')}"
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_notification
-msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Retur (Ref ${object.name or 'n/a' })"
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
-msgid ""
-"${object.company_id.name} RMA (Ref ${object.name or 'n/a' }) products "
-"received"
-msgstr ""
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_draft_notification
-msgid ""
-"${object.company_id.name} Your RMA has been succesfully created (Ref "
-"${object.name or 'n/a' })"
-msgstr ""
-
-#. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
@@ -55,60 +30,64 @@ msgid "(object._get_report_base_filename())"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
-msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
-msgstr "<b>Subiect e-mail:</b> %s<br/><br/><b>Conținut e-mail:</b><br/>%s"
+msgid ""
+"<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
+msgstr ""
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    Here is the RMA <strong>${object.name}</strong> from ${object.company_id."
-"name}.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Here is the RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    .\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
-"<div style=\"margin: 0px; padding: 0px;\">\n"
-"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dragă ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    Aici este formularul de retur <strong>${object.name}</strong> de la "
-"${object.company_id.name}.\n"
-"    <br/><br/>\n"
-"   Nu ezitați să ne contactați dacă aveți întrebări.\n"
-"</p>\n"
-"            </div>\n"
-"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    The products for your RMA <strong>${object.name}</strong>\n"
-"    from ${object.company_id.name} have been received in our warehouse.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    The products for your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    have been received in our warehouse.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -116,19 +95,27 @@ msgstr ""
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    You've succesfully placed your RMA <strong>${object.name}</strong>\n"
-"    on ${object.company_id.name}. Our team will check it and will validate\n"
-"    it as soon as possible.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    You've succesfully placed your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    on\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    . Our team will check it and will validate it as soon as "
+"possible.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -180,38 +167,78 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Cancelled</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/"
+">\n"
+"                                            Cancelled\n"
+"                                        </span>"
 msgstr ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Anulat</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparation</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Cancelled\n"
+"                                </span>"
 msgstr ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Pregătire</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Shipped</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Preparation\n"
+"                                        </span>"
 msgstr ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Expediat</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Partially Available</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparation\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
+"                                            Shipped\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Shipped\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Partially Available\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Partially Available\n"
+"                                </span>"
 msgstr ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Disponibil parțial</span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -620,6 +647,7 @@ msgid "Custom Bounced Message"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
@@ -632,6 +660,7 @@ msgid "Customer Portal URL"
 msgstr "URL portal client"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -663,13 +692,13 @@ msgstr "Livrează"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
-msgid "Delivered qty"
-msgstr "Cantitate livrată"
+msgid "Delivered Qty"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered qty done"
-msgstr "Cantitate livrată efectivă"
+msgid "Delivered Qty Done"
+msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -693,12 +722,6 @@ msgid "Description"
 msgstr "Descriere"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__display_name
-#: model:ir.model.fields,field_description:rma.field_account_move_line__display_name
-#: model:ir.model.fields,field_description:rma.field_res_company__display_name
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__display_name
-#: model:ir.model.fields,field_description:rma.field_res_partner__display_name
-#: model:ir.model.fields,field_description:rma.field_res_users__display_name
 #: model:ir.model.fields,field_description:rma.field_rma__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__display_name
@@ -707,11 +730,6 @@ msgstr "Descriere"
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_tag__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_team__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_move__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_rule__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__display_name
 msgid "Display Name"
 msgstr "Nume afișat"
 
@@ -779,6 +797,7 @@ msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
@@ -835,12 +854,6 @@ msgstr ""
 msgid "Followers"
 msgstr "Urmăritori"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_channel_ids
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_channel_ids
-msgid "Followers (Channels)"
-msgstr "Urmăritori (Canale)"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_partner_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_partner_ids
@@ -870,12 +883,12 @@ msgid "Group RMA returns by customer and warehouse."
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__id
-#: model:ir.model.fields,field_description:rma.field_account_move_line__id
-#: model:ir.model.fields,field_description:rma.field_res_company__id
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__id
-#: model:ir.model.fields,field_description:rma.field_res_partner__id
-#: model:ir.model.fields,field_description:rma.field_res_users__id
+#: model:ir.model.fields,field_description:rma.field_rma__has_message
+#: model:ir.model.fields,field_description:rma.field_rma_team__has_message
+msgid "Has Message"
+msgstr ""
+
+#. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__id
@@ -884,11 +897,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
 #: model:ir.model.fields,field_description:rma.field_rma_team__id
-#: model:ir.model.fields,field_description:rma.field_stock_move__id
-#: model:ir.model.fields,field_description:rma.field_stock_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_rule__id
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__id
 msgid "ID"
 msgstr "ID"
 
@@ -911,17 +919,13 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
-#: model:ir.model.fields,help:rma.field_rma__message_unread
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
 msgid "If checked, new messages require your attention."
 msgstr "Dacă este bifat, mesajele noi necesită atenție."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
-#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
-#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr "Dacă este bifat, unele mesaje au o eroare de livrare."
 
@@ -942,6 +946,7 @@ msgstr ""
 "echipa fără a o elimina."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
@@ -979,12 +984,6 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move____last_update
-#: model:ir.model.fields,field_description:rma.field_account_move_line____last_update
-#: model:ir.model.fields,field_description:rma.field_res_company____last_update
-#: model:ir.model.fields,field_description:rma.field_res_config_settings____last_update
-#: model:ir.model.fields,field_description:rma.field_res_partner____last_update
-#: model:ir.model.fields,field_description:rma.field_res_users____last_update
 #: model:ir.model.fields,field_description:rma.field_rma____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_finalization____last_update
@@ -993,11 +992,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_tag____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_team____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_move____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_rule____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse____last_update
 msgid "Last Modified on"
 msgstr "Ultima modificare în"
 
@@ -1092,6 +1086,7 @@ msgid "My Activity Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
@@ -1101,6 +1096,7 @@ msgid "Name"
 msgstr "Nume"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
@@ -1122,6 +1118,7 @@ msgid "Next Activity Type"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
@@ -1129,6 +1126,7 @@ msgstr ""
 "La niciuna dintre cererile de retur selectate nu poate efectua o înlocuire."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
@@ -1155,7 +1153,7 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction_counter
-msgid "Number of messages which requires an action"
+msgid "Number of messages requiring action"
 msgstr ""
 
 #. module: rma
@@ -1164,12 +1162,6 @@ msgstr ""
 msgid "Number of messages with delivery error"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
@@ -1283,6 +1275,7 @@ msgid "Quantity"
 msgstr "Cantitate"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_delivery.py:0
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
@@ -1295,14 +1288,13 @@ msgid "Quantity to extract"
 msgstr "Cantitatea de extras"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Quantity to extract cannot be greater than remaining delivery quantity (%s "
-"%s)"
+"Quantity to extract cannot be greater than remaining delivery quantity "
+"(%(remaining_qty)s %(product_uom)s)"
 msgstr ""
-"Cantitatea de extras nu poate fi mai mare decât cantitatea de livrare rămasă "
-"(%s %s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
@@ -1329,6 +1321,7 @@ msgid "RMA #"
 msgstr "Număr retur"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
@@ -1350,6 +1343,7 @@ msgid "RMA Deadline"
 msgstr "Termen limită"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
@@ -1360,6 +1354,11 @@ msgstr "Comenzi livrare"
 msgid "RMA Delivery Wizard"
 msgstr ""
 
+#. module: rma
+#: model:mail.template,name:rma.mail_template_rma_draft_notification
+msgid "RMA Draft Notification"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "RMA Finalization"
@@ -1374,7 +1373,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:rma.action_rma_finalization
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_finalization_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_list
 msgid "RMA Finalization Reasons"
 msgstr ""
 
@@ -1401,6 +1399,7 @@ msgstr ""
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+#: model:mail.template,name:rma.mail_template_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
@@ -1427,6 +1426,12 @@ msgid "RMA Receipt Confirmation Email"
 msgstr ""
 
 #. module: rma
+#: model:mail.template,name:rma.mail_template_rma_receipt_notification
+msgid "RMA Receipt Notification"
+msgstr ""
+
+#. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
@@ -1452,7 +1457,6 @@ msgstr ""
 #: model:ir.model,name:rma.model_rma_tag
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_tag_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_list
 msgid "RMA Tags"
 msgstr ""
 
@@ -1571,6 +1575,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1579,16 +1584,16 @@ msgstr ""
 msgid "Refund"
 msgstr "Ramburs"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
 msgid "Refund address for current RMA."
 msgstr "Adresă ramburs pentru cererea curentă."
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
-msgid "Refund line"
-msgstr "Linie ramburs"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
 msgid "Refunded"
@@ -1627,25 +1632,25 @@ msgid "Replaced"
 msgstr "Înlocuit"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
-"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
-"\"%d\">%s</a>) has been created."
+"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+"\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) has "
+"been created."
 msgstr ""
-"Înlocuire: Mișcarea <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
-"\"%d\">%s</a> (Transfer <a href=\"#\" data-oe-model=\"stock.picking\" data-"
-"oe-id=\"%d\">%s</a>) a fost creat."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
-"data-oe-id=\"%d\">%s</a><br/>Quantity %f %s<br/>This replacement did not "
-"create a new move, but one of the previously created moves was updated with "
-"this data."
+"data-oe-id=\"%(id)d\">%(name)s</a><br/>Quantity %(qty)s %(uom)s<br/>This "
+"replacement did not create a new move, but one of the previously created "
+"moves was updated with this data."
 msgstr ""
 
 #. module: rma
@@ -1659,6 +1664,7 @@ msgid "Requested operation"
 msgstr "Operație solicitată"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
@@ -1675,6 +1681,11 @@ msgstr "Responsabil"
 msgid "Responsible User"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
+msgid "Return Location"
+msgstr ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1688,11 +1699,12 @@ msgid "Return to customer"
 msgstr "Retur către client"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
-"a> has been created."
+"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1711,9 +1723,8 @@ msgid "Rma Count"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error
-msgid "SMS Delivery error"
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
+msgid "Rma Location"
 msgstr ""
 
 #. module: rma
@@ -1780,12 +1791,14 @@ msgid "Sequence"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
@@ -1828,11 +1841,12 @@ msgid "Split RMA"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
-"created."
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
+"a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1842,6 +1856,7 @@ msgid "State"
 msgstr "Stare"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
@@ -1938,14 +1953,16 @@ msgstr ""
 "sistem pentru acea adresă."
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_move.py:0
 #, python-format
 msgid ""
-"The quantity done for the product '%s' must be equal to its initial demand "
-"because the stock move is linked to an RMA (%s)."
+"The quantity done for the product '%(id)s' must be equal to its initial "
+"demand because the stock move is linked to an RMA (%(name)s)."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
@@ -1957,6 +1974,7 @@ msgid "The tag is visible in the portal view"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/account_move.py:0
 #, python-format
 msgid ""
@@ -1965,18 +1983,21 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
@@ -2025,18 +2046,6 @@ msgstr "Unitate de măsură"
 msgid "Unlock"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
@@ -2052,6 +2061,11 @@ msgstr "UM"
 msgid "Urgent"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "User"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
@@ -2062,11 +2076,6 @@ msgstr ""
 msgid "User: Own Documents Only"
 msgstr ""
 
-#. module: rma
-#: model:ir.model,name:rma.model_res_users
-msgid "Users"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2142,12 +2151,14 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
@@ -2174,3 +2185,130 @@ msgid ""
 "the user will have an access to the RMA configuration as well as statistic "
 "reports."
 msgstr ""
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
+#: model:mail.template,report_name:rma.mail_template_rma_notification
+#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
+msgid "{{(object.name or '')}}"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_notification
+msgid "{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }})"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
+msgid ""
+"{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) products "
+"received"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_draft_notification
+msgid ""
+"{{object.company_id.name}} Your RMA has been succesfully created (Ref "
+"{{object.name or 'n/a' }})"
+msgstr ""
+
+#~ msgid "${(object.name or '')}"
+#~ msgstr "${(object.name or '')}"
+
+#~ msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
+#~ msgstr "${object.company_id.name} Retur (Ref ${object.name or 'n/a' })"
+
+#, python-format
+#~ msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
+#~ msgstr "<b>Subiect e-mail:</b> %s<br/><br/><b>Conținut e-mail:</b><br/>%s"
+
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "    Dear ${object.partner_id.name}\n"
+#~ "    % if object.partner_id.parent_id:\n"
+#~ "        (${object.partner_id.parent_id.name})\n"
+#~ "    % endif\n"
+#~ "    <br/><br/>\n"
+#~ "    Here is the RMA <strong>${object.name}</strong> from ${object."
+#~ "company_id.name}.\n"
+#~ "    <br/><br/>\n"
+#~ "    Do not hesitate to contact us if you have any question.\n"
+#~ "</p>\n"
+#~ "            </div>\n"
+#~ "        "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
+#~ "\">\n"
+#~ "    Dragă ${object.partner_id.name}\n"
+#~ "    % if object.partner_id.parent_id:\n"
+#~ "        (${object.partner_id.parent_id.name})\n"
+#~ "    % endif\n"
+#~ "    <br/><br/>\n"
+#~ "    Aici este formularul de retur <strong>${object.name}</strong> de la "
+#~ "${object.company_id.name}.\n"
+#~ "    <br/><br/>\n"
+#~ "   Nu ezitați să ne contactați dacă aveți întrebări.\n"
+#~ "</p>\n"
+#~ "            </div>\n"
+#~ "        "
+
+#~ msgid ""
+#~ "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-times\"/> Cancelled</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-times\"/> Anulat</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+#~ "clock-o\"/> Preparation</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+#~ "clock-o\"/> Pregătire</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-truck\"/> Shipped</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-truck\"/> Expediat</span>"
+
+#~ msgid ""
+#~ "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-clock-o\"/> Partially Available</span>"
+#~ msgstr ""
+#~ "<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw "
+#~ "fa-clock-o\"/> Disponibil parțial</span>"
+
+#~ msgid "Delivered qty"
+#~ msgstr "Cantitate livrată"
+
+#~ msgid "Delivered qty done"
+#~ msgstr "Cantitate livrată efectivă"
+
+#~ msgid "Followers (Channels)"
+#~ msgstr "Urmăritori (Canale)"
+
+#, python-format
+#~ msgid ""
+#~ "Quantity to extract cannot be greater than remaining delivery quantity "
+#~ "(%s %s)"
+#~ msgstr ""
+#~ "Cantitatea de extras nu poate fi mai mare decât cantitatea de livrare "
+#~ "rămasă (%s %s)"
+
+#~ msgid "Refund line"
+#~ msgstr "Linie ramburs"
+
+#, python-format
+#~ msgid ""
+#~ "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+#~ "\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-"
+#~ "oe-id=\"%d\">%s</a>) has been created."
+#~ msgstr ""
+#~ "Înlocuire: Mișcarea <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+#~ "\"%d\">%s</a> (Transfer <a href=\"#\" data-oe-model=\"stock.picking\" "
+#~ "data-oe-id=\"%d\">%s</a>) a fost creat."
diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
index 6fd693ee..ba54d9f8 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -17,32 +17,7 @@ msgstr ""
 "X-Generator: Weblate 4.3.2\n"
 
 #. module: rma
-#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
-#: model:mail.template,report_name:rma.mail_template_rma_notification
-#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
-msgid "${(object.name or '')}"
-msgstr ""
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_notification
-msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
-msgid ""
-"${object.company_id.name} RMA (Ref ${object.name or 'n/a' }) products "
-"received"
-msgstr ""
-
-#. module: rma
-#: model:mail.template,subject:rma.mail_template_rma_draft_notification
-msgid ""
-"${object.company_id.name} Your RMA has been succesfully created (Ref "
-"${object.name or 'n/a' })"
-msgstr ""
-
-#. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
@@ -54,9 +29,11 @@ msgid "(object._get_report_base_filename())"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
-msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
+msgid ""
+"<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
 
 #. module: rma
@@ -64,16 +41,24 @@ msgstr ""
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    Here is the RMA <strong>${object.name}</strong> from ${object.company_id."
-"name}.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Here is the RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    .\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
 "            </div>\n"
 "        "
 msgstr ""
@@ -82,18 +67,26 @@ msgstr ""
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    The products for your RMA <strong>${object.name}</strong>\n"
-"    from ${object.company_id.name} have been received in our warehouse.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    The products for your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    have been received in our warehouse.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -101,19 +94,27 @@ msgstr ""
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Dear ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    You've succesfully placed your RMA <strong>${object.name}</strong>\n"
-"    on ${object.company_id.name}. Our team will check it and will validate\n"
-"    it as soon as possible.\n"
-"    <br/><br/>\n"
-"    Do not hesitate to contact us if you have any question.\n"
-"</p>\n"
-"</div>\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Dear\n"
+"                    <t t-out=\"object.partner_id.name\"></t>\n"
+"                    <t t-if=\"object.partner_id.parent_id\">\n"
+"                        <t t-out=\"object.partner_id.parent_id.name\"></t>\n"
+"                    </t>\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    You've succesfully placed your RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    on\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    . Our team will check it and will validate it as soon as "
+"possible.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Do not hesitate to contact us if you have any question.\n"
+"                </p>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -155,29 +156,77 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
-"times\"/> Cancelled</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/"
+">\n"
+"                                            Cancelled\n"
+"                                        </span>"
 msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparation</span>"
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Cancelled\n"
+"                                </span>"
 msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
-"truck\"/> Shipped</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Preparation\n"
+"                                        </span>"
 msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
-"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Partially Available</span>"
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparation\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
+"                                            Shipped\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Shipped\n"
+"                                </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Partially Available\n"
+"                                        </span>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Partially Available\n"
+"                                </span>"
 msgstr ""
 
 #. module: rma
@@ -585,6 +634,7 @@ msgid "Custom Bounced Message"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
@@ -597,6 +647,7 @@ msgid "Customer Portal URL"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -628,12 +679,12 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
-msgid "Delivered qty"
+msgid "Delivered Qty"
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered qty done"
+msgid "Delivered Qty Done"
 msgstr ""
 
 #. module: rma
@@ -658,12 +709,6 @@ msgid "Description"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__display_name
-#: model:ir.model.fields,field_description:rma.field_account_move_line__display_name
-#: model:ir.model.fields,field_description:rma.field_res_company__display_name
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__display_name
-#: model:ir.model.fields,field_description:rma.field_res_partner__display_name
-#: model:ir.model.fields,field_description:rma.field_res_users__display_name
 #: model:ir.model.fields,field_description:rma.field_rma__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__display_name
@@ -672,11 +717,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_tag__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_team__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_move__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_rule__display_name
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__display_name
 msgid "Display Name"
 msgstr ""
 
@@ -744,6 +784,7 @@ msgid "Email sent to the customer when they place an RMA from the portal"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
@@ -800,12 +841,6 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_channel_ids
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_channel_ids
-msgid "Followers (Channels)"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_partner_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_partner_ids
@@ -835,12 +870,12 @@ msgid "Group RMA returns by customer and warehouse."
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move__id
-#: model:ir.model.fields,field_description:rma.field_account_move_line__id
-#: model:ir.model.fields,field_description:rma.field_res_company__id
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__id
-#: model:ir.model.fields,field_description:rma.field_res_partner__id
-#: model:ir.model.fields,field_description:rma.field_res_users__id
+#: model:ir.model.fields,field_description:rma.field_rma__has_message
+#: model:ir.model.fields,field_description:rma.field_rma_team__has_message
+msgid "Has Message"
+msgstr ""
+
+#. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__id
@@ -849,11 +884,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
 #: model:ir.model.fields,field_description:rma.field_rma_team__id
-#: model:ir.model.fields,field_description:rma.field_stock_move__id
-#: model:ir.model.fields,field_description:rma.field_stock_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking__id
-#: model:ir.model.fields,field_description:rma.field_stock_rule__id
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse__id
 msgid "ID"
 msgstr ""
 
@@ -876,17 +906,13 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
-#: model:ir.model.fields,help:rma.field_rma__message_unread
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
-#: model:ir.model.fields,help:rma.field_rma__message_has_sms_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
-#: model:ir.model.fields,help:rma.field_rma_team__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
@@ -905,6 +931,7 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
@@ -942,12 +969,6 @@ msgid "Journal Item"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_account_move____last_update
-#: model:ir.model.fields,field_description:rma.field_account_move_line____last_update
-#: model:ir.model.fields,field_description:rma.field_res_company____last_update
-#: model:ir.model.fields,field_description:rma.field_res_config_settings____last_update
-#: model:ir.model.fields,field_description:rma.field_res_partner____last_update
-#: model:ir.model.fields,field_description:rma.field_res_users____last_update
 #: model:ir.model.fields,field_description:rma.field_rma____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_finalization____last_update
@@ -956,11 +977,6 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_tag____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_team____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_move____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_return_picking____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_rule____last_update
-#: model:ir.model.fields,field_description:rma.field_stock_warehouse____last_update
 msgid "Last Modified on"
 msgstr ""
 
@@ -1055,6 +1071,7 @@ msgid "My Activity Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
@@ -1064,6 +1081,7 @@ msgid "Name"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
@@ -1085,12 +1103,14 @@ msgid "Next Activity Type"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
@@ -1116,7 +1136,7 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction_counter
-msgid "Number of messages which requires an action"
+msgid "Number of messages requiring action"
 msgstr ""
 
 #. module: rma
@@ -1125,12 +1145,6 @@ msgstr ""
 msgid "Number of messages with delivery error"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread_counter
-msgid "Number of unread messages"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
@@ -1240,6 +1254,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/rma_delivery.py:0
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
@@ -1252,11 +1267,12 @@ msgid "Quantity to extract"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Quantity to extract cannot be greater than remaining delivery quantity (%s "
-"%s)"
+"Quantity to extract cannot be greater than remaining delivery quantity "
+"(%(remaining_qty)s %(product_uom)s)"
 msgstr ""
 
 #. module: rma
@@ -1284,6 +1300,7 @@ msgid "RMA #"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
@@ -1305,6 +1322,7 @@ msgid "RMA Deadline"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
@@ -1315,6 +1333,11 @@ msgstr ""
 msgid "RMA Delivery Wizard"
 msgstr ""
 
+#. module: rma
+#: model:mail.template,name:rma.mail_template_rma_draft_notification
+msgid "RMA Draft Notification"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "RMA Finalization"
@@ -1329,7 +1352,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:rma.action_rma_finalization
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_finalization_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_list
 msgid "RMA Finalization Reasons"
 msgstr ""
 
@@ -1356,6 +1378,7 @@ msgstr ""
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+#: model:mail.template,name:rma.mail_template_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
@@ -1382,6 +1405,12 @@ msgid "RMA Receipt Confirmation Email"
 msgstr ""
 
 #. module: rma
+#: model:mail.template,name:rma.mail_template_rma_receipt_notification
+msgid "RMA Receipt Notification"
+msgstr ""
+
+#. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
@@ -1407,7 +1436,6 @@ msgstr ""
 #: model:ir.model,name:rma.model_rma_tag
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_tag_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
-#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_list
 msgid "RMA Tags"
 msgstr ""
 
@@ -1526,6 +1554,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1535,13 +1564,13 @@ msgid "Refund"
 msgstr "退货"
 
 #. module: rma
-#: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
-msgid "Refund address for current RMA."
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund Line"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
-msgid "Refund line"
+#: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
+msgid "Refund address for current RMA."
 msgstr ""
 
 #. module: rma
@@ -1582,22 +1611,25 @@ msgid "Replaced"
 msgstr "已换货"
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
-"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
-"\"%d\">%s</a>) has been created."
+"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id="
+"\"%(move_id)d\">%(move_name)s</a> (Picking <a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) has "
+"been created."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
-"data-oe-id=\"%d\">%s</a><br/>Quantity %f %s<br/>This replacement did not "
-"create a new move, but one of the previously created moves was updated with "
-"this data."
+"data-oe-id=\"%(id)d\">%(name)s</a><br/>Quantity %(qty)s %(uom)s<br/>This "
+"replacement did not create a new move, but one of the previously created "
+"moves was updated with this data."
 msgstr ""
 
 #. module: rma
@@ -1611,6 +1643,7 @@ msgid "Requested operation"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
@@ -1627,6 +1660,11 @@ msgstr ""
 msgid "Responsible User"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
+msgid "Return Location"
+msgstr ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
@@ -1640,11 +1678,12 @@ msgid "Return to customer"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
-"a> has been created."
+"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1663,9 +1702,8 @@ msgid "Rma Count"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_has_sms_error
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_sms_error
-msgid "SMS Delivery error"
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
+msgid "Rma Location"
 msgstr ""
 
 #. module: rma
@@ -1732,12 +1770,14 @@ msgid "Sequence"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
@@ -1780,11 +1820,12 @@ msgid "Split RMA"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
-"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
-"created."
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
+"a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1794,6 +1835,7 @@ msgid "State"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
@@ -1885,14 +1927,16 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/stock_move.py:0
 #, python-format
 msgid ""
-"The quantity done for the product '%s' must be equal to its initial demand "
-"because the stock move is linked to an RMA (%s)."
+"The quantity done for the product '%(id)s' must be equal to its initial "
+"demand because the stock move is linked to an RMA (%(name)s)."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
@@ -1904,6 +1948,7 @@ msgid "The tag is visible in the portal view"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/account_move.py:0
 #, python-format
 msgid ""
@@ -1912,18 +1957,21 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
@@ -1971,18 +2019,6 @@ msgstr ""
 msgid "Unlock"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread
-msgid "Unread Messages"
-msgstr ""
-
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_unread_counter
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_unread_counter
-msgid "Unread Messages Counter"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
@@ -1998,6 +2034,11 @@ msgstr ""
 msgid "Urgent"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "User"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
@@ -2008,11 +2049,6 @@ msgstr ""
 msgid "User: Own Documents Only"
 msgstr ""
 
-#. module: rma
-#: model:ir.model,name:rma.model_res_users
-msgid "Users"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2088,12 +2124,14 @@ msgid ""
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
 
 #. module: rma
+#. odoo-python
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
@@ -2118,3 +2156,29 @@ msgid ""
 "the user will have an access to the RMA configuration as well as statistic "
 "reports."
 msgstr ""
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_draft_notification
+#: model:mail.template,report_name:rma.mail_template_rma_notification
+#: model:mail.template,report_name:rma.mail_template_rma_receipt_notification
+msgid "{{(object.name or '')}}"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_notification
+msgid "{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }})"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_receipt_notification
+msgid ""
+"{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) products "
+"received"
+msgstr ""
+
+#. module: rma
+#: model:mail.template,subject:rma.mail_template_rma_draft_notification
+msgid ""
+"{{object.company_id.name}} Your RMA has been succesfully created (Ref "
+"{{object.name or 'n/a' }})"
+msgstr ""
diff --git a/rma/migrations/15.0.1.0.0/noupdate_changes.xml b/rma/migrations/15.0.1.0.0/noupdate_changes.xml
deleted file mode 100644
index 7937b11e..00000000
--- a/rma/migrations/15.0.1.0.0/noupdate_changes.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<odoo>
-    <record id="mail_template_rma_notification" model="mail.template">
-        <field name="email_from">{{object.user_id.email_formatted}}</field>
-        <field name="partner_to">{{object.partner_id.id}}</field>
-        <field
-            name="subject"
-        >{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }})</field>
-        <field name="report_name">{{(object.name or '')}}</field>
-        <field name="lang">{{object.partner_id.lang}}</field>
-        <field name="body_html" type="html">
-            <div style="margin: 0px; padding: 0px;">
-                <p style="margin: 0px; padding: 0px; font-size: 13px;">
-                    Dear
-                    <t t-out="object.partner_id.name" />
-                    <t t-if="object.partner_id.parent_id">
-                        <t t-out="object.partner_id.parent_id.name" />
-                    </t>
-                    <br />
-                    <br />
-                    Here is the RMA
-                    <strong>
-                        <t t-out="object.name" />
-                    </strong>
-                    from
-                    <t t-out="object.company_id.name" />
-                    .
-                    <br />
-                    <br />
-                    Do not hesitate to contact us if you have any question.
-                </p>
-            </div>
-        </field>
-    </record>
-    <record id="mail_template_rma_receipt_notification" model="mail.template">
-        <field name="email_from">{{object.user_id.email_formatted }}</field>
-        <field name="partner_to">{{object.partner_id.id}}</field>
-        <field
-            name="subject"
-        >{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) products received</field>
-        <field name="report_name">{{(object.name or '')}}</field>
-        <field name="lang">{{object.partner_id.lang}}</field>
-        <field name="body_html" type="html">
-            <div style="margin: 0px; padding: 0px;">
-                <p style="margin: 0px; padding: 0px; font-size: 13px;">
-                    Dear
-                    <t t-out="object.partner_id.name" />
-                    <t t-if="object.partner_id.parent_id">
-                        <t t-out="object.partner_id.parent_id.name" />
-                    </t>
-                    <br />
-                    <br />
-                    The products for your RMA
-                    <strong>
-                        <t t-out="object.name" />
-                    </strong>
-                    from
-                    <t t-out="object.company_id.name" />
-                    have been received in our warehouse.
-                    <br />
-                    <br />
-                    Do not hesitate to contact us if you have any question.
-                </p>
-            </div>
-        </field>
-    </record>
-    <record id="mail_template_rma_draft_notification" model="mail.template">
-        <field name="email_from">{{object.user_id.email_formatted}}</field>
-        <field name="partner_to">{{object.partner_id.id}}</field>
-        <field
-            name="subject"
-        >{{object.company_id.name}} Your RMA has been succesfully created (Ref {{object.name or 'n/a' }})</field>
-        <field name="report_name">{{(object.name or '')}}</field>
-        <field name="lang">{{object.partner_id.lang}}</field>
-        <field name="body_html" type="html">
-            <div style="margin: 0px; padding: 0px;">
-                <p style="margin: 0px; padding: 0px; font-size: 13px;">
-                    Dear
-                    <t t-out="object.partner_id.name" />
-                    <t t-if="object.partner_id.parent_id">
-                        <t t-out="object.partner_id.parent_id.name" />
-                    </t>
-                    <br />
-                    <br />
-                    You've succesfully placed your RMA
-                    <strong>
-                        <t t-out="object.name" />
-                    </strong>
-                    on
-                    <t t-out="object.company_id.name" />
-                    . Our team will check it and will validate it as soon as possible.
-                    <br />
-                    <br />
-                    Do not hesitate to contact us if you have any question.
-                </p>
-            </div>
-        </field>
-    </record>
-</odoo>
diff --git a/rma/migrations/15.0.1.0.0/post-migration.py b/rma/migrations/15.0.1.0.0/post-migration.py
deleted file mode 100644
index d83f6aba..00000000
--- a/rma/migrations/15.0.1.0.0/post-migration.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022 Tecnativa - Víctor Martínez
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from openupgradelib import openupgrade
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    openupgrade.load_data(env.cr, "rma", "migrations/15.0.1.0.0/noupdate_changes.xml")
-    openupgrade.delete_record_translations(
-        env.cr,
-        "rma",
-        [
-            "mail_template_rma_notification",
-            "mail_template_rma_receipt_notification",
-            "mail_template_rma_draft_notification",
-        ],
-    )
diff --git a/rma/models/res_company.py b/rma/models/res_company.py
index 94d274df..2b55930a 100644
--- a/rma/models/res_company.py
+++ b/rma/models/res_company.py
@@ -1,10 +1,11 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, fields, models
 
 
-class Company(models.Model):
+class ResCompany(models.Model):
     _inherit = "res.company"
 
     def _default_rma_mail_confirmation_template(self):
@@ -65,11 +66,12 @@ class Company(models.Model):
         help="Email sent to the customer when they place " "an RMA from the portal",
     )
 
-    @api.model
-    def create(self, vals):
-        company = super(Company, self).create(vals)
-        company.create_rma_index()
-        return company
+    @api.model_create_multi
+    def create(self, vals_list):
+        companies = super().create(vals_list)
+        for company in companies:
+            company.create_rma_index()
+        return companies
 
     def create_rma_index(self):
         return (
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 811d2546..f00a0724 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1,4 +1,5 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 import logging
 from collections import Counter
@@ -78,6 +79,9 @@ class Rma(models.Model):
             "locked": [("readonly", True)],
             "cancelled": [("readonly", True)],
         },
+        compute="_compute_team_id",
+        store=True,
+        readonly=False,
     )
     tag_ids = fields.Many2many(comodel_name="rma.tag", string="Tags")
     finalization_id = fields.Many2one(
@@ -109,19 +113,21 @@ class Rma(models.Model):
     partner_shipping_id = fields.Many2one(
         string="Shipping Address",
         comodel_name="res.partner",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
         help="Shipping address for current RMA.",
+        compute="_compute_partner_shipping_id",
+        store=True,
+        readonly=False,
     )
     partner_invoice_id = fields.Many2one(
         string="Invoice Address",
         comodel_name="res.partner",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
         domain=(
             "['|', ('company_id', '=', False), ('company_id', '='," " company_id)]"
         ),
         help="Refund address for current RMA.",
+        compute="_compute_partner_invoice_id",
+        store=True,
+        readonly=False,
     )
     commercial_partner_id = fields.Many2one(
         comodel_name="res.partner",
@@ -149,28 +155,34 @@ class Rma(models.Model):
             "    ('picking_id', '!=', False)"
             "]"
         ),
-        readonly=True,
-        states={"draft": [("readonly", False)]},
+        compute="_compute_move_id",
+        store=True,
+        readonly=False,
     )
     product_id = fields.Many2one(
         comodel_name="product.product",
         domain=[("type", "in", ["consu", "product"])],
+        compute="_compute_product_id",
+        store=True,
+        readonly=False,
     )
     product_uom_qty = fields.Float(
         string="Quantity",
         required=True,
         default=1.0,
         digits="Product Unit of Measure",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
+        compute="_compute_product_uom_qty",
+        store=True,
+        readonly=False,
     )
     product_uom = fields.Many2one(
         comodel_name="uom.uom",
         string="UoM",
         required=True,
-        readonly=True,
-        states={"draft": [("readonly", False)]},
         default=lambda self: self.env.ref("uom.product_uom_unit").id,
+        compute="_compute_product_uom",
+        store=True,
+        readonly=False,
     )
     procurement_group_id = fields.Many2one(
         comodel_name="procurement.group",
@@ -220,8 +232,9 @@ class Rma(models.Model):
     location_id = fields.Many2one(
         comodel_name="stock.location",
         domain=_domain_location_id,
-        readonly=True,
-        states={"draft": [("readonly", False)]},
+        compute="_compute_location_id",
+        store=True,
+        readonly=False,
     )
     warehouse_id = fields.Many2one(
         comodel_name="stock.warehouse",
@@ -463,6 +476,83 @@ class Rma(models.Model):
                 [("rma_loc_id", "parent_of", record.location_id.id)], limit=1
             )
 
+    @api.depends("user_id")
+    def _compute_team_id(self):
+        self.team_id = False
+        for record in self.filtered("user_id"):
+            record.team_id = (
+                self.env["rma.team"]
+                .sudo()
+                .search(
+                    [
+                        "|",
+                        ("user_id", "=", record.user_id.id),
+                        ("member_ids", "=", record.user_id.id),
+                        "|",
+                        ("company_id", "=", False),
+                        ("company_id", "child_of", record.company_id.ids),
+                    ],
+                    limit=1,
+                )
+            )
+
+    @api.depends("partner_id")
+    def _compute_partner_shipping_id(self):
+        self.partner_shipping_id = False
+        for record in self.filtered("partner_id"):
+            address = record.partner_id.address_get(["delivery"])
+            record.partner_shipping_id = address.get("delivery", False)
+
+    @api.depends("partner_id")
+    def _compute_partner_invoice_id(self):
+        self.partner_invoice_id = False
+        for record in self.filtered("partner_id"):
+            address = record.partner_id.address_get(["invoice"])
+            record.partner_invoice_id = address.get("invoice", False)
+
+    @api.depends("picking_id")
+    def _compute_move_id(self):
+        """Empty move on picking change, but selecting the move in it if it's single."""
+        self.move_id = False
+        for record in self.filtered("picking_id"):
+            if len(record.picking_id.move_ids) == 1:
+                record.move_id = record.picking_id.move_ids.id
+
+    @api.depends("move_id")
+    def _compute_product_id(self):
+        self.product_id = False
+        for record in self.filtered("move_id"):
+            record.product_id = record.move_id.product_id.id
+
+    @api.depends("move_id")
+    def _compute_product_uom_qty(self):
+        self.product_uom_qty = False
+        for record in self.filtered("move_id"):
+            record.product_uom_qty = record.move_id.product_uom_qty
+
+    @api.depends("move_id", "product_id")
+    def _compute_product_uom(self):
+        for record in self:
+            if record.move_id:
+                record.product_uom = record.move_id.product_uom.id
+            elif record.product_id:
+                record.product_uom = record.product_id.uom_id
+            else:
+                record.product_uom = False
+
+    @api.depends("picking_id", "product_id", "company_id")
+    def _compute_location_id(self):
+        for record in self:
+            if record.picking_id:
+                warehouse = record.picking_id.picking_type_id.warehouse_id
+                record.location_id = warehouse.rma_loc_id.id
+            elif not record.location_id:
+                company = record.company_id or self.env.company
+                warehouse = self.env["stock.warehouse"].search(
+                    [("company_id", "=", company.id)], limit=1
+                )
+                record.location_id = warehouse.rma_loc_id.id
+
     def _compute_access_url(self):
         for record in self:
             record.access_url = "/my/rmas/{}".format(record.id)
@@ -483,76 +573,6 @@ class Rma(models.Model):
         rma = self.filtered(lambda r: r.state not in ["draft", "cancelled"])
         rma._ensure_required_fields()
 
-    # onchange methods (@api.onchange)
-    @api.onchange("user_id")
-    def _onchange_user_id(self):
-        if self.user_id:
-            self.team_id = (
-                self.env["rma.team"]
-                .sudo()
-                .search(
-                    [
-                        "|",
-                        ("user_id", "=", self.user_id.id),
-                        ("member_ids", "=", self.user_id.id),
-                        "|",
-                        ("company_id", "=", False),
-                        ("company_id", "child_of", self.company_id.ids),
-                    ],
-                    limit=1,
-                )
-            )
-        else:
-            self.team_id = False
-
-    @api.onchange("partner_id")
-    def _onchange_partner_id(self):
-        self.picking_id = False
-        partner_invoice_id = False
-        partner_shipping_id = False
-        if self.partner_id:
-            address = self.partner_id.address_get(["invoice", "delivery"])
-            partner_invoice_id = address.get("invoice", False)
-            partner_shipping_id = address.get("delivery", False)
-        self.partner_invoice_id = partner_invoice_id
-        self.partner_shipping_id = partner_shipping_id
-
-    @api.onchange("picking_id")
-    def _onchange_picking_id(self):
-        location = False
-        if self.picking_id:
-            warehouse = self.picking_id.picking_type_id.warehouse_id
-            location = warehouse.rma_loc_id.id
-        self.location_id = location
-        self.move_id = False
-        self.product_id = False
-
-    @api.onchange("move_id")
-    def _onchange_move_id(self):
-        if self.move_id:
-            self.product_id = self.move_id.product_id
-            self.product_uom_qty = self.move_id.product_uom_qty
-            self.product_uom = self.move_id.product_uom
-
-    @api.onchange("product_id")
-    def _onchange_product_id(self):
-        if self.product_id:
-            # Set UoM
-            if not self.product_uom or self.product_id.uom_id.id != self.product_uom.id:
-                self.product_uom = self.product_id.uom_id
-            # Set stock location (location_id)
-            user = self.env.user
-            if (
-                not user.has_group("stock.group_stock_multi_locations")
-                and not self.location_id
-            ):
-                # If this condition is True, it is because a picking is not set
-                company = self.company_id or self.env.company
-                warehouse = self.env["stock.warehouse"].search(
-                    [("company_id", "=", company.id)], limit=1
-                )
-                self.location_id = warehouse.rma_loc_id.id
-
     # CRUD methods (ORM overrides)
     @api.model_create_multi
     def create(self, vals_list):
@@ -677,41 +697,25 @@ class Rma(models.Model):
             group_dict[key] |= record
         for rmas in group_dict.values():
             origin = ", ".join(rmas.mapped("name"))
-            invoice_form = Form(
-                self.env["account.move"]
-                .sudo()
-                .with_context(
-                    default_move_type="out_refund",
-                    company_id=rmas[0].company_id.id,
-                ),
-                "account.view_move_form",
-            )
-            rmas[0]._prepare_refund(invoice_form, origin)
-            refund = invoice_form.save()
+            refund_vals = rmas[0]._prepare_refund_vals(origin)
             for rma in rmas:
-                # For each iteration the Form is edited, a new invoice line
-                # is added and then saved. This is to generate the other
-                # lines of the accounting entry and to specify the associated
-                # RMA to that new invoice line.
-                invoice_form = Form(refund)
-                with invoice_form.invoice_line_ids.new() as line_form:
-                    rma._prepare_refund_line(line_form)
-                refund = invoice_form.save()
-                line = refund.invoice_line_ids.filtered(lambda r: not r.rma_id)
-                line.rma_id = rma.id
-                rma.write(
+                refund_vals["invoice_line_ids"].append(
+                    (0, 0, rma._prepare_refund_line_vals())
+                )
+            refund = self.env["account.move"].sudo().create(refund_vals)
+            refund.with_user(self.env.uid).message_post_with_view(
+                "mail.message_origin_link",
+                values={"self": refund, "origin": rmas},
+                subtype_id=self.env.ref("mail.mt_note").id,
+            )
+            for line in refund.invoice_line_ids:
+                line.rma_id.write(
                     {
                         "refund_line_id": line.id,
                         "refund_id": refund.id,
                         "state": "refunded",
                     }
                 )
-            refund.invoice_origin = origin
-            refund.with_user(self.env.uid).message_post_with_view(
-                "mail.message_origin_link",
-                values={"self": refund, "origin": rmas},
-                subtype_id=self.env.ref("mail.mt_note").id,
-            )
 
     def action_replace(self):
         """Invoked when 'Replace' button in rma form view is clicked."""
@@ -880,7 +884,6 @@ class Rma(models.Model):
         rma._check_required_after_draft
         rma.action_confirm
         """
-        ir_translation = self.env["ir.translation"]
         required = [
             "partner_id",
             "partner_shipping_id",
@@ -891,7 +894,17 @@ class Rma(models.Model):
         for record in self:
             desc = ""
             for field in filter(lambda item: not record[item], required):
-                desc += "\n%s" % ir_translation.get_field_string("rma")[field]
+                field_record = (
+                    self.env["ir.model.fields"]
+                    .sudo()
+                    .search(
+                        [
+                            ("model_id.model", "=", record._name),
+                            ("name", "=", field),
+                        ]
+                    )
+                )
+                desc += f"\n{field_record.field_description}"
             if desc:
                 raise ValidationError(_("Required field(s):%s") % desc)
 
@@ -982,9 +995,9 @@ class Rma(models.Model):
                 active_model="stock.picking",
             )
         )
-        if self.location_id:
-            stock_return_picking_form.location_id = self.location_id
         return_wizard = stock_return_picking_form.save()
+        if self.location_id:
+            return_wizard.location_id = self.location_id
         return_wizard.product_return_moves.filtered(
             lambda r: r.move_id != self.move_id
         ).unlink()
@@ -992,8 +1005,8 @@ class Rma(models.Model):
         return_line.update(
             {
                 "quantity": self.product_uom_qty,
-                # The to_refund field is now True by default, which isn't right in the RMA
-                # creation context.
+                # The to_refund field is now True by default, which isn't right in the
+                # RMA creation context
                 "to_refund": False,
             }
         )
@@ -1005,20 +1018,13 @@ class Rma(models.Model):
         picking_id = picking_action["res_id"]
         picking = self.env["stock.picking"].browse(picking_id)
         picking.origin = "{} ({})".format(self.name, picking.origin)
-        move = picking.move_lines
+        move = picking.move_ids
         move.priority = self.priority
         return move
 
     def _create_receptions_from_product(self):
         self.ensure_one()
-        picking_form = Form(
-            recordp=self.env["stock.picking"].with_context(
-                default_picking_type_id=self.warehouse_id.rma_in_type_id.id
-            ),
-            view="stock.view_picking_form",
-        )
-        self._prepare_picking(picking_form)
-        picking = picking_form.save()
+        picking = self.env["stock.picking"].create(self._prepare_picking_vals())
         picking.action_confirm()
         picking.action_assign()
         picking.message_post_with_view(
@@ -1026,17 +1032,33 @@ class Rma(models.Model):
             values={"self": picking, "origin": self},
             subtype_id=self.env.ref("mail.mt_note").id,
         )
-        return picking.move_lines
+        return picking.move_ids
 
-    def _prepare_picking(self, picking_form):
-        picking_form.origin = self.name
-        picking_form.partner_id = self.partner_shipping_id
-        picking_form.location_id = self.partner_shipping_id.property_stock_customer
-        picking_form.location_dest_id = self.location_id
-        with picking_form.move_ids_without_package.new() as move_form:
-            move_form.product_id = self.product_id
-            move_form.product_uom_qty = self.product_uom_qty
-            move_form.product_uom = self.product_uom
+    def _prepare_picking_vals(self):
+        return {
+            "picking_type_id": self.warehouse_id.rma_in_type_id.id,
+            "origin": self.name,
+            "partner_id": self.partner_shipping_id.id,
+            "location_id": self.partner_shipping_id.property_stock_customer.id,
+            "location_dest_id": self.location_id.id,
+            "move_ids": [
+                (
+                    0,
+                    0,
+                    {
+                        "product_id": self.product_id.id,
+                        # same text as origin move or product text in partner lang
+                        "name": self.move_id.name
+                        or self.product_id.with_context(
+                            lang=self.partner_id.lang or "en_US"
+                        ).display_name,
+                        "location_id": self.partner_shipping_id.property_stock_customer.id,
+                        "location_dest_id": self.location_id.id,
+                        "product_uom_qty": self.product_uom_qty,
+                    },
+                )
+            ],
+        }
 
     # Extract business methods
     def extract_quantity(self, qty, uom):
@@ -1074,7 +1096,7 @@ class Rma(models.Model):
         return extracted_rma
 
     # Refund business methods
-    def _prepare_refund(self, invoice_form, origin):
+    def _prepare_refund_vals(self, origin=False):
         """Hook method for preparing the refund Form.
 
         This method could be override in order to add new custom field
@@ -1084,11 +1106,16 @@ class Rma(models.Model):
         rma.action_refund
         """
         self.ensure_one()
-        invoice_form.partner_id = self.partner_invoice_id
-        # Avoid set partner default value
-        invoice_form.invoice_payment_term_id = self.env["account.payment.term"]
+        return {
+            "move_type": "out_refund",
+            "company_id": self.company_id.id,
+            "partner_id": self.partner_invoice_id.id,
+            "invoice_payment_term_id": False,
+            "invoice_origin": origin,
+            "invoice_line_ids": [],
+        }
 
-    def _prepare_refund_line(self, line_form):
+    def _prepare_refund_line_vals(self):
         """Hook method for preparing a refund line Form.
 
         This method could be override in order to add new custom field
@@ -1098,31 +1125,13 @@ class Rma(models.Model):
         rma.action_refund
         """
         self.ensure_one()
-        product = self._get_refund_line_product()
-        qty, uom = self._get_refund_line_quantity()
-        line_form.product_id = product
-        line_form.quantity = qty
-        line_form.product_uom_id = uom
-        line_form.price_unit = self._get_refund_line_price_unit()
-
-    def _get_refund_line_product(self):
-        """To be overriden in a third module with the proper origin values
-        in case a kit is linked with the rma"""
-        return self.product_id
-
-    def _get_refund_line_quantity(self):
-        """To be overriden in a third module with the proper origin values
-        in case a kit is linked with the rma"""
-        return (self.product_uom_qty, self.product_uom)
-
-    def _get_refund_line_price_unit(self):
-        """To be overriden in a third module with the proper origin values
-        in case a sale order is linked to the original move"""
-        return self.product_id.lst_price
-
-    def _get_extra_refund_line_vals(self):
-        """Override to write aditional stuff into the refund line"""
-        return {}
+        return {
+            "product_id": self.product_id.id,
+            "quantity": self.product_uom_qty,
+            "product_uom_id": self.product_uom.id,
+            "price_unit": self.product_id.lst_price,
+            "rma_id": self.id,
+        }
 
     # Returning business methods
     def create_return(self, scheduled_date, qty=None, uom=None):
@@ -1148,32 +1157,13 @@ class Rma(models.Model):
             grouped_rmas = rmas_to_return
         for rmas in grouped_rmas:
             origin = ", ".join(rmas.mapped("name"))
-            rma_out_type = rmas[0].warehouse_id.rma_out_type_id
-            picking_form = Form(
-                recordp=self.env["stock.picking"].with_context(
-                    default_picking_type_id=rma_out_type.id
-                ),
-                view="stock.view_picking_form",
-            )
-            rmas[0]._prepare_returning_picking(picking_form, origin)
-            picking = picking_form.save()
+            picking_vals = rmas[0]._prepare_returning_picking_vals(origin)
             for rma in rmas:
-                with picking_form.move_ids_without_package.new() as move_form:
-                    rma._prepare_returning_move(move_form, scheduled_date, qty, uom)
-                # rma_id is not present in the form view, so we need to get
-                # the 'values to save' to add the rma id and use the
-                # create method intead of save the form.
-                picking_vals = picking_form._values_to_save(all_fields=True)
-                move_vals = picking_vals["move_ids_without_package"][-1][2]
-                move_vals.update(
-                    picking_id=picking.id,
-                    rma_id=rma.id,
-                    move_orig_ids=[(4, rma.reception_move_id.id)],
-                    company_id=picking.company_id.id,
+                picking_vals["move_ids"].append(
+                    (0, 0, rma._prepare_returning_move_vals(scheduled_date, qty, uom))
                 )
-                if "product_qty" in move_vals:
-                    move_vals.pop("product_qty")
-                self.env["stock.move"].sudo().create(move_vals)
+            picking = self.env["stock.picking"].create(picking_vals)
+            for rma in rmas:
                 rma.message_post(
                     body=_(
                         'Return: <a href="#" data-oe-model="stock.picking" '
@@ -1190,18 +1180,34 @@ class Rma(models.Model):
             )
         rmas_to_return.write({"state": "waiting_return"})
 
-    def _prepare_returning_picking(self, picking_form, origin=None):
-        picking_form.picking_type_id = self.warehouse_id.rma_out_type_id
-        picking_form.origin = origin or self.name
-        picking_form.partner_id = self.partner_shipping_id
+    def _prepare_returning_picking_vals(self, origin=None):
+        self.ensure_one()
+        return {
+            "picking_type_id": self.warehouse_id.rma_out_type_id.id,
+            "location_id": self.location_id.id,
+            "location_dest_id": self.reception_move_id.location_id.id,
+            "origin": origin or self.name,
+            "partner_id": self.partner_shipping_id.id,
+            "company_id": self.company_id.id,
+            "move_ids": [],
+        }
 
-    def _prepare_returning_move(
-        self, move_form, scheduled_date, quantity=None, uom=None
-    ):
-        move_form.product_id = self.product_id
-        move_form.product_uom_qty = quantity or self.product_uom_qty
-        move_form.product_uom = uom or self.product_uom
-        move_form.date = scheduled_date
+    def _prepare_returning_move_vals(self, scheduled_date, quantity=None, uom=None):
+        self.ensure_one()
+        return {
+            "product_id": self.product_id.id,
+            "name": self.product_id.with_context(
+                lang=self.partner_shipping_id.lang or "en_US"
+            ).display_name,
+            "product_uom_qty": quantity or self.product_uom_qty,
+            "product_uom": uom and uom.id or self.product_uom.id,
+            "location_id": self.location_id.id,
+            "location_dest_id": self.reception_move_id.location_id.id,
+            "date": scheduled_date,
+            "rma_id": self.id,
+            "move_orig_ids": [(4, self.reception_move_id.id)],
+            "company_id": self.company_id.id,
+        }
 
     # Replacing business methods
     def create_replace(self, scheduled_date, warehouse, product, qty, uom):
diff --git a/rma/models/stock_picking.py b/rma/models/stock_picking.py
index 242871d5..edbc0300 100644
--- a/rma/models/stock_picking.py
+++ b/rma/models/stock_picking.py
@@ -14,23 +14,24 @@ class StockPicking(models.Model):
 
     def _compute_rma_count(self):
         for rec in self:
-            rec.rma_count = len(rec.move_lines.mapped("rma_ids"))
+            rec.rma_count = len(rec.move_ids.mapped("rma_ids"))
 
     def copy(self, default=None):
         self.ensure_one()
         if self.env.context.get("set_rma_picking_type"):
-            location_dest_id = default["location_dest_id"]
-            warehouse = self.env["stock.warehouse"].search(
-                [("rma_loc_id", "parent_of", location_dest_id)], limit=1
-            )
-            if warehouse:
-                default["picking_type_id"] = warehouse.rma_in_type_id.id
+            location_dest_id = default.get("location_dest_id")
+            if location_dest_id:
+                warehouse = self.env["stock.warehouse"].search(
+                    [("rma_loc_id", "parent_of", location_dest_id)], limit=1
+                )
+                if warehouse:
+                    default["picking_type_id"] = warehouse.rma_in_type_id.id
         return super().copy(default)
 
     def action_view_rma(self):
         self.ensure_one()
         action = self.sudo().env.ref("rma.rma_action").read()[0]
-        rma = self.move_lines.mapped("rma_ids")
+        rma = self.move_ids.mapped("rma_ids")
         if len(rma) == 1:
             action.update(
                 res_id=rma.id,
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index d26b5a0c..1d2e9679 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
 <title>Return Merchandise Authorization Management</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
 
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
 */
 
@@ -366,8 +366,10 @@ ul.auto-toc {
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:4b518f08c3f67013102d103bf4cfa29044b508456a38a8405d92ae01faa8d88e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/rma/tree/15.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/rma-15-0/rma-15-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/145/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<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/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/rma/tree/16.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-16-0/rma-16-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=16.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 (RMA)</a>.
 RMA documents can be created from scratch, from a delivery order or from
 an incoming email. Product receptions and returning delivery operations
@@ -378,20 +380,20 @@ Besides, you have full integration of the RMA documents in the customer portal.<
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
-<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id3">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id4">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id8">Maintainers</a></li>
+<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="toc-entry-3">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-7">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 <p>If you want RMAs to be created from incoming emails, you need to:</p>
 <ol class="arabic simple">
 <li>Go to <em>Settings &gt; General Settings</em>.</li>
@@ -415,7 +417,7 @@ If you want to avoid this grouping you can:</p>
 <p>The users will still be able to group those pickings from the wizard.</p>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#id2">Usage</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <p>To use this module, you need to:</p>
 <ol class="arabic simple">
 <li>Go to <em>RMA &gt; Orders</em> and create a new RMA.</li>
@@ -482,7 +484,7 @@ will be the default one if no team is set.</li>
 </blockquote>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id3">Known issues / Roadmap</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h1>
 <ul class="simple">
 <li>As soon as the picking is selected, the user should select the move,
 but perhaps stock.move _rec_name could be improved to better show what
@@ -490,23 +492,23 @@ the product of that move is.</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id4">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/rma/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
-If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id5">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-5">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id6">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
 <ul class="simple">
 <li>Tecnativa</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <ul class="simple">
 <li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
 <li>Ernesto Tejeda</li>
@@ -520,15 +522,15 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
-<p><a class="reference external" href="https://github.com/ernestotejeda"><img alt="ernestotejeda" src="https://github.com/ernestotejeda.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/15.0/rma">OCA/rma</a> project on GitHub.</p>
+<p><a class="reference external image-reference" href="https://github.com/pedrobaeza"><img alt="pedrobaeza" src="https://github.com/pedrobaeza.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/16.0/rma">OCA/rma</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 63363b29..89c6c56d 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -9,6 +9,16 @@ class TestRma(TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
+        cls.env = cls.env(
+            context=dict(
+                cls.env.context,
+                mail_create_nolog=True,
+                mail_create_nosubscribe=True,
+                mail_notrack=True,
+                no_reset_password=True,
+                tracking_disable=True,
+            )
+        )
         cls.user_rma = new_test_user(
             cls.env,
             login="user_rma",
@@ -24,18 +34,11 @@ class TestRma(TransactionCase):
         cls.product = cls.product_product.create(
             {"name": "Product test 1", "type": "product"}
         )
-        account_type = cls.env["account.account.type"].create(
-            {
-                "name": "RCV type",
-                "type": "receivable",
-                "internal_group": "income",
-            }
-        )
         cls.account_receiv = cls.env["account.account"].create(
             {
                 "name": "Receivable",
                 "code": "RCV00",
-                "user_type_id": account_type.id,
+                "account_type": "asset_receivable",
                 "reconcile": True,
             }
         )
@@ -73,16 +76,16 @@ class TestRma(TransactionCase):
         cls.env.company.rma_return_grouping = True
 
     def _create_rma(self, partner=None, product=None, qty=None, location=None):
-        rma_form = Form(self.env["rma"])
+        vals = {}
         if partner:
-            rma_form.partner_id = partner
+            vals["partner_id"] = partner.id
         if product:
-            rma_form.product_id = product
+            vals["product_id"] = product.id
         if qty:
-            rma_form.product_uom_qty = qty
+            vals["product_uom_qty"] = qty
         if location:
-            rma_form.location_id = location
-        return rma_form.save()
+            vals["location_id"] = location.id
+        return self.env["rma"].create(vals)
 
     def _create_confirm_receive(
         self, partner=None, product=None, qty=None, location=None
@@ -93,25 +96,6 @@ class TestRma(TransactionCase):
         rma.reception_move_id.picking_id._action_done()
         return rma
 
-    def _test_readonly_fields(self, rma):
-        with Form(rma) as rma_form:
-            with self.assertRaises(AssertionError):
-                rma_form.partner_id = self.env["res.partner"]
-            with self.assertRaises(AssertionError):
-                rma_form.partner_invoice_id = self.env["res.partner"]
-            with self.assertRaises(AssertionError):
-                rma_form.picking_id = self.env["stock.picking"]
-            with self.assertRaises(AssertionError):
-                rma_form.move_id = self.env["stock.move"]
-            with self.assertRaises(AssertionError):
-                rma_form.product_id = self.env["product.product"]
-            with self.assertRaises(AssertionError):
-                rma_form.product_uom_qty = 0
-            with self.assertRaises(AssertionError):
-                rma_form.product_uom = self.env["uom.uom"]
-            with self.assertRaises(AssertionError):
-                rma_form.location_id = self.env["stock.location"]
-
     def _create_delivery(self):
         picking_type = self.env["stock.picking.type"].search(
             [
@@ -139,18 +123,18 @@ class TestRma(TransactionCase):
             move.product_uom_qty = 20
         picking = picking_form.save()
         picking.action_confirm()
-        for move in picking.move_lines:
+        for move in picking.move_ids:
             move.quantity_done = move.product_uom_qty
         picking.button_validate()
         return picking
 
 
 class TestRmaCase(TestRma):
-    def test_onchange(self):
-        rma_form = Form(self.env["rma"])
+    def test_computed(self):
         # If partner changes, the invoice address is set
-        rma_form.partner_id = self.partner
-        self.assertEqual(rma_form.partner_invoice_id, self.partner_invoice)
+        rma = self.env["rma"].new()
+        rma.partner_id = self.partner
+        self.assertEqual(rma.partner_invoice_id, self.partner_invoice)
         # If origin move changes, the product is set
         uom_ten = self.env["uom.uom"].create(
             {
@@ -182,21 +166,17 @@ class TestRmaCase(TestRma):
         with picking_form.move_ids_without_package.new() as move:
             move.product_id = product_2
             move.product_uom_qty = 15
-            move.product_uom = uom_ten
         picking = picking_form.save()
         picking._action_done()
-        rma_form.picking_id = picking
-        rma_form.move_id = picking.move_lines
-        self.assertEqual(rma_form.product_id, product_2)
-        self.assertEqual(rma_form.product_uom_qty, 15)
-        self.assertEqual(rma_form.product_uom, uom_ten)
+        rma.picking_id = picking
+        rma.move_id = picking.move_ids
+        self.assertEqual(rma.product_id, product_2)
+        self.assertEqual(rma.product_uom_qty, 15)
+        self.assertEqual(rma.product_uom, uom_ten)
         # If product changes, unit of measure changes
-        rma_form.picking_id = self.env["stock.picking"]
-        rma_form.product_id = self.product
-        self.assertEqual(rma_form.product_id, self.product)
-        self.assertEqual(rma_form.product_uom_qty, 15)
-        self.assertNotEqual(rma_form.product_uom, uom_ten)
-        self.assertEqual(rma_form.product_uom, self.product.uom_id)
+        rma.move_id = False
+        rma.product_id = self.product
+        self.assertEqual(rma.product_uom, self.product.uom_id)
 
     def test_ensure_required_fields_on_confirm(self):
         rma = self._create_rma()
@@ -204,17 +184,14 @@ class TestRmaCase(TestRma):
             rma.action_confirm()
         self.assertEqual(
             e.exception.args[0],
-            "Required field(s):\nCustomer\nShipping Address\nInvoice Address\n"
-            "Product\nLocation",
+            "Required field(s):\nCustomer\nShipping Address\nInvoice Address\nProduct",
         )
-        with Form(rma) as rma_form:
-            rma_form.partner_id = self.partner
+        rma.partner_id = self.partner.id
         with self.assertRaises(ValidationError) as e:
             rma.action_confirm()
-        self.assertEqual(e.exception.args[0], "Required field(s):\nProduct\nLocation")
-        with Form(rma) as rma_form:
-            rma_form.product_id = self.product
-            rma_form.location_id = self.rma_loc
+        self.assertEqual(e.exception.args[0], "Required field(s):\nProduct")
+        rma.product_id = self.product.id
+        rma.location_id = self.rma_loc.id
         rma.action_confirm()
         self.assertEqual(rma.state, "confirmed")
 
@@ -226,7 +203,6 @@ class TestRmaCase(TestRma):
         self.assertEqual(rma.reception_move_id.product_uom_qty, 10)
         self.assertEqual(rma.reception_move_id.product_uom, rma.product_uom)
         self.assertEqual(rma.state, "confirmed")
-        self._test_readonly_fields(rma)
         rma.reception_move_id.quantity_done = 9
         with self.assertRaises(ValidationError):
             rma.reception_move_id.picking_id._action_done()
@@ -235,14 +211,12 @@ class TestRmaCase(TestRma):
         self.assertEqual(rma.reception_move_id.picking_id.state, "done")
         self.assertEqual(rma.reception_move_id.quantity_done, 10)
         self.assertEqual(rma.state, "received")
-        self._test_readonly_fields(rma)
 
     def test_cancel(self):
         # cancel a draft RMA
         rma = self._create_rma(self.partner, self.product)
         rma.action_cancel()
         self.assertEqual(rma.state, "cancelled")
-        self._test_readonly_fields(rma)
         # cancel a confirmed RMA
         rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
         rma.action_confirm()
@@ -304,7 +278,6 @@ class TestRmaCase(TestRma):
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
-        self._test_readonly_fields(rma)
 
     def test_mass_refund(self):
         # Create, confirm and receive rma_1
@@ -403,7 +376,7 @@ class TestRmaCase(TestRma):
         delivery_form.product_uom_qty = 2
         delivery_wizard = delivery_form.save()
         delivery_wizard.action_deliver()
-        self.assertEqual(len(rma.delivery_move_ids.picking_id.move_lines), 1)
+        self.assertEqual(len(rma.delivery_move_ids.picking_id.move_ids), 1)
         self.assertEqual(rma.delivery_move_ids.product_id, product_2)
         self.assertEqual(rma.delivery_move_ids.product_uom_qty, 2)
         self.assertTrue(rma.delivery_move_ids.picking_id.state, "waiting")
@@ -459,7 +432,6 @@ class TestRmaCase(TestRma):
         # Despite being in 'replaced' state,
         # RMAs can still perform replacements.
         self.assertTrue(rma.can_be_replaced)
-        self._test_readonly_fields(rma)
 
     def test_return_to_customer(self):
         # Create, confirm and receive an RMA
@@ -475,7 +447,7 @@ class TestRmaCase(TestRma):
         delivery_wizard = delivery_form.save()
         delivery_wizard.action_deliver()
         picking = rma.delivery_move_ids.picking_id
-        self.assertEqual(len(picking.move_lines), 1)
+        self.assertEqual(len(picking.move_ids), 1)
         self.assertEqual(rma.delivery_move_ids.product_id, self.product)
         self.assertEqual(rma.delivery_move_ids.product_uom_qty, 2)
         self.assertTrue(picking.state, "waiting")
@@ -527,7 +499,6 @@ class TestRmaCase(TestRma):
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
-        self._test_readonly_fields(rma)
 
     def test_finish_rma(self):
         # Create, confirm and receive an RMA
@@ -590,19 +561,19 @@ class TestRmaCase(TestRma):
         self.assertEqual(pick_2.partner_id, rma_4.partner_id)
         # Each RMA of (rma_1, rma_2 and rma_3) is linked to a different
         # line of picking_1
-        self.assertEqual(len(pick_1.move_lines), 3)
+        self.assertEqual(len(pick_1.move_ids), 3)
         self.assertEqual(
-            pick_1.move_lines.mapped("rma_id"),
+            pick_1.move_ids.mapped("rma_id"),
             (rma_1 | rma_2 | rma_3),
         )
         self.assertEqual(
             (rma_1 | rma_2 | rma_3).mapped("delivery_move_ids"),
-            pick_1.move_lines,
+            pick_1.move_ids,
         )
         # rma_4 is linked with the unique move of pick_2
-        self.assertEqual(len(pick_2.move_lines), 1)
-        self.assertEqual(pick_2.move_lines.rma_id, rma_4)
-        self.assertEqual(rma_4.delivery_move_ids, pick_2.move_lines)
+        self.assertEqual(len(pick_2.move_ids), 1)
+        self.assertEqual(pick_2.move_ids.rma_id, rma_4)
+        self.assertEqual(rma_4.delivery_move_ids, pick_2.move_ids)
         # Assert product and quantities are propagated correctly
         for rma in all_rmas:
             self.assertEqual(rma.product_id, rma.delivery_move_ids.product_id)
@@ -660,14 +631,14 @@ class TestRmaCase(TestRma):
         return_wizard = stock_return_picking_form.save()
         picking_action = return_wizard.create_returns()
         # Each origin move is linked to a different RMA
-        origin_moves = origin_delivery.move_lines
+        origin_moves = origin_delivery.move_ids
         self.assertTrue(origin_moves[0].rma_ids)
         self.assertTrue(origin_moves[1].rma_ids)
         rmas = origin_moves.mapped("rma_ids")
         self.assertEqual(rmas.mapped("state"), ["confirmed"] * 2)
         # Each reception move is linked one of the generated RMAs
         reception = self.env["stock.picking"].browse(picking_action["res_id"])
-        reception_moves = reception.move_lines
+        reception_moves = reception.move_ids
         self.assertTrue(reception_moves[0].rma_receiver_ids)
         self.assertTrue(reception_moves[1].rma_receiver_ids)
         self.assertEqual(reception_moves.mapped("rma_receiver_ids"), rmas)
@@ -682,7 +653,7 @@ class TestRmaCase(TestRma):
         rma_form = Form(self.env["rma"])
         rma_form.partner_id = self.partner
         rma_form.picking_id = origin_delivery
-        rma_form.move_id = origin_delivery.move_lines.filtered(
+        rma_form.move_id = origin_delivery.move_ids.filtered(
             lambda r: r.product_id == self.product
         )
         rma = rma_form.save()
diff --git a/rma/views/res_partner_views.xml b/rma/views/res_partner_views.xml
index 45d9474c..6eb1f461 100644
--- a/rma/views/res_partner_views.xml
+++ b/rma/views/res_partner_views.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     Copyright 2023 Tecnativa - Pedro M. Baeza
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="view_partner_form" model="ir.ui.view">
         <field name="name">res.partner.form</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="base.view_partner_form" />
-        <field name="groups_id" eval="[(4, ref('rma.rma_group_user_own'))]" />
         <field name="arch" type="xml">
             <div name="button_box">
                 <button
@@ -15,6 +15,7 @@
                     class="oe_stat_button"
                     icon="fa-reply"
                     attrs="{'invisible': [('rma_count', '=', 0)]}"
+                    groups="rma.rma_group_user_own"
                 >
                     <field name="rma_count" widget="statinfo" string="RMA" />
                 </button>
diff --git a/rma/views/rma_finalization_views.xml b/rma/views/rma_finalization_views.xml
index 45b3c9bc..3772660b 100644
--- a/rma/views/rma_finalization_views.xml
+++ b/rma/views/rma_finalization_views.xml
@@ -33,6 +33,7 @@
                     <group>
                         <field name="name" />
                         <field name="company_id" groups="base.group_multi_company" />
+                        <field name="company_id" invisible="1" />
                         <field name="active" invisible="1" />
                     </group>
                 </sheet>
@@ -47,6 +48,7 @@
             <tree>
                 <field name="name" />
                 <field name="company_id" groups="base.group_multi_company" />
+                <field name="company_id" invisible="1" />
             </tree>
         </field>
     </record>
diff --git a/rma/views/rma_team_views.xml b/rma/views/rma_team_views.xml
index 100b5e66..ae08ba9d 100644
--- a/rma/views/rma_team_views.xml
+++ b/rma/views/rma_team_views.xml
@@ -10,6 +10,7 @@
                 <field name="name" />
                 <field name="user_id" />
                 <field name="company_id" groups="base.group_multi_company" />
+                <field name="company_id" invisible="1" />
             </tree>
         </field>
     </record>
@@ -33,6 +34,7 @@
                                 options="{'no_create': True}"
                                 groups="base.group_multi_company"
                             />
+                            <field name="company_id" invisible="1" />
                         </group>
                     </group>
                     <notebook>
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 934b7f75..256484ba 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     Copyright 2023 Tecnativa - Pedro M. Baeza
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="rma_view_search" model="ir.ui.view">
@@ -239,10 +240,19 @@
                                 name="partner_id"
                                 widget="res_partner_many2one"
                                 context="{'search_default_customer':1, 'show_address': 1, 'show_vat': True}"
+                                attrs="{'readonly': [('state', '!=', 'draft')]}"
                                 options="{'always_reload': True}"
                             />
-                            <field name="partner_shipping_id" />
-                            <field name="partner_invoice_id" />
+                            <field
+                                name="partner_shipping_id"
+                                attrs="{'readonly': [('state', '!=', 'draft')]}"
+                                force_save="1"
+                            />
+                            <field
+                                name="partner_invoice_id"
+                                attrs="{'readonly': [('state', 'not in', ['draft', 'confirmed', 'received'])]}"
+                                force_save="1"
+                            />
                             <field name="picking_id" options="{'no_create': True}" />
                             <field
                                 name="move_id"
@@ -258,12 +268,19 @@
                             <field name="uom_category_id" invisible="1" />
                             <label for="product_uom_qty" />
                             <div class="o_row">
-                                <field name="product_uom_qty" />
+                                <field
+                                    name="product_uom_qty"
+                                    attrs="{'readonly': [('state', '!=', 'draft')]}"
+                                    force_save="1"
+                                />
                                 <field
                                     name="product_uom"
                                     groups="uom.group_uom"
                                     domain="[('category_id', '=', uom_category_id)]"
+                                    attrs="{'readonly': [('state', '!=', 'draft')]}"
+                                    force_save="1"
                                 />
+                                <field name="product_uom" invisible="1" />
                             </div>
                             <field
                                 name="delivered_qty"
@@ -291,6 +308,7 @@
                                 options="{'no_create': True}"
                                 groups="base.group_multi_company"
                             />
+                            <field name="company_id" invisible="1" />
                         </group>
                     </group>
                     <notebook>
@@ -302,7 +320,9 @@
                                         name="location_id"
                                         options="{'no_create': True, 'no_open': True}"
                                         groups="stock.group_stock_multi_locations"
+                                        attrs="{'readonly': [('state', '!=', 'draft')]}"
                                     />
+                                    <field name="location_id" invisible="1" />
                                 </group>
                                 <group>
                                     <field name="deadline" />
@@ -341,10 +361,6 @@
     <record id="rma_finalization_form" model="ir.ui.view">
         <field name="model">rma</field>
         <field name="inherit_id" ref="rma.rma_view_form" />
-        <field
-            name="groups_id"
-            eval="[(4, ref('rma.group_rma_manual_finalization'))]"
-        />
         <field name="arch" type="xml">
             <xpath
                 expr="//form//header//button[@name='action_cancel']"
@@ -356,6 +372,7 @@
                     name="action_finish"
                     class="btn-primary"
                     attrs="{'invisible': [('can_be_finished', '=', False)]}"
+                    groups="rma.group_rma_manual_finalization"
                 />
             </xpath>
         </field>
diff --git a/rma/views/stock_picking_views.xml b/rma/views/stock_picking_views.xml
index 4f1e8aad..16022033 100644
--- a/rma/views/stock_picking_views.xml
+++ b/rma/views/stock_picking_views.xml
@@ -6,7 +6,6 @@
         <field name="name">stock.picking.form</field>
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="stock.view_picking_form" />
-        <field name="groups_id" eval="[(4, ref('rma.rma_group_user_own'))]" />
         <field name="arch" type="xml">
             <div name="button_box">
                 <button
@@ -15,6 +14,7 @@
                     class="oe_stat_button"
                     icon="fa-reply"
                     attrs="{'invisible': [('rma_count', '=', 0)]}"
+                    groups="rma.rma_group_user_own"
                 >
                     <field name="rma_count" widget="statinfo" string="RMA" />
                 </button>
diff --git a/rma/views/stock_warehouse_views.xml b/rma/views/stock_warehouse_views.xml
index 059efa05..238f6198 100644
--- a/rma/views/stock_warehouse_views.xml
+++ b/rma/views/stock_warehouse_views.xml
@@ -4,14 +4,13 @@
         <field name="name">Stock Warehouse Inherit MRP</field>
         <field name="model">stock.warehouse</field>
         <field name="inherit_id" ref="stock.view_warehouse" />
-        <field name="groups_id" eval="[(4, ref('rma.rma_group_user_own'))]" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='wh_output_stock_loc_id']/..">
-                <field name="rma_loc_id" />
+                <field name="rma_loc_id" groups="rma.rma_group_user_own" />
             </xpath>
             <xpath expr="//field[@name='out_type_id']/..">
-                <field name="rma_in_type_id" />
-                <field name="rma_out_type_id" />
+                <field name="rma_in_type_id" groups="rma.rma_group_user_own" />
+                <field name="rma_out_type_id" groups="rma.rma_group_user_own" />
             </xpath>
         </field>
     </record>
diff --git a/rma/wizard/rma_delivery_views.xml b/rma/wizard/rma_delivery_views.xml
index 112523f6..ae0cf63a 100644
--- a/rma/wizard/rma_delivery_views.xml
+++ b/rma/wizard/rma_delivery_views.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     Copyright 2023 Tecnativa - Pedro M. Baeza
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="rma_redelivery_wizard_view_form" model="ir.ui.view">
@@ -43,6 +44,7 @@
                                 attrs="{'required': [('rma_count', '=', 1)]}"
                                 domain="[('category_id', '=', uom_category_id)]"
                             />
+                            <field name="product_uom" invisible="1" />
                         </div>
                     </group>
                 </group>
diff --git a/rma/wizard/rma_split_views.xml b/rma/wizard/rma_split_views.xml
index 68807503..b141e47e 100644
--- a/rma/wizard/rma_split_views.xml
+++ b/rma/wizard/rma_split_views.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     Copyright 2023 Tecnativa - Pedro M. Baeza
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="rma_split_wizard_view_form2" model="ir.ui.view">
@@ -13,6 +14,7 @@
                         <div class="o_row">
                             <field name="product_uom_qty" />
                             <field name="product_uom" groups="uom.group_uom" />
+                            <field name="product_uom" invisible="1" />
                         </div>
                     </group>
                 </group>
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
index 7e16ea6d..4599f1cf 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -10,39 +10,43 @@ class ReturnPicking(models.TransientModel):
 
     create_rma = fields.Boolean(string="Create RMAs")
     picking_type_code = fields.Selection(related="picking_id.picking_type_id.code")
+    rma_location_ids = fields.Many2many(
+        comodel_name="stock.location", compute="_compute_rma_location_id"
+    )
+    # Expand domain for RMAs
+    location_id = fields.Many2one(
+        domain="create_rma and [('id', 'child_of', rma_location_ids)]"
+        "or "
+        "['|', ('id', '=', original_location_id), '|', '&', "
+        "('return_location', '=', True), ('company_id', '=', False), '&', "
+        "('return_location', '=', True), ('company_id', '=', company_id)]"
+    )
+
+    @api.depends("picking_id")
+    def _compute_rma_location_id(self):
+        for record in self:
+            record.rma_location_ids = (
+                self.env["stock.warehouse"]
+                .search([("company_id", "=", record.picking_id.company_id.id)])
+                .rma_loc_id
+            )
 
     @api.onchange("create_rma")
     def _onchange_create_rma(self):
         if self.create_rma:
             warehouse = self.picking_id.picking_type_id.warehouse_id
             self.location_id = warehouse.rma_loc_id.id
-            rma_loc = warehouse.search(
-                [("company_id", "=", self.picking_id.company_id.id)]
-            ).mapped("rma_loc_id")
-            rma_loc_domain = [("id", "child_of", rma_loc.ids)]
             # We want to avoid setting the return move `to_refund` as it will change
             # the delivered quantities in the sale and set them to invoice.
             self.product_return_moves.to_refund = False
         else:
-            # If self.create_rma is not True, the value of the location and
-            # the location domain will be the same as assigned by default.
+            # If self.create_rma is not True, the value of the location will be the
+            # same as assigned by default
             location_id = self.picking_id.location_id.id
             return_picking_type = self.picking_id.picking_type_id.return_picking_type_id
             if return_picking_type.default_location_dest_id.return_location:
                 location_id = return_picking_type.default_location_dest_id.id
             self.location_id = location_id
-            rma_loc_domain = [
-                "|",
-                ("id", "=", self.picking_id.location_id.id),
-                "|",
-                "&",
-                ("return_location", "=", True),
-                ("company_id", "=", False),
-                "&",
-                ("return_location", "=", True),
-                ("company_id", "=", self.picking_id.company_id.id),
-            ]
-        return {"domain": {"location_id": rma_loc_domain}}
 
     def create_returns(self):
         """Override create_returns method for creating one or more
@@ -67,7 +71,7 @@ class ReturnPicking(models.TransientModel):
             returned_picking = self.env["stock.picking"].browse(res["res_id"])
             vals_list = [
                 move._prepare_return_rma_vals(self.picking_id)
-                for move in returned_picking.move_lines
+                for move in returned_picking.move_ids
             ]
             self.env["rma"].create(vals_list)
             return res
diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
index d899ee3f..fbd46722 100644
--- a/rma/wizard/stock_picking_return_views.xml
+++ b/rma/wizard/stock_picking_return_views.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     Copyright 2023 Tecnativa - Pedro M. Baeza
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="view_stock_return_picking_form" model="ir.ui.view">
@@ -7,19 +8,17 @@
         <field name="model">stock.return.picking</field>
         <field name="inherit_id" ref="stock.view_stock_return_picking_form" />
         <field name="arch" type="xml">
-            <xpath
-                expr="//group[.//field[@name='product_return_moves']]"
-                position="before"
-            >
+            <field name="product_return_moves" position="after">
                 <group name="group_rma">
                     <field
                         name="create_rma"
                         attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"
                     />
+                    <field name="rma_location_ids" invisible="1" />
                     <field name="picking_id" invisible="1" />
                     <field name="picking_type_code" invisible="1" />
                 </group>
-            </xpath>
+            </field>
         </field>
     </record>
 </odoo>