From 71b95bd558e137958f7236ca706949901f541d3b Mon Sep 17 00:00:00 2001
From: Ernesto Tejeda <ernesto.tejeda@tecnativa.com>
Date: Wed, 13 May 2020 00:27:46 -0400
Subject: [PATCH 001/108] [ADD] rma: new module

[UPD] Update rma.pot

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/
---
 rma/README.rst                            |  152 ++
 rma/__init__.py                           |    6 +
 rma/__manifest__.py                       |   37 +
 rma/controllers/__init__.py               |    3 +
 rma/controllers/main.py                   |  132 ++
 rma/data/mail_data.xml                    |   46 +
 rma/data/rma_operation_data.xml           |   12 +
 rma/hooks.py                              |   70 +
 rma/i18n/es.po                            | 1635 +++++++++++++++++++++
 rma/i18n/rma.pot                          | 1485 +++++++++++++++++++
 rma/models/__init__.py                    |   12 +
 rma/models/account_invoice.py             |   35 +
 rma/models/res_company.py                 |   23 +
 rma/models/res_partner.py                 |   41 +
 rma/models/res_users.py                   |   14 +
 rma/models/rma.py                         | 1144 ++++++++++++++
 rma/models/rma_operation.py               |   15 +
 rma/models/rma_team.py                    |   56 +
 rma/models/stock_move.py                  |   96 ++
 rma/models/stock_picking.py               |   41 +
 rma/models/stock_warehouse.py             |  118 ++
 rma/readme/CONFIGURE.rst                  |    8 +
 rma/readme/CONTRIBUTORS.rst               |    5 +
 rma/readme/DESCRIPTION.rst                |    8 +
 rma/readme/ROADMAP.rst                    |    3 +
 rma/readme/USAGE.rst                      |   37 +
 rma/report/report.xml                     |   14 +
 rma/security/ir.model.access.csv          |    8 +
 rma/security/rma_security.xml             |   60 +
 rma/static/description/icon.png           |  Bin 0 -> 7450 bytes
 rma/static/description/index.html         |  496 +++++++
 rma/tests/__init__.py                     |    3 +
 rma/tests/test_rma.py                     |  638 ++++++++
 rma/views/menus.xml                       |   24 +
 rma/views/report_rma.xml                  |   96 ++
 rma/views/res_partner_views.xml           |   23 +
 rma/views/rma_portal_templates.xml        |  269 ++++
 rma/views/rma_team_views.xml              |   90 ++
 rma/views/rma_views.xml                   |  285 ++++
 rma/views/stock_picking_views.xml         |   23 +
 rma/views/stock_warehouse_views.xml       |   17 +
 rma/wizard/__init__.py                    |    5 +
 rma/wizard/rma_delivery.py                |  102 ++
 rma/wizard/rma_delivery_views.xml         |   50 +
 rma/wizard/rma_split.py                   |   70 +
 rma/wizard/rma_split_views.xml            |   33 +
 rma/wizard/stock_picking_return.py        |   83 ++
 rma/wizard/stock_picking_return_views.xml |   20 +
 48 files changed, 7643 insertions(+)
 create mode 100644 rma/README.rst
 create mode 100644 rma/__init__.py
 create mode 100644 rma/__manifest__.py
 create mode 100644 rma/controllers/__init__.py
 create mode 100644 rma/controllers/main.py
 create mode 100644 rma/data/mail_data.xml
 create mode 100644 rma/data/rma_operation_data.xml
 create mode 100644 rma/hooks.py
 create mode 100644 rma/i18n/es.po
 create mode 100644 rma/i18n/rma.pot
 create mode 100644 rma/models/__init__.py
 create mode 100644 rma/models/account_invoice.py
 create mode 100644 rma/models/res_company.py
 create mode 100644 rma/models/res_partner.py
 create mode 100644 rma/models/res_users.py
 create mode 100644 rma/models/rma.py
 create mode 100644 rma/models/rma_operation.py
 create mode 100644 rma/models/rma_team.py
 create mode 100644 rma/models/stock_move.py
 create mode 100644 rma/models/stock_picking.py
 create mode 100644 rma/models/stock_warehouse.py
 create mode 100644 rma/readme/CONFIGURE.rst
 create mode 100644 rma/readme/CONTRIBUTORS.rst
 create mode 100644 rma/readme/DESCRIPTION.rst
 create mode 100644 rma/readme/ROADMAP.rst
 create mode 100644 rma/readme/USAGE.rst
 create mode 100644 rma/report/report.xml
 create mode 100644 rma/security/ir.model.access.csv
 create mode 100644 rma/security/rma_security.xml
 create mode 100644 rma/static/description/icon.png
 create mode 100644 rma/static/description/index.html
 create mode 100644 rma/tests/__init__.py
 create mode 100644 rma/tests/test_rma.py
 create mode 100644 rma/views/menus.xml
 create mode 100644 rma/views/report_rma.xml
 create mode 100644 rma/views/res_partner_views.xml
 create mode 100644 rma/views/rma_portal_templates.xml
 create mode 100644 rma/views/rma_team_views.xml
 create mode 100644 rma/views/rma_views.xml
 create mode 100644 rma/views/stock_picking_views.xml
 create mode 100644 rma/views/stock_warehouse_views.xml
 create mode 100644 rma/wizard/__init__.py
 create mode 100644 rma/wizard/rma_delivery.py
 create mode 100644 rma/wizard/rma_delivery_views.xml
 create mode 100644 rma/wizard/rma_split.py
 create mode 100644 rma/wizard/rma_split_views.xml
 create mode 100644 rma/wizard/stock_picking_return.py
 create mode 100644 rma/wizard/stock_picking_return_views.xml

diff --git a/rma/README.rst b/rma/README.rst
new file mode 100644
index 000000000..788f6684a
--- /dev/null
+++ b/rma/README.rst
@@ -0,0 +1,152 @@
+===========================================
+Return Merchandise Authorization Management
+===========================================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :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/12.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-12-0/rma-12-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/12.0
+    :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5| 
+
+This module allows you to manage `Return Merchandise Authorization (RMA)
+<https://en.wikipedia.org/wiki/Return_merchandise_authorization>`_.
+RMA documents can be created from scratch, from a delivery order or from
+an incoming email. Product receptions and returning delivery operations
+of the RMA module are fully integrated with the Receipts and Deliveries
+Operations of Odoo inventory core module. It also allows you to generate
+refunds in the same way as Odoo generates it.
+Besides, you have full integration of the RMA documents in the customer portal.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+If you want RMAs to be created from incoming emails, you need to:
+
+#. Go to *Settings > General Settings*.
+#. Check 'External Email Servers' checkbox under *Discuss* section.
+#. Set an 'alias domain' and an incoming server.
+#. Go to *RMA > Configuration > RMA Team* and select a team or create a new
+   one.
+#. Go to 'Email' tab and set an 'Email Alias'.
+
+Usage
+=====
+
+To use this module, you need to:
+
+#. Go to *RMA > Orders* and create a new RMA.
+#. Select a partner, an invoice address, select a product
+   (or select a picking and a move instead), write a quantity, fill the rest
+   of the form and click on 'confirm' button in the status bar.
+#. You will see an smart button labeled 'Receipt'. Click on that button to see
+   the reception operation form.
+#. If everything is right, validate the operation and go back to the RMA to
+   see it in a 'received' state.
+#. Now you are able to generate a refund, generate a delivery order to return
+   to the customer the same product or another product as a replacement, split
+   the RMA by extracting a part of the remaining quantity to another RMA,
+   preview the RMA in the website. All of these operations can be done by
+   clicking on the buttons in the status bar.
+
+   * If you click on 'Refund' button, a refund will be created, and it will be
+     accessible via the smart button labeled Refund. The RMA will be set
+     automatically to 'Refunded' state when the refund is validated.
+   * If you click on 'Replace' or 'Return to customer' button instead,
+     a popup wizard will guide you to create a Delivery order to the client
+     and this order will be accessible via the smart button labeled Delivery.
+     The RMA will be set automatically to 'Replaced' or 'Returned' state when
+     the RMA quantity is equal or lower than the quantity in done delivery
+     orders linked to it.
+
+An RMA can also be created from a return of a delivery order:
+
+#. Select a delivery order and click on 'Return' button to create a return.
+#. Check "Create RMAs" checkbox in the returning wizard, select the RMA
+   stock location and click on 'Return' button.
+#. An RMA will be created for each product returned in the previous step.
+   Every RMA will be in confirmed state and they will
+   be linked to the returning operation generated previously.
+
+**Note: An RMA can also be created from an incoming email (See configuration
+section).**
+
+Known issues / Roadmap
+======================
+
+* 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
+  the product of that move is.
+
+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:%2012.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Tecnativa
+
+Contributors
+~~~~~~~~~~~~
+
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+  * Ernesto Tejeda
+  * Pedro M. Baeza
+  * David Vidal
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-ernestotejeda| 
+
+This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/12.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/__init__.py b/rma/__init__.py
new file mode 100644
index 000000000..336227cc4
--- /dev/null
+++ b/rma/__init__.py
@@ -0,0 +1,6 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import controllers
+from . import models
+from . import wizard
+from .hooks import  post_init_hook
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
new file mode 100644
index 000000000..c06a9a0ad
--- /dev/null
+++ b/rma/__manifest__.py
@@ -0,0 +1,37 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+{
+    "name": "Return Merchandise Authorization Management",
+    "summary": "Return Merchandise Authorization (RMA)",
+    "version": "12.0.1.0.0",
+    "development_status": "Beta",
+    "category": "RMA",
+    "website": "https://github.com/OCA/rma",
+    "author": "Tecnativa, Odoo Community Association (OCA)",
+    "maintainers": ["ernestotejeda"],
+    "license": "AGPL-3",
+    "depends": [
+        "account",
+        "stock",
+    ],
+    "data": [
+        "views/report_rma.xml",
+        "report/report.xml",
+        "data/mail_data.xml",
+        "data/rma_operation_data.xml",
+        "security/rma_security.xml",
+        "security/ir.model.access.csv",
+        "wizard/stock_picking_return_views.xml",
+        "wizard/rma_delivery_views.xml",
+        "wizard/rma_split_views.xml",
+        "views/menus.xml",
+        "views/res_partner_views.xml",
+        "views/rma_portal_templates.xml",
+        "views/rma_team_views.xml",
+        "views/rma_views.xml",
+        "views/stock_picking_views.xml",
+        "views/stock_warehouse_views.xml",
+    ],
+    'post_init_hook': 'post_init_hook',
+    "application": True,
+}
diff --git a/rma/controllers/__init__.py b/rma/controllers/__init__.py
new file mode 100644
index 000000000..f43232f01
--- /dev/null
+++ b/rma/controllers/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import main
diff --git a/rma/controllers/main.py b/rma/controllers/main.py
new file mode 100644
index 000000000..f53942f1f
--- /dev/null
+++ b/rma/controllers/main.py
@@ -0,0 +1,132 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, exceptions, http
+from odoo.exceptions import AccessError, MissingError
+from odoo.http import request
+from odoo.addons.portal.controllers.portal import CustomerPortal,\
+    pager as portal_pager
+from odoo.tools import consteq
+
+
+class PortalRma(CustomerPortal):
+
+    def _prepare_portal_layout_values(self):
+        values = super()._prepare_portal_layout_values()
+        values['rma_count'] = request.env['rma'].search_count([])
+        return values
+
+    def _rma_get_page_view_values(self, rma, access_token, **kwargs):
+        values = {
+            'page_name': 'RMA',
+            'rma': rma,
+        }
+        return self._get_page_view_values(
+            rma, access_token, values, 'my_rmas_history', False, **kwargs)
+
+    def _get_filter_domain(self, kw):
+        return []
+
+    @http.route(['/my/rmas', '/my/rmas/page/<int:page>'],
+                type='http', auth="user", website=True)
+    def portal_my_rmas(self, page=1, date_begin=None, date_end=None,
+                       sortby=None, **kw):
+        values = self._prepare_portal_layout_values()
+        rma_obj = request.env['rma']
+        domain = self._get_filter_domain(kw)
+        searchbar_sortings = {
+            'date': {'label': _('Date'), 'order': 'date desc'},
+            'name': {'label': _('Name'), 'order': 'name desc'},
+            'state': {'label': _('Status'), 'order': 'state'},
+        }
+        # default sort by order
+        if not sortby:
+            sortby = 'date'
+        order = searchbar_sortings[sortby]['order']
+        archive_groups = self._get_archive_groups('rma', domain)
+        if date_begin and date_end:
+            domain += [
+                ('create_date', '>', date_begin),
+                ('create_date', '<=', date_end),
+            ]
+        # count for pager
+        rma_count = rma_obj.search_count(domain)
+        # pager
+        pager = portal_pager(
+            url="/my/rmas",
+            url_args={
+                'date_begin': date_begin,
+                'date_end': date_end,
+                'sortby': sortby,
+            },
+            total=rma_count,
+            page=page,
+            step=self._items_per_page
+        )
+        # content according to pager and archive selected
+        rmas = rma_obj.search(
+            domain,
+            order=order,
+            limit=self._items_per_page,
+            offset=pager['offset']
+        )
+        request.session['my_rmas_history'] = rmas.ids[:100]
+        values.update({
+            'date': date_begin,
+            'rmas': rmas,
+            'page_name': 'RMA',
+            'pager': pager,
+            'archive_groups': archive_groups,
+            'default_url': '/my/rmas',
+            'searchbar_sortings': searchbar_sortings,
+            'sortby': sortby,
+        })
+        return request.render("rma.portal_my_rmas", values)
+
+    @http.route(['/my/rmas/<int:rma_id>'],
+                type='http', auth="public", website=True)
+    def portal_my_rma_detail(self, rma_id, access_token=None,
+                             report_type=None, download=False, **kw):
+        try:
+            rma_sudo = self._document_check_access('rma', rma_id, access_token)
+        except (AccessError, MissingError):
+            return request.redirect('/my')
+        if report_type in ('html', 'pdf', 'text'):
+            return self._show_report(
+                model=rma_sudo,
+                report_type=report_type,
+                report_ref='rma.report_rma_action',
+                download=download,
+            )
+
+        values = self._rma_get_page_view_values(rma_sudo, access_token, **kw)
+        return request.render("rma.portal_rma_page", values)
+
+    @http.route(['/my/rma/picking/pdf/<int:picking_id>'],
+                type='http', auth="public", website=True)
+    def portal_my_rma_picking_report(self, picking_id, access_token=None,
+                                     **kw):
+        try:
+            picking_sudo = self._stock_picking_check_access(
+                picking_id, access_token=access_token)
+        except exceptions.AccessError:
+            return request.redirect('/my')
+        report_sudo = request.env.ref('stock.action_report_delivery').sudo()
+        pdf = report_sudo.render_qweb_pdf([picking_sudo.id])[0]
+        pdfhttpheaders = [
+            ('Content-Type', 'application/pdf'),
+            ('Content-Length', len(pdf)),
+        ]
+        return request.make_response(pdf, headers=pdfhttpheaders)
+
+    def _stock_picking_check_access(self, picking_id, access_token=None):
+        picking = request.env['stock.picking'].browse([picking_id])
+        picking_sudo = picking.sudo()
+        try:
+            picking.check_access_rights('read')
+            picking.check_access_rule('read')
+        except exceptions.AccessError:
+            if not access_token or not consteq(
+                    picking_sudo.sale_id.access_token, access_token):
+                raise
+        return picking_sudo
diff --git a/rma/data/mail_data.xml b/rma/data/mail_data.xml
new file mode 100644
index 000000000..207747bc6
--- /dev/null
+++ b/rma/data/mail_data.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data noupdate="1">
+    <!-- rma-related subtypes for messaging / Chatter -->
+    <record id="mt_rma_draft" model="mail.message.subtype">
+        <field name="name">Draft RMA</field>
+        <field name="res_model">rma</field>
+        <field name="default" eval="False"/>
+        <field name="description">New RMA in draft state</field>
+    </record>
+    <!-- rma_team-related subtypes for messaging / Chatter -->
+    <record id="mt_rma_team_rma_draft" model="mail.message.subtype">
+        <field name="name">Draft RMA</field>
+        <field name="sequence">10</field>
+        <field name="res_model">rma.team</field>
+        <field name="default" eval="True"/>
+        <field name="parent_id" eval="ref('rma.mt_rma_draft')"/>
+        <field name="relation_field">team_id</field>
+    </record>
+    <!--RMA email template -->
+    <record id="mail_template_rma_notification" model="mail.template">
+        <field name="name">RMA Notification</field>
+        <field name="model_id" ref="model_rma"/>
+        <field name="email_from">${object.user_id.email_formatted |safe}</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_template" ref="report_rma_action" />
+        <field name="report_name">${(object.name or '')}</field>
+        <field name="lang">${object.partner_id.lang}</field>
+        <field name="user_signature" eval="True"/>
+        <field name="auto_delete" eval="True"/>
+        <field name="body_html" type="html">
+<div style="margin: 0px; padding: 0px;">
+<p style="margin: 0px; padding: 0px; font-size: 13px;">
+    Dear ${object.partner_id.name}
+    % if object.partner_id.parent_id:
+        (${object.partner_id.parent_id.name})
+    % endif
+    <br /><br />
+    Here is the RMA <strong>${object.name}</strong> from ${object.company_id.name}.
+    <br /><br />
+    Do not hesitate to contact us if you have any question.
+</p>
+</div>
+        </field>
+    </record>
+</data>
diff --git a/rma/data/rma_operation_data.xml b/rma/data/rma_operation_data.xml
new file mode 100644
index 000000000..60ea6e044
--- /dev/null
+++ b/rma/data/rma_operation_data.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data noupdate="1">
+    <record id="rma_operation_replace" model="rma.operation">
+        <field name="name">Replace</field>
+    </record>
+    <record id="rma_operation_return" model="rma.operation">
+        <field name="name">Repair</field>
+    </record>
+    <record id="rma_operation_refund" model="rma.operation">
+        <field name="name">Refund</field>
+    </record>
+</data>
diff --git a/rma/hooks.py b/rma/hooks.py
new file mode 100644
index 000000000..f5e24d848
--- /dev/null
+++ b/rma/hooks.py
@@ -0,0 +1,70 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, SUPERUSER_ID
+
+
+def post_init_hook(cr, registry):
+    env = api.Environment(cr, SUPERUSER_ID, {})
+
+    def _get_next_picking_type_color():
+        """ Choose the next available color for the operation types."""
+        stock_picking_type = env['stock.picking.type']
+        picking_type = stock_picking_type.search_read(
+            [('warehouse_id', '!=', False), ('color', '!=', False)],
+            ['color'],
+            order='color',
+        )
+        all_used_colors = [res['color'] for res in picking_type]
+        available_colors = [color for color in range(0, 12)
+                            if color not in all_used_colors]
+        return available_colors[0] if available_colors else 0
+
+    def create_rma_locations(warehouse):
+        stock_location = env['stock.location']
+        location_vals = warehouse._get_locations_values({})
+        for field_name, values in location_vals.items():
+            if field_name == 'rma_loc_id' and not warehouse.rma_loc_id:
+                warehouse.rma_loc_id = stock_location.with_context(
+                    active_test=False).create(values).id
+
+    def create_rma_picking_types(whs):
+        ir_sequence_sudo = env['ir.sequence'].sudo()
+        stock_picking_type = env['stock.picking.type']
+        color = _get_next_picking_type_color()
+        stock_picking = stock_picking_type.search(
+            [('sequence', '!=', False)], limit=1, order='sequence desc')
+        max_sequence = stock_picking.sequence or 0
+        create_data = whs._get_picking_type_create_values(max_sequence)[0]
+        sequence_data = whs._get_sequence_values()
+        data = {}
+        for picking_type, values in create_data.items():
+            if (picking_type in ['rma_in_type_id', 'rma_out_type_id']
+                    and not whs[picking_type]):
+                picking_sequence = sequence_data[picking_type]
+                sequence = ir_sequence_sudo.create(picking_sequence)
+                values.update(
+                    warehouse_id=whs.id,
+                    color=color,
+                    sequence_id=sequence.id,
+                )
+                data[picking_type] = stock_picking_type.create(values).id
+
+        rma_out_type = stock_picking_type.browse(data['rma_out_type_id'])
+        rma_out_type.write({
+            'return_picking_type_id': data.get('rma_in_type_id', False)
+        })
+        rma_in_type = stock_picking_type.browse(data['rma_in_type_id'])
+        rma_in_type.write({
+            'return_picking_type_id': data.get('rma_out_type_id', False)
+        })
+        whs.write(data)
+
+    # Create rma locations and picking types
+    warehouses = env['stock.warehouse'].search([])
+    for warehouse in warehouses:
+        create_rma_locations(warehouse)
+        create_rma_picking_types(warehouse)
+    # Create rma sequence per company
+    for company in env['res.company'].search([]):
+        company.create_rma_index()
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
new file mode 100644
index 000000000..242403e8d
--- /dev/null
+++ b/rma/i18n/es.po
@@ -0,0 +1,1635 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-21 05:13+0000\n"
+"PO-Revision-Date: 2020-06-21 01:16-0400\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 2.0.6\n"
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_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
+#: code:addons/rma/models/rma_team.py:43
+#, python-format
+msgid "%s (copy)"
+msgstr "%s (copia)"
+
+#. 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"
+"</div>\n"
+"        "
+msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"    Estimado ${object.partner_id.name}\n"
+"    % if object.partner_id.parent_id:\n"
+"        (${object.partner_id.parent_id.name})\n"
+"    % endif\n"
+"    <br/><br/>\n"
+"    Aquí tiene el RMA <strong>${object.name}</strong> Desde ${object."
+"company_id.name}.\n"
+"    <br/><br/>\n"
+"    No dude en ponerse en contacto con nosotros si tiene alguna pregunta.\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\"/>"
+msgstr ""
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
+"\"Descargar\"/>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<i class=\"fa fa-fw fa-check\"/> <b>Paid</b>"
+msgstr "<i class=\"fa fa-fw fa-check\"/><b>Pagado</b>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<i class=\"fa fa-fw fa-clock-o\"/> <b>Waiting Payment</b>"
+msgstr "<i class=\"fa fa-fw fa-clock-o\"/><b>Esperando Pago</b>"
+
+#. 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 ""
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Descargar\"/>"
+
+#. 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 ""
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
+"\"Descargar\"/>"
+
+#. 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>"
+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>"
+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>"
+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>"
+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.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr "<strong class=\"d-block mb-1\">Órdenes de entrega</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr "<strong class=\"d-block mb-1\">Recepción</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr "<strong class=\"d-block mb-1\">Factura rectificativa</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr "<strong>Cliente:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr "<strong>Fecha:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr "<strong>Fecha límite:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr "<strong>Fecha límite:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr "<strong>Cantidad entregada:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr "<strong>Cantidad entregada</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Invoicing address:</strong>"
+msgstr "<strong>Dirección de facturación:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr "<strong>Movimiento:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr "<strong>Orden de Entrega:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#, fuzzy
+#| msgid "<strong>Origin delivery:</strong>"
+msgid "<strong>Origin delivery</strong>"
+msgstr "<strong>Orden de Entrega:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr "<strong>Referencia:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr "<strong>Referencia:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr "<strong>Producto:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr "<strong>Producto</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr "<strong>Cantidad:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr "<strong>Cantidad</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr "<strong>Fecha</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr "<strong>Nota:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr "<strong>Responsable:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr "<strong>Estado:</strong>"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+"Diccionario Python a evaluar para proporcionar valores por defecto cuando un "
+"nuevo registro se cree para este seudónimo."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Accept Emails From"
+msgstr "Aceptar los correos electrónicos de"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr "Alerta de acceso"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr "Acción Necesaria"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+msgid "Active"
+msgstr "Activo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr "Actividades"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr "Estado de la actividad"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr "Seudónimo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr "Seudónimo del contacto de seguridad"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr "Seudónimo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr "Seudónimo del dominio"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr "Modelo con seudónimo"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr "Conteo de archivos adjuntos"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr "Puede ser bloquedo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr "Puede ser reembolsado"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr "Puede ser reemplazado"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr "Puede ser devuelto"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr "Puede ser dividido"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Canceled"
+msgstr "Cancelado"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr "Click para agregar un nuevo RMA."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr "Entidad comercial"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr "Compañía"
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr "Crear RMAs"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr "Creado el"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr "URL del portal de cliente"
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:38
+#: model:ir.model.fields,field_description:rma.field_rma__date
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr "Fecha"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr "Fecha:"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr "Valores por defecto"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr "Entregar"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered qty"
+msgstr "Ctd. entregada"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered qty done"
+msgstr "Ctd. entregada realizada"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr "Entrega"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr "Cantidad de entregas"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr "Movimientos de entrega"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Description"
+msgstr "Descripción"
+
+#. module: rma
+#: 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_operation__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_team__display_name
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr "RMA en estado Borrador"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:1076
+#, python-format
+msgid ""
+"E-mail subject: %s\n"
+"\n"
+"E-mail body:\n"
+"%s"
+msgstr ""
+"Asunto del correo electrónico: %s\n"
+"\n"
+"Cuerpo del correo electrónico:\n"
+"%s"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr "Pseudónimo de correo"
+
+#. module: rma
+#: code:addons/rma/wizard/rma_split.py:63
+#, python-format
+msgid "Extracted RMA"
+msgstr "RMA Extraído"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr "Extraído de"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+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 (Canales)"
+
+#. 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
+msgid "Followers (Partners)"
+msgstr "Seguidores (Empresas)"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+msgstr "Agrupar por"
+
+#. 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_operation__id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_team__id
+msgid "ID"
+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)"
+msgstr ""
+"ID del registro padre que tiene el seudónimo. (ejemplo: el proyecto que "
+"contiene el seudónimo para la creación de tareas)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_unread
+#: 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_needaction
+#: model:ir.model.fields,help:rma.field_rma_team__message_needaction
+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_team__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr "Si se encuentra marcado, algunos mensajes tienen error de envío."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
+msgstr ""
+"Si el campo activo se establece a Falso, permitirá ocultar El equipo de RMA "
+"sin eliminarlo."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:1080
+#, python-format
+msgid "Incoming e-mail"
+msgstr "Correo electrónico entrante"
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Linea de factura"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr "Es un seguidor"
+
+#. module: rma
+#: 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_operation____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_team____last_update
+msgid "Last Modified on"
+msgstr "Última modificación en"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr "Última actualización por"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr "Última actualización el"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr "Ubicación"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr "Bloquear"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Locked"
+msgstr "Bloqueado"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr "Adjuntos principales"
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr "Autorización de Devolución de Mercancía (RMA)."
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr "Responsable"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr "Error de Envío de Mensaje"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:39
+#: model:ir.model.fields,field_description:rma.field_rma__name
+#: model:ir.model.fields,field_description:rma.field_rma_operation__name
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+msgid "Name"
+msgstr "Nombre"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:496
+#: code:addons/rma/models/rma.py:1079
+#, python-format
+msgid "New"
+msgstr "Nuevo"
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "New RMA in draft state"
+msgstr "Nuevo RMA en estado Borrador"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "Siguiente plazo de actividad"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr "Resumen de la siguiente actividad"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+msgid "Next Activity Type"
+msgstr "Siguiente tipo de actividad"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:757
+#, python-format
+msgid "None of the selected RMAs can perform a replacement."
+msgstr "Ninguno de los RMAs seleccionados puede realizar un reemplazo."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:740
+#, python-format
+msgid "None of the selected RMAs can perform a return."
+msgstr "Ninguno de los RMAs seleccionados puede realizar una devolución."
+
+#. module: rma
+#: selection:rma,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: rma
+#: selection:rma,priority:0
+msgid "Not urgent"
+msgstr "No Urgente"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr "Número de acciones"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of error"
+msgstr "Número de error"
+
+#. 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"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+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 ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+"Id. opcional de un hilo (registro) al que todos los mensajes entrantes serán "
+"adjuntados, incluso si no fueron respuestas del mismo. Si se establece, se "
+"deshabilitará completamente la creación de nuevos registros."
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr "Órdenes"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr "Orden de Entrega"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr "Movimiento"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: rma
+#: selection:rma,activity_state:0
+msgid "Overdue"
+msgstr "Vencidas"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr "Propietario"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr "Modelo padre"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+msgstr "ID del hilo del registro padre"
+
+#. 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) and task (model))"
+msgstr ""
+"Modelo padre que contiene el alias. El modelo que contiene la referencia "
+"alias no es necesariamente el modelo dado por alias_model_id"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: rma
+#: selection:rma,activity_state:0
+msgid "Planned"
+msgstr "Planeado"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+msgstr ""
+"Política para publicar un mensaje en el documento utilizando el servidor de "
+"correo.\n"
+"- todo el mundo: todos pueden publicar\n"
+"- socios: sólo socios autenticados\n"
+"- seguidores: sólo seguidores del documento relacionado o miembros de los "
+"siguientes canales\n"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr "URL de acceso al portal"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr "Previsualizar"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr "Prioridad"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr "Grupo de abastecimiento"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr "Producto"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr "Cantidad"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: rma
+#: code:addons/rma/wizard/rma_delivery.py:49 sql_constraint:rma.split.wizard:0
+#, python-format
+msgid "Quantity must be greater than 0."
+msgstr "La cantidad debe ser mayor que cero."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract"
+msgstr "Cantidad a extraer"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:790
+#, python-format
+msgid ""
+"Quantity to extract cannot be greater than remaining delivery quantity (%s "
+"%s)"
+msgstr ""
+"La cantidad a extraer no puede ser mayor que la cantidad de entrega "
+"restante(%s %s)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr "Cantidad a extraer en nuevo RMA"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_invoice_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/res_company.py:18
+#, python-format
+msgid "RMA Code"
+msgstr "Código de RMA"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:82
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr "Órdenes de entrega de RMA"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+msgid "RMA Delivery Wizard"
+msgstr "Asistente de entrega de RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr "Tipo de operación para recepción de RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr "Ubicación de RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr "Orden de RMA -"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr "Órdenes de RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr "Tipo de operación para entrega de RMA"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:73
+#, python-format
+msgid "RMA Receipts"
+msgstr "Recepciones de RMA"
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr "Reporte de RMA"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr "Asistente para dividir RMA"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr "Equipo de RMA"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr "Equipo de RMA del cual el usuario es miembro."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr "Cantidad de RMAs"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr "RMAs que originaron esta orden"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr "RMA que realizó esta devolución"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr "Equipo de RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr "Recepción"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
+msgid "Received"
+msgstr "Recibido"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr "Movimiento de recepción"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr "Id. del hilo de registro"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+msgid "Reference of the document that generated this RMA."
+msgstr "Referencia al documento que generó este RMA."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:679
+#: model:ir.model.fields,field_description:rma.field_rma__refund_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: model:rma.operation,name:rma.rma_operation_refund
+#, python-format
+msgid "Refund"
+msgstr "Factura rectificativa"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
+msgid "Refund address for current RMA."
+msgstr "Dirección de facturación de este RMA."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund line"
+msgstr "Línea de factura rectificativa"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Refunded"
+msgstr "reembolsado"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr "Ctd. entregada restante"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr "Ctd. entregada restante por realizar"
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: selection:rma.delivery.wizard,type:0
+#: model:rma.operation,name:rma.rma_operation_replace
+msgid "Replace"
+msgstr "Reemplazar"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr "Reemplazar producto"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Replaced"
+msgstr "Reemplazado"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:995
+#, 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 ""
+"Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
+"id=\"%d\">%s</a> (Orden de entrega <a href=\"#\" data-oe-model=\"stock."
+"picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:1006
+#, 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 ""
+"Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-"
+"oe-id=\"%d\">%s</a><br/>Cantidad %f %s<br/>El reemplazo realizado no creó un "
+"movimiento nuevo, pero uno de los movimientos creados anteriormente fué "
+"actualizado con estos datos."
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_reporting_menu
+msgid "Reporting"
+msgstr "Informes"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+#, fuzzy
+#| msgid "Type of Operation"
+msgid "Requested operation"
+msgstr "Tipo de operación"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:721
+#, python-format
+msgid "Required field(s):%s"
+msgstr "Campo(s) requerido(s):%s"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+msgid "Responsible User"
+msgstr "Usuario responsable"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking
+msgid "Return Picking"
+msgstr "Albarán de devolución"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: selection:rma.delivery.wizard,type:0
+msgid "Return to customer"
+msgstr "Devolver al cliente"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:956
+#, python-format
+msgid ""
+"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
+"a> has been created."
+msgstr ""
+"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking"
+"\" data-oe-id=\"%d\">%s</a> ha sido creada."
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Returned"
+msgstr "Devuelto"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+msgid "Rma Count"
+msgstr "Cantidad de RMAs"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
+msgid "Scheduled Date"
+msgstr "Fecha prevista"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr "Token de seguridad"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr "Enviar por correo electrónico"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr "Enviar por correo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr "Enviado"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:48
+#, python-format
+msgid "Sequence RMA in"
+msgstr "Secuencia de recepción de RMA"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:53
+#, python-format
+msgid "Sequence RMA out"
+msgstr "Secuencia de entrega de RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr "Establecer a borrador"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr "Compartir"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr "Dividir"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+msgid "Split RMA"
+msgstr "Dividir RMA"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:874
+#, python-format
+msgid ""
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
+"created."
+msgstr ""
+"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</"
+"a> ha sido creado."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__state
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "State"
+msgstr "Provincia"
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:40
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#, python-format
+msgid "Status"
+msgstr "Estado"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+"Estado basado en actividades\n"
+"Vencida: la fecha tope ya ha pasado\n"
+"Hoy: La fecha tope es hoy\n"
+"Planificada: futuras actividades."
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de existencias"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr "Regla de Inventario"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr "Líder del equipo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr "Miembros del equipo"
+
+#. module: rma
+#: sql_constraint:rma.operation:0
+msgid "That operation name already exists !"
+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)"
+msgstr ""
+"El modelo (Tipo de documento de Odoo) al que corresponde este seudónimo. "
+"Cualquier correo entrante que no sea respuesta a un registro existente, "
+"causará la creación de un nuevo registro de este modelo"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
+msgstr ""
+"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos"
+"\",  si lo que quiere es obtener los correos para <trabajos@example.odoo."
+"com>."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+"El propietario de los registros creados al recibir correos electrónicos en "
+"este seudónimo. Si el campo no está establecido, el sistema tratará de "
+"encontrar el propietario adecuado basado en la dirección del emisor (De), o "
+"usará la cuenta de administrador si no se encuentra un usuario para esa "
+"dirección."
+
+#. module: rma
+#: code:addons/rma/models/stock_move.py:60
+#, 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 cantidad realizada para el producto '%s' debe ser igual a la demanda "
+"inicial porque el movimiento está enlazado a un RMA (%s)."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:778
+#, python-format
+msgid "The quantity to return is greater than remaining quantity."
+msgstr "La cantidad a devolver es mayor que la cantidad restante del RMA."
+
+#. module: rma
+#: code:addons/rma/models/account_invoice.py:22
+#, python-format
+msgid ""
+"There is at least one invoice lines whose quantity is less than the quantity "
+"specified in its linked RMA."
+msgstr ""
+"Hay al menos una linea de factura que tiene una cantidad menor que la "
+"cantidad especificada en el RMA asociado."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:767
+#, python-format
+msgid "This RMA cannot be split."
+msgstr "Este RMA no puede ser dividido."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:754
+#, python-format
+msgid "This RMA cannot perform a replacement."
+msgstr "Este RMA no puede realizar un reemplazo."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:737
+#, python-format
+msgid "This RMA cannot perform a return."
+msgstr "Este RMA no puede realizar una devolución."
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr "Reembolsar"
+
+#. module: rma
+#: selection:rma,activity_state:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+msgid "Transfer"
+msgstr "Transferir"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr "Tipo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr "Tipo de operación"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr "RMAs no asignados"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr "Unidad de Medida"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr "UdM"
+
+#. module: rma
+#: selection:rma,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_all
+msgid "User: All Documents"
+msgstr "Usuario: Mostrar todos los documentos"
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+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
+#: selection:rma,priority:0
+msgid "Very Urgent"
+msgstr "Muy Urgente"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Waiting for refund"
+msgstr "Esperando por reembolso"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Waiting for replacement"
+msgstr "Esperando por reemplazo"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Waiting for return"
+msgstr "Esperando por devolución"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr "Mensajes del sitio web"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr "Historial de comunicaciones del sitio web"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:514
+#, python-format
+msgid "You cannot delete RMAs that are not in draft state"
+msgstr "No puede "
+
+#. module: rma
+#: code:addons/rma/wizard/stock_picking_return.py:56
+#, python-format
+msgid ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
+msgstr ""
+"Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los "
+"RMAs serán creados."
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+"El usuario tendrá acceso a todos los registros de RMA de todos lo usuarios."
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr "El usuario tendrá acceso solo a sus propios RMAs"
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+msgid ""
+"the user will have an access to the RMA configuration as well as statistic "
+"reports."
+msgstr ""
+"El usuario tendrá acceso a la configuración de RMA y a los informes "
+"estadísticos."
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
new file mode 100644
index 000000000..7b327b2b5
--- /dev/null
+++ b/rma/i18n/rma.pot
@@ -0,0 +1,1485 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_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
+#: code:addons/rma/models/rma_team.py:43
+#, python-format
+msgid "%s (copy)"
+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"
+"</div>\n"
+"        "
+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\"/>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<i class=\"fa fa-fw fa-check\"/> <b>Paid</b>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<i class=\"fa fa-fw fa-clock-o\"/> <b>Waiting Payment</b>"
+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\" 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\"><i class=\"fa fa-fw fa-times\"/> Cancelled</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>"
+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>"
+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>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Invoicing address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin delivery</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+msgid "A Python dictionary that will be evaluated to provide default values when creating new records for this alias."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Accept Emails From"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+msgid "Active"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr ""
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#: selection:rma,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+msgid "Customer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:38
+#: model:ir.model.fields,field_description:rma.field_rma__date
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered qty done"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Description"
+msgstr ""
+
+#. module: rma
+#: 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_operation__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_team__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#: selection:rma,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:1076
+#, python-format
+msgid "E-mail subject: %s\n"
+"\n"
+"E-mail body:\n"
+"%s"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/rma_split.py:63
+#, python-format
+msgid "Extracted RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+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
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+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_operation__id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_team__id
+msgid "ID"
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_unread
+#: 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_needaction
+#: model:ir.model.fields,help:rma.field_rma_team__message_needaction
+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_team__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid "If the active field is set to false, it will allow you to hide the RMA Team without removing it."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:1080
+#, python-format
+msgid "Incoming e-mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: rma
+#: 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_operation____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_team____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr ""
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:39
+#: model:ir.model.fields,field_description:rma.field_rma__name
+#: model:ir.model.fields,field_description:rma.field_rma_operation__name
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:31
+#: code:addons/rma/models/rma.py:496
+#: code:addons/rma/models/rma.py:1079
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "New RMA in draft state"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:757
+#, python-format
+msgid "None of the selected RMAs can perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:740
+#, python-format
+msgid "None of the selected RMAs can perform a return."
+msgstr ""
+
+#. module: rma
+#: selection:rma,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: rma
+#: selection:rma,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of error"
+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 ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+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 "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr ""
+
+#. module: rma
+#: selection:rma,activity_state:0
+msgid "Overdue"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+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) and task (model))"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr ""
+
+#. module: rma
+#: selection:rma,activity_state:0
+msgid "Planned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+""
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Quantity"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/rma_delivery.py:49
+#: sql_constraint:rma.split.wizard:0
+#, python-format
+msgid "Quantity must be greater than 0."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:790
+#, python-format
+msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_invoice_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/res_company.py:18
+#, python-format
+msgid "RMA Code"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:82
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+msgid "RMA Delivery Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:73
+#, python-format
+msgid "RMA Receipts"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#: selection:rma,state:0
+msgid "Received"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+msgid "Reference of the document that generated this RMA."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:679
+#: model:ir.model.fields,field_description:rma.field_rma__refund_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: model:rma.operation,name:rma.rma_operation_refund
+#, python-format
+msgid "Refund"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
+msgid "Refund address for current RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund line"
+msgstr ""
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr ""
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: selection:rma.delivery.wizard,type:0
+#: model:rma.operation,name:rma.rma_operation_replace
+msgid "Replace"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr ""
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Replaced"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:995
+#, 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 ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:1006
+#, 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 ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_reporting_menu
+msgid "Reporting"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+msgid "Requested operation"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:721
+#, python-format
+msgid "Required field(s):%s"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: selection:rma.delivery.wizard,type:0
+msgid "Return to customer"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:956
+#, python-format
+msgid "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a> has been created."
+msgstr ""
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+msgid "Rma Count"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:48
+#, python-format
+msgid "Sequence RMA in"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:53
+#, python-format
+msgid "Sequence RMA out"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+msgid "Split RMA"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:874
+#, python-format
+msgid "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been created."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__state
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "State"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:40
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#, python-format
+msgid "Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid "Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr ""
+
+#. module: rma
+#: sql_constraint:rma.operation:0
+msgid "That operation name already exists !"
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+msgid "The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.odoo.com>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid "The owner of records created upon receiving emails on this alias. If this field is not set the system will attempt to find the right owner based on the sender (From) address, or will use the Administrator account if no system user is found for that address."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_move.py:60
+#, 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 ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:778
+#, python-format
+msgid "The quantity to return is greater than remaining quantity."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/account_invoice.py:22
+#, python-format
+msgid "There is at least one invoice lines whose quantity is less than the quantity specified in its linked RMA."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:767
+#, python-format
+msgid "This RMA cannot be split."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:754
+#, python-format
+msgid "This RMA cannot perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:737
+#, python-format
+msgid "This RMA cannot perform a return."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr ""
+
+#. module: rma
+#: selection:rma,activity_state:0
+msgid "Today"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr ""
+
+#. module: rma
+#: selection:rma,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_all
+msgid "User: All Documents"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+msgid "User: Own Documents Only"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: rma
+#: selection:rma,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Waiting for refund"
+msgstr ""
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Waiting for replacement"
+msgstr ""
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Waiting for return"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:514
+#, python-format
+msgid "You cannot delete RMAs that are not in draft state"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/stock_picking_return.py:56
+#, python-format
+msgid "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will be created"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid "the user will have access to all records of everyone in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+msgid "the user will have an access to the RMA configuration as well as statistic reports."
+msgstr ""
+
diff --git a/rma/models/__init__.py b/rma/models/__init__.py
new file mode 100644
index 000000000..134da114c
--- /dev/null
+++ b/rma/models/__init__.py
@@ -0,0 +1,12 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import account_invoice
+from . import rma
+from . import rma_operation
+from . import rma_team
+from . import res_company
+from . import res_partner
+from . import res_users
+from . import stock_move
+from . import stock_picking
+from . import stock_warehouse
diff --git a/rma/models/account_invoice.py b/rma/models/account_invoice.py
new file mode 100644
index 000000000..731891cff
--- /dev/null
+++ b/rma/models/account_invoice.py
@@ -0,0 +1,35 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, fields, models
+from odoo.exceptions import ValidationError
+from odoo.tools import float_compare
+
+
+class AccountInvoice(models.Model):
+    _inherit = 'account.invoice'
+
+    def action_invoice_open(self):
+        """ Avoids to validate a refund with less quantity of product than
+        quantity in the linked RMA.
+        """
+        precision = self.env['decimal.precision'].precision_get(
+            'Product Unit of Measure')
+        if self.mapped('invoice_line_ids').filtered(
+                lambda r: (r.rma_id and float_compare(
+                    r.quantity, r.rma_id.product_uom_qty, precision) < 0)):
+            raise ValidationError(
+                _("There is at least one invoice lines whose quantity is "
+                  "less than the quantity specified in its linked RMA."))
+        res = super().action_invoice_open()
+        self.mapped('invoice_line_ids.rma_id').write({'state': 'refunded'})
+        return res
+
+
+class AccountInvoiceLine(models.Model):
+    _inherit = 'account.invoice.line'
+
+    rma_id = fields.Many2one(
+        comodel_name='rma',
+        string='RMA',
+    )
diff --git a/rma/models/res_company.py b/rma/models/res_company.py
new file mode 100644
index 000000000..555f09bd9
--- /dev/null
+++ b/rma/models/res_company.py
@@ -0,0 +1,23 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, models, _
+
+
+class Company(models.Model):
+    _inherit = "res.company"
+
+    @api.model
+    def create(self, vals):
+        company = super(Company, self).create(vals)
+        company.create_rma_index()
+        return company
+
+    def create_rma_index(self):
+        self.env['ir.sequence'].sudo().create({
+            'name': _('RMA Code'),
+            'prefix': 'RMA',
+            'code': 'rma',
+            'padding': 4,
+            'company_id': self.id,
+        })
diff --git a/rma/models/res_partner.py b/rma/models/res_partner.py
new file mode 100644
index 000000000..494c267a3
--- /dev/null
+++ b/rma/models/res_partner.py
@@ -0,0 +1,41 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    rma_ids = fields.One2many(
+        comodel_name='rma',
+        inverse_name='partner_id',
+        string='RMAs',
+    )
+    rma_count = fields.Integer(
+        string='RMA count',
+        compute='_compute_rma_count',
+    )
+
+    def _compute_rma_count(self):
+        rma_data = self.env['rma'].read_group(
+            [('partner_id', 'in', self.ids)], ['partner_id'], ['partner_id'])
+        mapped_data = dict(
+            [(r['partner_id'][0], r['partner_id_count']) for r in rma_data])
+        for record in self:
+            record.rma_count = mapped_data.get(record.id, 0)
+
+    def action_view_rma(self):
+        self.ensure_one()
+        action = self.env.ref('rma.rma_action').read()[0]
+        rma = self.rma_ids
+        if len(rma) == 1:
+            action.update(
+                res_id=rma.id,
+                view_mode="form",
+                view_id=False,
+                views=False,
+            )
+        else:
+            action['domain'] = [('partner_id', 'in', self.ids)]
+        return action
diff --git a/rma/models/res_users.py b/rma/models/res_users.py
new file mode 100644
index 000000000..4cce3c9a1
--- /dev/null
+++ b/rma/models/res_users.py
@@ -0,0 +1,14 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class ResUsers(models.Model):
+    _inherit = 'res.users'
+
+    rma_team_id = fields.Many2one(
+        comodel_name='rma.team',
+        string="RMA Team",
+        help='RMA Team the user is member of.',
+    )
diff --git a/rma/models/rma.py b/rma/models/rma.py
new file mode 100644
index 000000000..8367c5b36
--- /dev/null
+++ b/rma/models/rma.py
@@ -0,0 +1,1144 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+from odoo.tests import Form
+from odoo.tools import html2plaintext
+import odoo.addons.decimal_precision as dp
+from odoo.addons.stock.models.stock_move import PROCUREMENT_PRIORITIES
+from collections import Counter
+
+
+class Rma(models.Model):
+    _name = "rma"
+    _description = "RMA"
+    _order = "date desc, priority"
+    _inherit = ["mail.thread", "portal.mixin", "mail.activity.mixin"]
+
+    def _domain_location_id(self):
+        rma_loc = self.env['stock.warehouse'].search([]).mapped('rma_loc_id')
+        return [('id', 'child_of', rma_loc.ids)]
+
+    # General fields
+    sent = fields.Boolean()
+    name = fields.Char(
+        string='Name',
+        index=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+        copy=False,
+        default=lambda self: _('New'),
+    )
+    origin = fields.Char(
+        string='Source Document',
+        states={
+            'locked': [('readonly', True)],
+            'cancelled': [('readonly', True)],
+        },
+        help="Reference of the document that generated this RMA.",
+    )
+    date = fields.Datetime(
+        default=lambda self: fields.Datetime.now(),
+        index=True,
+        required=True,
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+    )
+    deadline = fields.Date(
+        states={
+            'locked': [('readonly', True)],
+            'cancelled': [('readonly', True)],
+        },
+    )
+    user_id = fields.Many2one(
+        comodel_name="res.users",
+        string="Responsible",
+        track_visibility="always",
+        default=lambda self: self.env.user,
+        states={
+            'locked': [('readonly', True)],
+            'cancelled': [('readonly', True)],
+        },
+    )
+    team_id = fields.Many2one(
+        comodel_name="rma.team",
+        string="RMA team",
+        index=True,
+        states={
+            'locked': [('readonly', True)],
+            'cancelled': [('readonly', True)],
+        },
+    )
+    company_id = fields.Many2one(
+        comodel_name="res.company",
+        default=lambda self: self.env.user.company_id,
+        states={
+            'locked': [('readonly', True)],
+            'cancelled': [('readonly', True)],
+        },
+    )
+    partner_id = fields.Many2one(
+        string="Customer",
+        comodel_name="res.partner",
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+        index=True,
+        track_visibility='always'
+    )
+    partner_invoice_id = fields.Many2one(
+        string="Invoice Address",
+        comodel_name="res.partner",
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+        domain=[('customer', '=', True)],
+        help="Refund address for current RMA."
+    )
+    commercial_partner_id = fields.Many2one(
+        comodel_name="res.partner",
+        related="partner_id.commercial_partner_id",
+    )
+    picking_id = fields.Many2one(
+        comodel_name="stock.picking",
+        string="Origin Delivery",
+        domain="["
+               "    ('state', '=', 'done'),"
+               "    ('picking_type_id.code', '=', 'outgoing'),"
+               "    ('partner_id', 'child_of', commercial_partner_id),"
+               "]",
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+    )
+    move_id = fields.Many2one(
+        comodel_name='stock.move',
+        string='Origin move',
+        domain="["
+               "    ('picking_id', '=', picking_id),"
+               "    ('picking_id', '!=', False)"
+               "]",
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+    )
+    product_id = fields.Many2one(
+        comodel_name="product.product",
+        domain=[('type', 'in', ['consu', 'product'])],
+    )
+    product_uom_qty = fields.Float(
+        string="Quantity",
+        required=True,
+        default=1.0,
+        digits=dp.get_precision('Product Unit of Measure'),
+        readonly=True,
+        states={'draft': [('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,
+    )
+    procurement_group_id = fields.Many2one(
+        comodel_name='procurement.group',
+        string='Procurement group',
+        readonly=True,
+        states={
+            'draft': [('readonly', False)],
+            'confirmed': [('readonly', False)],
+            'received': [('readonly', False)],
+        },
+    )
+    priority = fields.Selection(
+        string="Priority",
+        selection=PROCUREMENT_PRIORITIES,
+        default="1",
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+    )
+    operation_id = fields.Many2one(
+        comodel_name='rma.operation',
+        string='Requested operation',
+    )
+    state = fields.Selection(
+        [
+            ("draft", "Draft"),
+            ("confirmed", "Confirmed"),
+            ("received", "Received"),
+            ("waiting_refund", "Waiting for refund"),
+            ("waiting_return", "Waiting for return"),
+            ("waiting_replacement", "Waiting for replacement"),
+            ("refunded", "Refunded"),
+            ("returned", "Returned"),
+            ("replaced", "Replaced"),
+            ("locked", "Locked"),
+            ("cancelled", "Canceled"),
+        ],
+        default="draft",
+        copy=False,
+        track_visibility="onchange",
+    )
+    description = fields.Text(
+        states={
+            'locked': [('readonly', True)],
+            'cancelled': [('readonly', True)],
+        },
+    )
+    # Reception fields
+    location_id = fields.Many2one(
+        comodel_name='stock.location',
+        domain=_domain_location_id,
+        readonly=True,
+        states={'draft': [('readonly', False)]},
+    )
+    warehouse_id = fields.Many2one(
+        comodel_name='stock.warehouse',
+        compute="_compute_warehouse_id",
+        store=True,
+    )
+    reception_move_id = fields.Many2one(
+        comodel_name='stock.move',
+        string='Reception move',
+        copy=False,
+    )
+    # Refund fields
+    refund_id = fields.Many2one(
+        comodel_name='account.invoice',
+        string='Refund',
+        readonly=True,
+        copy=False,
+    )
+    refund_line_id = fields.Many2one(
+        comodel_name='account.invoice.line',
+        string='Refund line',
+        readonly=True,
+        copy=False,
+    )
+    can_be_refunded = fields.Boolean(
+        compute="_compute_can_be_refunded"
+    )
+    # Delivery fields
+    delivery_move_ids = fields.One2many(
+        comodel_name='stock.move',
+        inverse_name='rma_id',
+        string='Delivery reservation',
+        readonly=True,
+        copy=False,
+    )
+    delivery_picking_count = fields.Integer(
+        string='Delivery count',
+        compute='_compute_delivery_picking_count',
+    )
+    delivered_qty = fields.Float(
+        string="Delivered qty",
+        digits=dp.get_precision('Product Unit of Measure'),
+        compute='_compute_delivered_qty',
+        store=True,
+    )
+    delivered_qty_done = fields.Float(
+        string="Delivered qty done",
+        digits=dp.get_precision('Product Unit of Measure'),
+        compute='_compute_delivered_qty',
+    )
+    can_be_returned = fields.Boolean(
+        compute="_compute_can_be_returned",
+    )
+    can_be_replaced = fields.Boolean(
+        compute="_compute_can_be_replaced",
+    )
+    can_be_locked = fields.Boolean(
+        compute="_compute_can_be_locked",
+    )
+    remaining_qty = fields.Float(
+        string="Remaining delivered qty",
+        digits=dp.get_precision('Product Unit of Measure'),
+        compute='_compute_remaining_qty',
+    )
+    remaining_qty_to_done = fields.Float(
+        string="Remaining delivered qty to done",
+        digits=dp.get_precision('Product Unit of Measure'),
+        compute='_compute_remaining_qty',
+    )
+    # Split fields
+    can_be_split = fields.Boolean(
+        compute="_compute_can_be_split",
+    )
+    origin_split_rma_id = fields.Many2one(
+        comodel_name='rma',
+        string='Extracted from',
+        readonly=True,
+        copy=False,
+    )
+
+    def _compute_delivery_picking_count(self):
+        # It is enough to count the moves to know how many pickings
+        # there are because there will be a unique move linked to the
+        # same picking and the same rma.
+        rma_data = self.env['stock.move'].read_group(
+            [('rma_id', 'in', self.ids)],
+            ['rma_id', 'picking_id'],
+            ['rma_id', 'picking_id'],
+            lazy=False,
+        )
+        mapped_data = Counter(map(lambda r: r['rma_id'][0], rma_data))
+        for record in self:
+            record.delivery_picking_count = mapped_data.get(record.id, 0)
+
+    @api.depends(
+        'delivery_move_ids',
+        'delivery_move_ids.state',
+        'delivery_move_ids.scrapped',
+        'delivery_move_ids.product_uom_qty',
+        'delivery_move_ids.reserved_availability',
+        'delivery_move_ids.quantity_done',
+        'delivery_move_ids.product_uom',
+        'product_uom',
+    )
+    def _compute_delivered_qty(self):
+        """ Compute 'delivered_qty' and 'delivered_qty_done' fields.
+
+        delivered_qty: represents the quantity delivery or to be
+        delivery. For each move in delivery_move_ids the quantity done
+        is taken, if it is empty the reserved quantity is taken,
+        otherwise the initial demand is taken.
+
+        delivered_qty_done: represents the quantity delivered and done.
+        For each 'done' move in delivery_move_ids the quantity done is
+        taken. This field is used to control when the RMA cam be set
+        to 'delivered' state.
+        """
+        for record in self:
+            delivered_qty = 0.0
+            delivered_qty_done = 0.0
+            for move in record.delivery_move_ids.filtered(
+                    lambda r: r.state != 'cancel' and not r.scrapped):
+                if move.quantity_done:
+                    quantity_done = move.product_uom._compute_quantity(
+                        move.quantity_done, record.product_uom)
+                    if move.state == 'done':
+                        delivered_qty_done += quantity_done
+                    delivered_qty += quantity_done
+                elif move.reserved_availability:
+                    delivered_qty += move.product_uom._compute_quantity(
+                        move.reserved_availability, record.product_uom)
+                elif move.product_uom_qty:
+                    delivered_qty += move.product_uom._compute_quantity(
+                        move.product_uom_qty, record.product_uom)
+            record.delivered_qty = delivered_qty
+            record.delivered_qty_done = delivered_qty_done
+
+    @api.depends('product_uom_qty', 'delivered_qty', 'delivered_qty_done')
+    def _compute_remaining_qty(self):
+        """ Compute 'remaining_qty' and 'remaining_qty_to_done' fields.
+
+        remaining_qty: is used to set a default quantity of replacing
+        or returning of product to the customer.
+
+        remaining_qty_to_done: the aim of this field to control when the
+        RMA cam be set to 'delivered' state. An RMA with
+        remaining_qty_to_done <= 0 can be set to 'delivery'. It is used
+        in stock.move._action_done method of stock.move and
+        rma.extract_quantity.
+        """
+        for r in self:
+            r.remaining_qty = r.product_uom_qty - r.delivered_qty
+            r.remaining_qty_to_done = r.product_uom_qty - r.delivered_qty_done
+
+    @api.depends(
+        'state',
+    )
+    def _compute_can_be_refunded(self):
+        """ Compute 'can_be_refunded'. This field controls the visibility
+        of 'Refund' button in the rma form view and determinates if
+        an rma can be refunded. It is used in rma.action_refund method.
+        """
+        for record in self:
+            record.can_be_refunded = record.state == 'received'
+
+    @api.depends('remaining_qty', 'state')
+    def _compute_can_be_returned(self):
+        """ Compute 'can_be_returned'. This field controls the visibility
+        of the 'Return to customer' button in the rma form
+        view and determinates if an rma can be returned to the customer.
+        This field is used in:
+        rma._compute_can_be_split
+        rma._ensure_can_be_returned.
+        """
+        for r in self:
+            r.can_be_returned = (r.state in ['received', 'waiting_return']
+                                 and r.remaining_qty > 0)
+
+    @api.depends('state')
+    def _compute_can_be_replaced(self):
+        """ Compute 'can_be_replaced'. This field controls the visibility
+        of 'Replace' button in the rma form
+        view and determinates if an rma can be replaced.
+        This field is used in:
+        rma._compute_can_be_split
+        rma._ensure_can_be_replaced.
+        """
+        for r in self:
+            r.can_be_replaced = r.state in ['received', 'waiting_replacement',
+                                            'replaced']
+
+    @api.depends('product_uom_qty', 'state', 'remaining_qty',
+                 'remaining_qty_to_done')
+    def _compute_can_be_split(self):
+        """ Compute 'can_be_split'. This field controls the
+        visibility of 'Split' button in the rma form view and
+        determinates if an rma can be split.
+        This field is used in:
+        rma._ensure_can_be_split
+        """
+        for r in self:
+            if (r.product_uom_qty > 1
+                and ((r.state == 'waiting_return' and r.remaining_qty > 0)
+                     or (r.state == 'waiting_replacement'
+                         and r.remaining_qty_to_done > 0))):
+                r.can_be_split = True
+            else:
+                r.can_be_split = False
+
+    @api.depends('remaining_qty_to_done', 'state')
+    def _compute_can_be_locked(self):
+        for r in self:
+            r.can_be_locked = (r.remaining_qty_to_done > 0
+                               and r.state in ['received', 'waiting_refund',
+                                               'waiting_return',
+                                               'waiting_replacement'])
+
+    @api.depends('location_id')
+    def _compute_warehouse_id(self):
+        for record in self.filtered('location_id'):
+            record.warehouse_id = self.env['stock.warehouse'].search(
+                [('rma_loc_id', 'parent_of', record.location_id.id)], limit=1)
+
+    def _compute_access_url(self):
+        for record in self:
+            record.access_url = '/my/rmas/{}'.format(record.id)
+
+    # Constrains methods (@api.constrains)
+    @api.constrains('state', 'partner_id', 'partner_invoice_id', 'product_id')
+    def _check_required_after_draft(self):
+        """ Check that RMAs are being created or edited with the
+        necessary fields filled out. Only applies to 'Draft' and
+        'Cancelled' states.
+        """
+        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
+        if self.partner_id:
+            address = self.partner_id.address_get(['invoice'])
+            partner_invoice_id = address.get('invoice', False)
+        self.partner_invoice_id = partner_invoice_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):
+        domain_product_uom = []
+        if self.product_id:
+            # Set UoM and UoM domain (product_uom)
+            domain_product_uom = [
+                ('category_id', '=', self.product_id.uom_id.category_id.id)
+            ]
+            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.user.company_id
+                warehouse = self.env['stock.warehouse'].search(
+                    [('company_id', '=', company.id)], limit=1)
+                self.location_id = warehouse.rma_loc_id.id
+        return {'domain': {'product_uom': domain_product_uom}}
+
+    # CRUD methods (ORM overrides)
+    @api.model
+    def create(self, vals):
+        if vals.get('name', _('New')) == _('New'):
+            ir_sequence = self.env['ir.sequence']
+            if 'company_id' in vals:
+                ir_sequence = ir_sequence.with_context(
+                    force_company=vals['company_id'])
+            vals['name'] = ir_sequence.next_by_code('rma')
+        return super().create(vals)
+
+    def copy(self, default=None):
+        team = super().copy(default)
+        for follower in self.message_follower_ids:
+            team.message_subscribe(partner_ids=follower.partner_id.ids,
+                                   subtype_ids=follower.subtype_ids.ids)
+        return team
+
+    def unlink(self):
+        if self.filtered(lambda r: r.state != 'draft'):
+            raise ValidationError(
+                _("You cannot delete RMAs that are not in draft state"))
+        return super().unlink()
+
+    # Action methods
+    def action_rma_send(self):
+        self.ensure_one()
+        template = self.env.ref('rma.mail_template_rma_notification', False)
+        form = self.env.ref('mail.email_compose_message_wizard_form', False)
+        ctx = {
+            'default_model': 'rma',
+            'default_res_id': self.ids[0],
+            'default_use_template': bool(template),
+            'default_template_id': template and template.id or False,
+            'default_composition_mode': 'comment',
+            'mark_rma_as_sent': True,
+            'model_description': 'RMA',
+            'force_email': True
+        }
+        return {
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'mail.compose.message',
+            'views': [(form.id, 'form')],
+            'view_id': form.id,
+            'target': 'new',
+            'context': ctx,
+        }
+
+    def action_confirm(self):
+        """Invoked when 'Confirm' button in rma form view is clicked."""
+        self.ensure_one()
+        self._ensure_required_fields()
+        if self.state == 'draft':
+            if self.picking_id:
+                reception_move = self._create_receptions_from_picking()
+            else:
+                reception_move = self._create_receptions_from_product()
+            self.write({
+                'reception_move_id': reception_move.id,
+                'state': 'confirmed',
+            })
+            if self.partner_id not in self.message_partner_ids:
+                self.message_subscribe([self.partner_id.id])
+
+    def action_refund(self):
+        """Invoked when 'Refund' button in rma form view is clicked
+        and 'rma_refund_action_server' server action is run.
+        """
+        group_dict = {}
+        for record in self.filtered("can_be_refunded"):
+            key = (record.partner_invoice_id.id, record.company_id.id)
+            group_dict.setdefault(key, self.env['rma'])
+            group_dict[key] |= record
+        for rmas in group_dict.values():
+            origin = ', '.join(rmas.mapped('name'))
+            invoice_form = Form(self.env['account.invoice'].with_context(
+                default_type='out_refund',
+                company_id=rmas[0].company_id.id,
+            ))
+            rmas[0]._prepare_refund(invoice_form, origin)
+            refund = invoice_form.save()
+            for rma in rmas:
+                with invoice_form.invoice_line_ids.new() as line_form:
+                    rma._prepare_refund_line(line_form)
+                # 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 instead of save the form. We also need
+                # the new refund line id to be linked to the rma.
+                refund_vals = invoice_form._values_to_save(all_fields=True)
+                line_vals = refund_vals['invoice_line_ids'][-1][2]
+                line_vals.update(invoice_id=refund.id, rma_id=rma.id)
+                line = self.env['account.invoice.line'].create(line_vals)
+                rma.write({
+                    'refund_line_id': line.id,
+                    'refund_id': refund.id,
+                    'state': 'waiting_refund',
+                })
+            refund.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."""
+        self.ensure_one()
+        self._ensure_can_be_replaced()
+        action = self.env.ref("rma.rma_delivery_wizard_action").read()[0]
+        action['name'] = 'Replace product(s)'
+        action['context'] = dict(self.env.context)
+        action['context'].update(
+            active_id=self.id,
+            active_ids=self.ids,
+            rma_delivery_type='replace',
+        )
+        return action
+
+    def action_return(self):
+        """Invoked when 'Return to customer' button in rma form
+        view is clicked.
+        """
+        self.ensure_one()
+        self._ensure_can_be_returned()
+        action = self.env.ref("rma.rma_delivery_wizard_action").read()[0]
+        action['context'] = dict(self.env.context)
+        action['context'].update(
+            active_id=self.id,
+            active_ids=self.ids,
+            rma_delivery_type='return',
+        )
+        return action
+
+    def action_split(self):
+        """Invoked when 'Split' button in rma form view is clicked."""
+        self.ensure_one()
+        self._ensure_can_be_split()
+        action = self.env.ref("rma.rma_split_wizard_action").read()[0]
+        action['context'] = dict(self.env.context)
+        action['context'].update(active_ids=self.ids)
+        return action
+
+    def action_cancel(self):
+        """Invoked when 'Cancel' button in rma form view is clicked."""
+        self.mapped('reception_move_id')._action_cancel()
+        self.write({'state': 'cancelled'})
+
+    def action_draft(self):
+        cancelled_rma = self.filtered(lambda r: r.state == 'cancelled')
+        cancelled_rma.write({'state': 'draft'})
+
+    def action_lock(self):
+        """Invoked when 'Lock' button in rma form view is clicked."""
+        self.filtered("can_be_locked").write({'state': 'locked'})
+
+    def action_unlock(self):
+        """Invoked when 'Unlock' button in rma form view is clicked."""
+        locked_rma = self.filtered(lambda r: r.state == 'locked')
+        locked_rma.write({'state': 'received'})
+
+    def action_preview(self):
+        """Invoked when 'Preview' button in rma form view is clicked."""
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_url',
+            'target': 'self',
+            'url': self.get_portal_url(),
+        }
+
+    def action_view_receipt(self):
+        """Invoked when 'Receipt' smart button in rma form view is clicked."""
+        self.ensure_one()
+        action = self.env.ref('stock.action_picking_tree_all').read()[0]
+        action.update(
+            res_id=self.reception_move_id.picking_id.id,
+            view_mode="form",
+            view_id=False,
+            views=False,
+        )
+        return action
+
+    def action_view_refund(self):
+        """Invoked when 'Refund' smart button in rma form view is clicked."""
+        self.ensure_one()
+        return {
+            'name': _('Refund'),
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'account.invoice',
+            'views': [(self.env.ref('account.invoice_form').id, 'form')],
+            'res_id': self.refund_id.id,
+        }
+
+    def action_view_delivery(self):
+        """Invoked when 'Delivery' smart button in rma form view is clicked."""
+        action = self.env.ref('stock.action_picking_tree_all').read()[0]
+        picking = self.delivery_move_ids.mapped('picking_id')
+        if len(picking) > 1:
+            action['domain'] = [('id', 'in', picking.ids)]
+        elif picking:
+            action.update(
+                res_id=picking.id,
+                view_mode="form",
+                view_id=False,
+                views=False,
+            )
+        return action
+
+    # Validation business methods
+    def _ensure_required_fields(self):
+        """ This method is used to ensure the following fields are not empty:
+        ['partner_id', 'partner_invoice_id', 'product_id', 'location_id']
+
+        This method is intended to be called on confirm RMA action and is
+        invoked by:
+        rma._check_required_after_draft
+        rma.action_confirm
+        """
+        ir_translation = self.env['ir.translation']
+        required = ['partner_id', 'partner_invoice_id', 'product_id',
+                    'location_id']
+        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]
+            if desc:
+                raise ValidationError(_('Required field(s):%s') % desc)
+
+    def _ensure_can_be_returned(self):
+        """ This method is intended to be invoked after user click on
+        'Replace' or 'Return to customer' button (before the delivery wizard
+        is launched) and after confirm the wizard.
+
+        This method is invoked by:
+        rma.action_replace
+        rma.action_return
+        rma.create_replace
+        rma.create_return
+        """
+        if len(self) == 1:
+            if not self.can_be_returned:
+                raise ValidationError(
+                    _("This RMA cannot perform a return."))
+        elif not self.filtered("can_be_returned"):
+            raise ValidationError(
+                _("None of the selected RMAs can perform a return."))
+
+    def _ensure_can_be_replaced(self):
+        """ This method is intended to be invoked after user click on
+        'Replace' button (before the delivery wizard
+        is launched) and after confirm the wizard.
+
+        This method is invoked by:
+        rma.action_replace
+        rma.create_replace
+        """
+        if len(self) == 1:
+            if not self.can_be_replaced:
+                raise ValidationError(
+                    _("This RMA cannot perform a replacement."))
+        elif not self.filtered("can_be_replaced"):
+            raise ValidationError(
+                _("None of the selected RMAs can perform a replacement."))
+
+    def _ensure_can_be_split(self):
+        """intended to be called before launch and after save the split wizard.
+        invoked by:
+        rma.action_split
+        rma.extract_quantity
+        """
+        self.ensure_one()
+        if not self.can_be_split:
+            raise ValidationError(_("This RMA cannot be split."))
+
+    def _ensure_qty_to_return(self, qty=None, uom=None):
+        """ This method is intended to be invoked after confirm the wizard.
+        invoked by: rma.create_return
+        """
+        if qty and uom:
+            if uom != self.product_uom:
+                qty = uom._compute_quantity(qty, self.product_uom)
+            if qty > self.remaining_qty:
+                raise ValidationError(
+                    _("The quantity to return is greater than "
+                      "remaining quantity."))
+
+    def _ensure_qty_to_extract(self, qty, uom):
+        """ This method is intended to be invoked after confirm the wizard.
+        invoked by: rma.extract_quantity
+        """
+        to_split_uom_qty = qty
+        if uom != self.product_uom:
+            to_split_uom_qty = uom._compute_quantity(qty, self.product_uom)
+        if to_split_uom_qty > self.remaining_qty:
+            raise ValidationError(
+                _("Quantity to extract cannot be greater than remaining "
+                  "delivery quantity (%s %s)")
+                % (self.remaining_qty, self.product_uom.name)
+            )
+
+    # Reception business methods
+    def _create_receptions_from_picking(self):
+        self.ensure_one()
+        create_vals = {}
+        if self.location_id:
+            create_vals['location_id'] = self.location_id.id
+        return_wizard = self.env['stock.return.picking'].with_context(
+            active_id=self.picking_id.id,
+            active_ids=self.picking_id.ids,
+        ).create(create_vals)
+        return_wizard.product_return_moves.filtered(
+            lambda r: r.move_id != self.move_id
+        ).unlink()
+        return_line = return_wizard.product_return_moves
+        return_line.quantity = self.product_uom_qty
+        # set_rma_picking_type is to override the copy() method of stock
+        # picking and change the default picking type to rma picking type.
+        picking_action = return_wizard.with_context(
+            set_rma_picking_type=True).create_returns()
+        picking_id = picking_action['res_id']
+        picking = self.env['stock.picking'].browse(picking_id)
+        picking.origin = "%s (%s)" % (self.name, picking.origin)
+        move = picking.move_lines
+        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.action_confirm()
+        picking.action_assign()
+        picking.message_post_with_view(
+            'mail.message_origin_link',
+            values={'self': picking, 'origin': self},
+            subtype_id=self.env.ref('mail.mt_note').id,
+        )
+        return picking.move_lines
+
+    def _prepare_picking(self, picking_form):
+        picking_form.company_id = self.company_id
+        picking_form.origin = self.name
+        picking_form.partner_id = self.partner_id
+        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
+
+    # Extract business methods
+    def extract_quantity(self, qty, uom):
+        self.ensure_one()
+        self._ensure_can_be_split()
+        self._ensure_qty_to_extract(qty, uom)
+        self.product_uom_qty -= uom._compute_quantity(qty, self.product_uom)
+        if self.remaining_qty_to_done <= 0:
+            if self.state == 'waiting_return':
+                self.state = 'returned'
+            elif self.state == 'waiting_replacement':
+                self.state = 'replaced'
+        extracted_rma = self.copy({
+            'origin': self.name,
+            'product_uom_qty': qty,
+            'product_uom': uom.id,
+            'state': 'received',
+            'reception_move_id': self.reception_move_id.id,
+            'origin_split_rma_id': self.id,
+        })
+        extracted_rma.message_post_with_view(
+            'mail.message_origin_link',
+            values={'self': extracted_rma, 'origin': self},
+            subtype_id=self.env.ref('mail.mt_note').id,
+        )
+        self.message_post(
+            body=_(
+                'Split: <a href="#" data-oe-model="rma" '
+                'data-oe-id="%d">%s</a> has been created.'
+            ) % (
+                extracted_rma.id,
+                extracted_rma.name,
+            )
+        )
+        return extracted_rma
+
+    # Refund business methods
+    def _prepare_refund(self, invoice_form, origin):
+        """ Hook method for preparing the refund Form.
+
+        This method could be override in order to add new custom field
+        values in the refund creation.
+
+        invoked by:
+        rma.action_refund
+        """
+        self.ensure_one()
+        invoice_form.company_id = self.company_id
+        invoice_form.partner_id = self.partner_invoice_id
+        invoice_form.origin = origin
+
+    def _prepare_refund_line(self, line_form):
+        """ Hook method for preparing a refund line Form.
+
+        This method could be override in order to add new custom field
+        values in the refund line creation.
+
+        invoked by:
+        rma.action_refund
+        """
+        self.ensure_one()
+        line_form.product_id = self.product_id
+        line_form.quantity = self.product_uom_qty
+        line_form.uom_id = self.product_uom
+        line_form.price_unit = self._get_refund_line_price_unit()
+
+    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
+
+    # Returning business methods
+    def create_return(self, scheduled_date, qty=None, uom=None):
+        """Intended to be invoked by the delivery wizard"""
+        self._ensure_can_be_returned()
+        self._ensure_qty_to_return(qty, uom)
+        group_dict = {}
+        for record in self.filtered('can_be_returned'):
+            key = (record.partner_id.id, record.company_id.id,
+                   record.warehouse_id)
+            group_dict.setdefault(key, self.env['rma'])
+            group_dict[key] |= record
+        for rmas in group_dict.values():
+            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()
+            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)],
+                )
+                self.env['stock.move'].create(move_vals)
+                rma.message_post(
+                    body=_(
+                        'Return: <a href="#" data-oe-model="stock.picking" '
+                        'data-oe-id="%d">%s</a> has been created.'
+                    ) % (picking.id, picking.name)
+                )
+            picking.action_confirm()
+            picking.action_assign()
+            picking.message_post_with_view(
+                'mail.message_origin_link',
+                values={'self': picking, 'origin': rmas},
+                subtype_id=self.env.ref('mail.mt_note').id,
+            )
+        self.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.company_id = self.company_id
+        picking_form.origin = origin or self.name
+        picking_form.partner_id = self.partner_id
+
+    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_expected = scheduled_date
+
+    # Replacing business methods
+    def create_replace(self, scheduled_date, warehouse, product, qty, uom):
+        """Intended to be invoked by the delivery wizard"""
+        self.ensure_one()
+        self._ensure_can_be_replaced()
+        moves_before = self.delivery_move_ids
+        self._action_launch_stock_rule(scheduled_date, warehouse, product,
+                                       qty, uom)
+        new_move = self.delivery_move_ids - moves_before
+        if new_move:
+            self.reception_move_id.move_dest_ids = [(4, new_move.id)]
+            self.message_post(
+                body=_(
+                    '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.'
+                ) % (new_move.id, new_move.name_get()[0][1],
+                     new_move.picking_id.id, new_move.picking_id.name)
+            )
+        else:
+            self.message_post(
+                body=_(
+                    '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.'
+                ) % (product.id, product.display_name, qty, uom.name)
+            )
+        if self.state != 'waiting_replacement':
+            self.state = 'waiting_replacement'
+
+    def _action_launch_stock_rule(
+        self,
+        scheduled_date,
+        warehouse,
+        product,
+        qty,
+        uom,
+    ):
+        """ Creates a delivery picking and launch stock rule. It is invoked by:
+        rma.create_replace
+        """
+        self.ensure_one()
+        if self.product_id.type not in ('consu', 'product'):
+            return
+        if not self.procurement_group_id:
+            self.procurement_group_id = self.env['procurement.group'].create({
+                'name': self.name,
+                'move_type': 'direct',
+                'partner_id': self.partner_id.id,
+            }).id
+        values = self._prepare_procurement_values(
+            self.procurement_group_id, scheduled_date, warehouse)
+        self.env['procurement.group'].run(
+            product,
+            qty,
+            uom,
+            self.partner_id.property_stock_customer,
+            self.product_id.display_name,
+            self.procurement_group_id.name,
+            values,
+        )
+
+    def _prepare_procurement_values(
+        self,
+        group_id,
+        scheduled_date,
+        warehouse,
+    ):
+        self.ensure_one()
+        return {
+            'company_id': self.company_id.id,
+            'group_id': group_id,
+            'date_planned': scheduled_date,
+            'warehouse_id': warehouse,
+            'partner_id': self.partner_id.id,
+            'rma_id': self.id,
+            'priority': self.priority,
+        }
+
+    # Mail business methods
+    def message_new(self, msg_dict, custom_values=None):
+        """Extract the needed values from an incoming rma emails data-set
+        to be used to create an RMA.
+        """
+        if custom_values is None:
+            custom_values = {}
+        subject = msg_dict.get('subject', '')
+        body = html2plaintext(msg_dict.get('body', ''))
+        desc = _("E-mail subject: %s\n\nE-mail body:\n%s") % (subject, body)
+        defaults = {
+            'description': desc,
+            'name': _('New'),
+            'origin': _('Incoming e-mail'),
+        }
+        if msg_dict.get('author_id'):
+            partner = self.env['res.partner'].browse(msg_dict.get('author_id'))
+            defaults.update(
+                partner_id=partner.id,
+                partner_invoice_id=partner.address_get(
+                    ['invoice']).get('invoice', False),
+            )
+        if msg_dict.get("priority"):
+            defaults["priority"] = msg_dict.get("priority")
+        defaults.update(custom_values)
+        rma = super().message_new(msg_dict, custom_values=defaults)
+        if (rma.user_id
+                and rma.user_id.partner_id not in rma.message_partner_ids):
+            rma.message_subscribe([rma.user_id.partner_id.id])
+        return rma
+
+    @api.returns('mail.message', lambda value: value.id)
+    def message_post(self, **kwargs):
+        """ Set 'sent' field to True when an email is sent from rma form
+        view. This field (sent) is used to set the appropriate style to the
+        'Send by Email' button in the rma form view.
+        """
+        if self.env.context.get('mark_rma_as_sent'):
+            self.write({'sent': True})
+        # mail_post_autofollow=True to include email recipient contacts as
+        # RMA followers
+        self_with_context = self.with_context(mail_post_autofollow=True)
+        return super(Rma, self_with_context).message_post(**kwargs)
+
+    # Reporting business methods
+    def _get_report_base_filename(self):
+        self.ensure_one()
+        return 'RMA Report - %s' % self.name
+
+    # Other business methods
+    def update_received_state(self):
+        """ Invoked by:
+         [stock.move].unlink
+         [stock.move]._action_cancel
+         """
+        rma = self.filtered(lambda r: r.delivered_qty == 0)
+        if rma:
+            rma.write({'state': 'received'})
+
+    def update_replaced_state(self):
+        """ Invoked by:
+         [stock.move]._action_done
+         [stock.move].unlink
+         [stock.move]._action_cancel
+         """
+        rma = self.filtered(
+            lambda r: (r.state == 'waiting_replacement'
+                       and 0 >= r.remaining_qty_to_done == r.remaining_qty))
+        if rma:
+            rma.write({'state': 'replaced'})
+
+    def update_returned_state(self):
+        """ Invoked by [stock.move]._action_done"""
+        rma = self.filtered(
+            lambda r: (r.state == 'waiting_return'
+                       and r.remaining_qty_to_done <= 0))
+        if rma:
+            rma.write({'state': 'returned'})
diff --git a/rma/models/rma_operation.py b/rma/models/rma_operation.py
new file mode 100644
index 000000000..85271aebf
--- /dev/null
+++ b/rma/models/rma_operation.py
@@ -0,0 +1,15 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class RmaOperation(models.Model):
+    _name = "rma.operation"
+    _description = "RMA requested operation"
+
+    name = fields.Char(required=True, translate=True)
+
+    _sql_constraints = [
+        ('name_uniq', 'unique (name)', "That operation name already exists !"),
+    ]
diff --git a/rma/models/rma_team.py b/rma/models/rma_team.py
new file mode 100644
index 000000000..31b600972
--- /dev/null
+++ b/rma/models/rma_team.py
@@ -0,0 +1,56 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, fields, models
+
+
+class RmaTeam(models.Model):
+    _name = "rma.team"
+    _inherit = ['mail.alias.mixin', 'mail.thread']
+    _description = "RMA Team"
+    _order = "name"
+
+    name = fields.Char(
+        required=True,
+        translate=True,
+    )
+    active = fields.Boolean(
+        default=True,
+        help="If the active field is set to false, it will allow you "
+             "to hide the RMA Team without removing it.",
+    )
+    company_id = fields.Many2one(
+        comodel_name="res.company",
+        string="Company",
+        default=lambda self: self.env.user.company_id,
+    )
+    user_id = fields.Many2one(
+        comodel_name="res.users",
+        string="Team Leader",
+        domain=[('share', '=', False)],
+        default=lambda self: self.env.user,
+    )
+    member_ids = fields.One2many(
+        comodel_name='res.users',
+        inverse_name='rma_team_id',
+        string='Team Members',
+    )
+
+    def copy(self, default=None):
+        if default is None:
+            default = {}
+        if not default.get('name'):
+            default['name'] = _("%s (copy)") % self.name
+        team = super().copy(default)
+        for follower in self.message_follower_ids:
+            team.message_subscribe(partner_ids=follower.partner_id.ids,
+                                   subtype_ids=follower.subtype_ids.ids)
+        return team
+
+    def get_alias_model_name(self, vals):
+        return vals.get('alias_model', 'rma')
+
+    def get_alias_values(self):
+        values = super().get_alias_values()
+        values['alias_defaults'] = {'team_id': self.id}
+        return values
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
new file mode 100644
index 000000000..8ab511cec
--- /dev/null
+++ b/rma/models/stock_move.py
@@ -0,0 +1,96 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class StockMove(models.Model):
+    _inherit = "stock.move"
+
+    # RMAs that were created from the delivery move
+    rma_ids = fields.One2many(
+        comodel_name='rma',
+        inverse_name='move_id',
+        string='RMAs',
+        copy=False,
+    )
+    # RMAs linked to the incoming movement from client
+    rma_receiver_ids = fields.One2many(
+        comodel_name='rma',
+        inverse_name='reception_move_id',
+        string='RMA receivers',
+        copy=False,
+    )
+    # RMA that create the delivery movement to the customer
+    rma_id = fields.Many2one(
+        comodel_name='rma',
+        string='RMA return',
+        copy=False,
+    )
+
+    def unlink(self):
+        rma_receiver = self.mapped('rma_receiver_ids')
+        rma = self.mapped('rma_id')
+        res = super().unlink()
+        rma_receiver.write({'state': 'draft'})
+        rma.update_received_state()
+        rma.update_replaced_state()
+        return res
+
+    def _action_cancel(self):
+        res = super()._action_cancel()
+        cancelled_moves = self.filtered(lambda r: r.state == 'cancel')
+        cancelled_moves.mapped('rma_receiver_ids').write({'state': 'draft'})
+        cancelled_moves.mapped('rma_id').update_received_state()
+        cancelled_moves.mapped('rma_id').update_replaced_state()
+        return res
+
+    def _action_done(self):
+        """ Avoids to validate stock.move with less quantity than the
+        quantity in the linked receiver RMA. It also set the appropriated
+        linked RMA to 'received' or 'delivered'.
+        """
+        for move in self.filtered(
+                lambda r: r.state not in ('done', 'cancel')):
+            rma_receiver = move.rma_receiver_ids
+            if (rma_receiver
+                    and move.quantity_done != rma_receiver.product_uom_qty):
+                raise ValidationError(
+                    _("The quantity done for the product '%s' must "
+                      "be equal to its initial demand because the "
+                      "stock move is linked to an RMA (%s).")
+                    % (move.product_id.name, move.rma_receiver_ids.name)
+                )
+        res = super()._action_done()
+        move_done = self.filtered(lambda r: r.state == 'done')
+        # set RMAs as received
+        to_be_received = move_done.mapped('rma_receiver_ids').filtered(
+            lambda r: r.state == 'confirmed')
+        to_be_received.write({'state': 'received'})
+        # set RMAs as delivered
+        move_done.mapped('rma_id').update_replaced_state()
+        move_done.mapped('rma_id').update_returned_state()
+        return res
+
+    @api.model
+    def _prepare_merge_moves_distinct_fields(self):
+        """ The main use is that launched delivery RMAs doesn't merge
+        two moves if they are linked to a different RMAs.
+        """
+        return super()._prepare_merge_moves_distinct_fields() + ['rma_id']
+
+    def _prepare_move_split_vals(self, qty):
+        """ Intended to the backport of picking linked to RMAs propagates the
+        RMA link id.
+        """
+        res = super()._prepare_move_split_vals(qty)
+        res['rma_id'] = self.rma_id.id
+        return res
+
+
+class StockRule(models.Model):
+    _inherit = 'stock.rule'
+
+    def _get_custom_move_fields(self):
+        return super()._get_custom_move_fields() + ['rma_id']
diff --git a/rma/models/stock_picking.py b/rma/models/stock_picking.py
new file mode 100644
index 000000000..e341be0b6
--- /dev/null
+++ b/rma/models/stock_picking.py
@@ -0,0 +1,41 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class StockPicking(models.Model):
+    _inherit = 'stock.picking'
+
+    rma_count = fields.Integer(
+        string='RMA count',
+        compute='_compute_rma_count',
+    )
+
+    def _compute_rma_count(self):
+        for rec in self:
+            rec.rma_count = len(rec.move_lines.mapped('rma_ids'))
+
+    def copy(self, default=None):
+        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
+        return super().copy(default)
+
+    def action_view_rma(self):
+        self.ensure_one()
+        action = self.env.ref('rma.rma_action').read()[0]
+        rma = self.move_lines.mapped('rma_ids')
+        if len(rma) == 1:
+            action.update(
+                res_id=rma.id,
+                view_mode="form",
+                view_id=False,
+                views=False,
+            )
+        else:
+            action['domain'] = [('id', 'in', rma.ids)]
+        return action
diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py
new file mode 100644
index 000000000..7c0716d23
--- /dev/null
+++ b/rma/models/stock_warehouse.py
@@ -0,0 +1,118 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models, _
+
+
+class StockWarehouse(models.Model):
+    _inherit = 'stock.warehouse'
+
+    # This is a strategic field used to create an rma location
+    # and rma operation types in existing warehouses when
+    # installing this module.
+    rma = fields.Boolean(
+        'RMA',
+        default=True,
+        help="RMA related products can be stored in this warehouse.")
+    rma_in_type_id = fields.Many2one(
+        comodel_name='stock.picking.type',
+        string='RMA In Type',
+    )
+    rma_out_type_id = fields.Many2one(
+        comodel_name='stock.picking.type',
+        string='RMA Out Type',
+    )
+    rma_loc_id = fields.Many2one(
+        comodel_name='stock.location',
+        string='RMA Location',
+    )
+
+    def _get_locations_values(self, vals):
+        values = super()._get_locations_values(vals)
+        values.update({
+            'rma_loc_id': {
+                'name': 'RMA',
+                'active': True,
+                'return_location': True,
+                'usage': 'internal',
+                'company_id': vals.get('company_id', self.company_id.id),
+                'location_id': self.view_location_id.id,
+            },
+        })
+        return values
+
+    def _get_sequence_values(self):
+        values = super()._get_sequence_values()
+        values.update({
+            'rma_in_type_id': {
+                'name': self.name + ' ' + _('Sequence RMA in'),
+                'prefix': self.code + '/RMA/IN/', 'padding': 5,
+                'company_id': self.company_id.id,
+            },
+            'rma_out_type_id': {
+                'name': self.name + ' ' + _('Sequence RMA out'),
+                'prefix': self.code + '/RMA/OUT/', 'padding': 5,
+                'company_id': self.company_id.id,
+            },
+        })
+        return values
+
+    def _update_name_and_code(self, new_name=False, new_code=False):
+        for warehouse in self:
+            sequence_data = warehouse._get_sequence_values()
+            warehouse.rma_in_type_id.sequence_id.write(
+                sequence_data['rma_in_type_id'])
+            warehouse.rma_in_type_id.sequence_id.write(
+                sequence_data['rma_out_type_id'])
+
+    def _get_picking_type_create_values(self, max_sequence):
+        data, next_sequence = super()._get_picking_type_create_values(
+            max_sequence)
+        data.update({
+            'rma_in_type_id': {
+                'name': _('RMA Receipts'),
+                'code': 'incoming',
+                'use_create_lots': True,
+                'use_existing_lots': False,
+                'default_location_src_id': False,
+                'default_location_dest_id': self.rma_loc_id.id,
+                'sequence': max_sequence + 1,
+            },
+            'rma_out_type_id': {
+                'name': _('RMA Delivery Orders'),
+                'code': 'outgoing',
+                'use_create_lots': False,
+                'use_existing_lots': True,
+                'default_location_src_id': self.rma_loc_id.id,
+                'default_location_dest_id': False,
+                'sequence': max_sequence + 2,
+            },
+        })
+        return data, max_sequence + 3
+
+    def _get_picking_type_update_values(self):
+        data = super()._get_picking_type_update_values()
+        data.update({
+            'rma_in_type_id': {
+                'default_location_dest_id': self.rma_loc_id.id,
+            },
+            'rma_out_type_id': {
+                'default_location_src_id': self.rma_loc_id.id,
+            },
+        })
+        return data
+
+    def _create_or_update_sequences_and_picking_types(self):
+        data = super()._create_or_update_sequences_and_picking_types()
+        stock_picking_type = self.env['stock.picking.type']
+        if 'out_type_id' in data:
+            rma_out_type = stock_picking_type.browse(data['rma_out_type_id'])
+            rma_out_type.write({
+                'return_picking_type_id': data.get('rma_in_type_id', False)
+            })
+        if 'rma_in_type_id' in data:
+            rma_in_type = stock_picking_type.browse(data['rma_in_type_id'])
+            rma_in_type.write({
+                'return_picking_type_id': data.get('rma_out_type_id', False)
+            })
+        return data
diff --git a/rma/readme/CONFIGURE.rst b/rma/readme/CONFIGURE.rst
new file mode 100644
index 000000000..c55130468
--- /dev/null
+++ b/rma/readme/CONFIGURE.rst
@@ -0,0 +1,8 @@
+If you want RMAs to be created from incoming emails, you need to:
+
+#. Go to *Settings > General Settings*.
+#. Check 'External Email Servers' checkbox under *Discuss* section.
+#. Set an 'alias domain' and an incoming server.
+#. Go to *RMA > Configuration > RMA Team* and select a team or create a new
+   one.
+#. Go to 'Email' tab and set an 'Email Alias'.
diff --git a/rma/readme/CONTRIBUTORS.rst b/rma/readme/CONTRIBUTORS.rst
new file mode 100644
index 000000000..d40522718
--- /dev/null
+++ b/rma/readme/CONTRIBUTORS.rst
@@ -0,0 +1,5 @@
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+  * Ernesto Tejeda
+  * Pedro M. Baeza
+  * David Vidal
diff --git a/rma/readme/DESCRIPTION.rst b/rma/readme/DESCRIPTION.rst
new file mode 100644
index 000000000..0c0c6fd82
--- /dev/null
+++ b/rma/readme/DESCRIPTION.rst
@@ -0,0 +1,8 @@
+This module allows you to manage `Return Merchandise Authorization (RMA)
+<https://en.wikipedia.org/wiki/Return_merchandise_authorization>`_.
+RMA documents can be created from scratch, from a delivery order or from
+an incoming email. Product receptions and returning delivery operations
+of the RMA module are fully integrated with the Receipts and Deliveries
+Operations of Odoo inventory core module. It also allows you to generate
+refunds in the same way as Odoo generates it.
+Besides, you have full integration of the RMA documents in the customer portal.
diff --git a/rma/readme/ROADMAP.rst b/rma/readme/ROADMAP.rst
new file mode 100644
index 000000000..c6cb60298
--- /dev/null
+++ b/rma/readme/ROADMAP.rst
@@ -0,0 +1,3 @@
+* 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
+  the product of that move is.
diff --git a/rma/readme/USAGE.rst b/rma/readme/USAGE.rst
new file mode 100644
index 000000000..6e6194a94
--- /dev/null
+++ b/rma/readme/USAGE.rst
@@ -0,0 +1,37 @@
+To use this module, you need to:
+
+#. Go to *RMA > Orders* and create a new RMA.
+#. Select a partner, an invoice address, select a product
+   (or select a picking and a move instead), write a quantity, fill the rest
+   of the form and click on 'confirm' button in the status bar.
+#. You will see an smart button labeled 'Receipt'. Click on that button to see
+   the reception operation form.
+#. If everything is right, validate the operation and go back to the RMA to
+   see it in a 'received' state.
+#. Now you are able to generate a refund, generate a delivery order to return
+   to the customer the same product or another product as a replacement, split
+   the RMA by extracting a part of the remaining quantity to another RMA,
+   preview the RMA in the website. All of these operations can be done by
+   clicking on the buttons in the status bar.
+
+   * If you click on 'Refund' button, a refund will be created, and it will be
+     accessible via the smart button labeled Refund. The RMA will be set
+     automatically to 'Refunded' state when the refund is validated.
+   * If you click on 'Replace' or 'Return to customer' button instead,
+     a popup wizard will guide you to create a Delivery order to the client
+     and this order will be accessible via the smart button labeled Delivery.
+     The RMA will be set automatically to 'Replaced' or 'Returned' state when
+     the RMA quantity is equal or lower than the quantity in done delivery
+     orders linked to it.
+
+An RMA can also be created from a return of a delivery order:
+
+#. Select a delivery order and click on 'Return' button to create a return.
+#. Check "Create RMAs" checkbox in the returning wizard, select the RMA
+   stock location and click on 'Return' button.
+#. An RMA will be created for each product returned in the previous step.
+   Every RMA will be in confirmed state and they will
+   be linked to the returning operation generated previously.
+
+**Note: An RMA can also be created from an incoming email (See configuration
+section).**
diff --git a/rma/report/report.xml b/rma/report/report.xml
new file mode 100644
index 000000000..5816ab294
--- /dev/null
+++ b/rma/report/report.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+        <report
+            id="report_rma_action"
+            string="RMA Report"
+            model="rma"
+            report_type="qweb-pdf"
+            file="rma.report_rma"
+            name="rma.report_rma"
+            print_report_name="object._get_report_base_filename()"
+        />
+    </data>
+</odoo>
diff --git a/rma/security/ir.model.access.csv b/rma/security/ir.model.access.csv
new file mode 100644
index 000000000..0afc4d55b
--- /dev/null
+++ b/rma/security/ir.model.access.csv
@@ -0,0 +1,8 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_rma_team_user_own,rma.team.user.own,model_rma_team,rma_group_user_own,1,0,0,0
+access_rma_team_manager,rma.team.manager,model_rma_team,rma_group_manager,1,1,1,1
+access_rma_portal,rma.portal,model_rma,base.group_portal,1,0,0,0
+access_rma_user_own,rma.user.own,model_rma,rma_group_user_own,1,1,1,0
+access_rma_manager,rma.manager,model_rma,rma_group_manager,1,1,1,1
+access_rma_operation_user_own,rma.operation.user.own,model_rma_operation,rma_group_user_own,1,0,0,0
+access_rma_operation_manager,rma.operation.manager,model_rma_operation,rma_group_manager,1,1,1,1
diff --git a/rma/security/rma_security.xml b/rma/security/rma_security.xml
new file mode 100644
index 000000000..5a8037c90
--- /dev/null
+++ b/rma/security/rma_security.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <!-- Application -->
+    <record id="rma_module_category" model="ir.module.category">
+        <field name="name">RMA</field>
+        <field name="description">Manage Return Merchandise Authorizations (RMAs).</field>
+    </record>
+    <!-- Access Groups -->
+    <record id="rma_group_user_own" model="res.groups">
+        <field name="name">User: Own Documents Only</field>
+        <field name="category_id" ref="rma_module_category"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+        <field name="comment">the user will have access to his own data in the RMA application.</field>
+    </record>
+    <record id="rma_group_user_all" model="res.groups">
+        <field name="name">User: All Documents</field>
+        <field name="category_id" ref="rma_module_category"/>
+        <field name="implied_ids" eval="[(4, ref('rma_group_user_own'))]"/>
+        <field name="comment">the user will have access to all records of everyone in the RMA application.</field>
+    </record>
+    <record id="rma_group_manager" model="res.groups">
+        <field name="name">Manager</field>
+        <field name="comment">the user will have an access to the RMA configuration as well as statistic reports.</field>
+        <field name="category_id" ref="rma_module_category"/>
+        <field name="implied_ids" eval="[(4, ref('rma_group_user_all'))]"/>
+        <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
+    </record>
+    <!-- Record Rules -->
+    <record id="rma_rule_user_own" model="ir.rule">
+        <field name="name">Personal RMAs</field>
+        <field ref="model_rma" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('rma_group_user_own'))]"/>
+    </record>
+    <record id="rma_rule_user_all" model="ir.rule">
+        <field name="name">All RMAs</field>
+        <field ref="model_rma" name="model_id"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4, ref('rma_group_user_all'))]"/>
+    </record>
+    <!-- Multi-Company Rules -->
+    <record id="rma_rule_multi_company" model="ir.rule">
+        <field name="name">RMA multi-company</field>
+        <field name="model_id" ref="model_rma"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+    <record id="rma_team_rule_multi_company" model="ir.rule">
+        <field name="name">RMA team multi-company</field>
+        <field name="model_id" ref="model_rma_team"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+    <!-- New users will belong to rma_group_user_own  -->
+    <record id="base.default_user" model="res.users">
+        <field name="groups_id" eval="[(4, ref('rma_group_user_own'))]"/>
+    </record>
+</odoo>
diff --git a/rma/static/description/icon.png b/rma/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f8ea42a5706573c60ddab7451b99b07babf29e7
GIT binary patch
literal 7450
zcmV+#9p&PQP)<h;3K|Lk000e1NJLTq004{t004{#1^@s6uE0S)00006VoOIv0RI30
z001*5eDeSR010qNS#tmY3ljhU3ljkVnw%H_000McNliru<OT!`AuDJagaiNp9H&V{
zK~#9!?VWjWRM(yFKlgU4TWf0rv<vNE2}v!P)fi;6jn_B`aN=^Dc#=w-q{c6KUQ+SA
zsyzEu;$&*#B;(Xf=DG65@l0GZD8XO@F&HBl3ox6677&YQvuHyI2}v!rdcF7kq3%wr
z)oRqOUAo^Y7jk#sd(XY+bI<vm-}#;25dbb!RA@SG-TDKv{0yT=5Cq?!<41x3vJ8SS
z>hA>a-^0)`p8xN<zK_p+olEv{?$OHc_jr%;<ExzB*YI<FMk&AG@x9;U{nU#r%lEuL
z&vOf2^&-2z_x1b*p-&XW@0UFP{QK_n9DV!kw<Jk=$ucm2@%C*@-QB2w5Vaab{wwQV
zlARBKEWdUA{$9UzopYk)u-l0U3nL^f46RN_SWFCBoen`15ml<Ml|29a`@)Ie{VrwD
zWV+sd>5^J)w<{C`P`R^3;{hyG6p78uBr++fFElDDMQt*hzuZw*r&g;}^9q2myvg(J
z1@HxyS(0cs7|`9mtxG5@{IY6uYU)dBL0C3dAJnL}*F1qGnCIo|xmm1MM4Qd14w0m<
zC|!yof6vj?^7Oa2FHw)t7@yG~1Zr3+3i7$ja)x@g!=ivPb+U+JqNsE+iUN_Sz@jJ+
zsTEKZ%?e-?Ae1gikphg;x+t1vU=&ys8)m{39v{!*)vJk0Or*E9l^Z8dV(#ftYH2<I
z<Jppo#S^PbPNr!4c9M&W-JeAzCQ`R^C$_;srKaX`m*fqGzezv<T}leYJ9Z3%1t4kJ
zG9nWalv<k0Eli*`N_1)}MccQNR9HCTJC#<8IETY7<~=Zhz#_{sv5OZ|v~3%S%a$oM
zp%}gX6_=4g(e~{m<mW53Fdu;lq;-jP!m@D55~T*_qtP1_EO~i|qT*<tcfbS^FB+4c
zPSLh)EL^fgF=ppOmlUj*R+eRA($Xl}zMVz)-KTha6&uD6EFMGW#DW6liO-iVDVSD4
z2BMRbDIUeoqG*l+6DTaQEMv3ViFSH$lZuLhY@TGLhUR*gB+D{(hl2&q(a?BW7E!Hc
zVO}2EsHm}nIyi_dNdQPT8xE@#hv&aG8<MiZbMk-*)O%~U+gX^MJs~!WTB~KrBaaLL
zFqU#i5_YR~==ZXW!)C*7v0%4Yu$fF)O(rZxBbL5CEJh=yo*v9SJy?uJWrA}$S{NBv
zl$$#=8d|z^Le8m;jGWLLmLv(u36gbS0CQg-rmimfZ{Mb`t&P66Hu^g|l~!o7fstgH
z_{>bV2Y03pokdYZ)M`;{wS?+)=#r9<Wf_OnifwR^!JZy^TUzKc80c(j!r0!fP%_cL
zNU}`)EcW0Ef`HlyQCLh2(W$AVl$J7Z=MJ4$uFzInOXrm<$PR}B%y{h<NtTIAPao=r
zmMlS-1MYs6T8&DrCL}G5=;UP5SFE7@{CRGC{`tHIN434A<aK|m_U~m6#HOcH{Pfc#
z78J}m53V2x2%?BOG?du%bP@^*2#<@ybmtD1{{Hz5OfcP0Oj_EIpJkrJvxJ0(5}%bt
zTxKQ?tCfMyPNaF(+K9oxVs|)*aXIDYp$9iEGZXzY&yfG*lY~Y`&o5wtIVdJ6Y2L!(
zIo!|to4=v>>8FWUus{LEmn=3LpBoJ1Y}gRIyMHb{JW*uv>eUo&-%jMBMG7$9u+-eV
z2|#RSrs9zBP|E%Hv#h+F@c4KI7;jhr`Z_ukO1xT{<l<tMY}rCcSlIjq#v2xZtCf}9
z_4;hSORdq6x_mjQ_uoIaht)euN?srBOQXp|U2E%z&u=$36K=B+osvS>JR2q4YuFvC
z)6sqH8kWAk`2~#8Wa9iN^C%WcqRn6+!fq!zHFe$%E&WLo5rM;Eq03;HlOAE8!1#k@
z1T+o@(J3hkG_F2gttKQajP5VKU~mp55)gxd#cllB?R>g#ALsY%p{J!qp~b1F#6%V?
zU5Ypd_i7l{!rbZW<5GYlAgd(N+SG)Op$rV6I-SzWs8q<3#O=$M=UiZx=m|?xXJ=3+
z>9gB8xMvR+l$OS==#&(q5)<cUmoy$&++CU7&cWTg6=<9ai;X2VJ$=q~OR9&nvtJ)C
zEbi_}mT9?ig-A&vIyrel4B<d_9hqr6l$ec1ZZ|gKu-WDeFzShd#j|@l^x=odl0?zA
zZN#Ld1${2N#lp4Y#~B!78AHOtP;0gB-Op4S4I!bSs6#{1L`I?s4|o5o3JIC?hpS6U
zLK7K@bzorb05cgUH98!8x_9poG~2fmo1Pxjc_fE}ma}K+G8o46dqEV3Mf|w}pahi)
zRY(XbjRs9b1fe<|5epWeOG+XtF_EZ*gh_D=gvZ4Z7867N9GXg*v<}wjaB%o9e*qXD
zG<G{DE?=IMG8QB!6BQFfTyioCa&kz>&nG@72TgeRgq%MlJe*LS&b=?A0?Zf;;lum)
zBM1UT+qVbZJx$i5KHt^`ZEeulNYs%dSR{!@AAg+1t5=g!S~_lUL{S`SxkM4>h}T!O
zIwRxt$-ID7mTA3ub;uA7&?D@y*|>S~Bv;1RC5`JrFcfxr@yZn%jvPVg>LMa0hVc0K
zaRs*bwzSZB`LcU8rUJ}ZM^8;nL@|^xbF9w2sRYIjxT@3!T)TRe&e~ccBO-`SPDZ8C
z1UCq{b&FdK4RZ#VDO(d_bU65A7CHCqz~#0!KKQ49;{1mnGSJl(oE;MuHnwHH3NXH*
z`OB_dvj!R&xMQ*K{yXn*;iHc*b$18egwHX@-IT97Gs!Z4*|lrNPgn{b|B1le_I7%2
z-3oYFi9E+rmP`x&CRyg=UAvGS4hqZ5$K~9c=!c;d1nj`7<;zJeE+(b8n1rQEgLd>K
z7Z>y3i!ahzUr%doErS#6D4iF;xS%<(XAiO@QMhee(0-cnHm@2$EeJS(N1uM0RK1?$
z!a~1UBLbO%5JZuL{CpDf^C|u6SFsKZ(0<_pZFP0DoIQ&?%d$jFYX@tRWe$Gy5wa}%
zcJ57ZbFKnHJOFw4(ML%wE+$p4C(6&B2C^*E{>2v<&Yk0CV<Sr+cmVxF4~@w_@rFwi
z5y9e>D_Oj9C4Bqa^xwHdTU{M(_4V97e_jD*EYN(icP}u~Biw!cdeEa2*Uf1J0l_)6
zU-#gHq?VMBs@Jn1E6Z;yakry`t2H%TJ$H_)=g!g9)rHAw#bmW|%V;F4xR}_53-4Km
zx}!&FI&+4M!a}n3dg79jhJ7EoU;%j>H<Gt;BeE>hef>J^_4TyX*VA+Tx&n+}Xk?is
zk32$jN(wzKEnM8cpVKup0d+AUK!_k<mStAz^`z?cq!t&GR8WB0k1u7=Xv9!gHv~vc
z4XrnCGUx<k&}MVH_XVJ-p@H`1W}@Tc@0r@fU@&lC-#)ba_Y<bkkerf2PH8FGB_(7P
z7ZdK`lM)1h_{>b=Gc#HC)KfTYHf~?KL|a`Q?F|i>?%Yv;83xV1eH=V=h_!k>7Ne1x
z#zqGGbW4H<AP%4;D~p9rKvIi~{jO-RTdmw^Y;?CG*DhURz-o0v;yt=?!6E~9J3F~~
z=@PjG1&CU$-}~xpYh%D{#^`V$0IfYeG+wzv*asgFq0z8-$r7?lO2{rLVR3#wAs**b
zg@lk)Sm<7oY%v;XKYyO~hK3>gXBws(gddib&8l&q%TQH0Tak^MH<O~*lcv`bo08(!
zmS{5=Fq}I_Q%wzq`g;2M`!U&U4BBkid^~*54oj<66Q$J>>dauSfB0c`yz~;`eiAnJ
z_xAGEkAB33vuAyt6F{v}5w6h?uGOLo3nQzjh-|%{Y`vbOoE*O`n6aZ{sQYSY;P!<J
z^Q(pNrx2$tA_2vvrDUvFL7HAqVs5VA6!hKg?KC;Nn5J{*=<e=zw;&c@qZ1FCCPbwo
zEF^^JQM$2P*RNwT8VQSx9Mu-O+tGo#zn_$-C`@)c{Z=b>Cz!6c)b4Q5H#kV&;2^hp
zd%4ls$*HO;!nIoB;^N40!joN6GQ$3eN=P7T^JelkZ$_3Rx~^TLy}q9Ih6Z|W+?apB
zggPs6(^tRB;?h#m3k%VNhWb6G<;oRKfBZ2`)z!2&H)FEd+<^FWqB$#DB?yFRH0U%M
zRAU%2_jGn*?CvHmF>zF2+6@K<dV2u~SE~v47*+K-%O!cvG08F(hXaer#NEL`+IoAr
z+R{SAC!Y|Z)sm2uM0QCDD<6A|<lNj5!}kT**(}J;rf}<4>{crsjg3RyS9LX3qj7En
z6D|l8u3X8EH{V1Rz(y9Sd3k6fBZ*E=r~dS5E}S{T;K0C$u0Q~^8V%7J4VoY}$}kTM
z(9_w;;!$iY$>E@-sR^su?DKnFNC-NoGf<XgdY#6#EX(eQK^ZVxt%T}yq%B`g;i^>>
zu2@0*7=p{y8VxCWJt=xUrO!Ug;h+7CyAv?#nvuY$fk9d3iPv5W2o{$XCMUCT>sB^y
z-3man!9c_5(_E~srp3da7?)%jqo28@p3Y9%3<exyaLfsUK#W#PjEBLSv1%1dOG_zO
zxsudzX3G#ok##@#0Uy2e(ztzFGY%LL5Cwt%@vr|%WK7J2oHH#uo3!j~9((2)BuS#}
z>QxNq&T+M_j`Jr@1byDVt}Y}=@@Yr4U%N(E04ZDb4?akiUQbqWF-h6k6P}4QRHtLZ
zYp+rH=9_a1m@rY~ORu~_+9d7PCW<1dd3mJf<x%#Pui&uTxq0y-hT2*TwY6NTt{%H9
zps&y88|yk}zn`VD`72hC?F1xk>C!2g)n1UDP06#*a_;^2=LRqlf<Va=Pq6Z_$ENI>
zDz%!-!a_0&3)%GCb6Cx0u3xx-;oLb4b#)jT8vG8`ed*Zl-Bf+>0d}j^{aKFF)0?H&
zlTlD`Pvd>El)GUAcdlNg`P8Y|4NM5IFeitn{_gLlwH%tzQ1b4-pFC%tm%;viuGQCb
zwYC;RT^%<)0@5#@K8>Nio{k$gIQz*b+`4`po5cda;=DYvi;IW4nW7@X#<;=8RA}Wl
zzscR}*MnNkFe4myB102`uT@kKGluz@>6G#AT@1Cgd{I}2p|+Mb=g1==HI>}bQg=6_
zo8jrpOx@k=d-c`X2~312^8BxUMUGz2Y}4Iaw~%Fdgi~!c=vHGRpS|@~z%Tc-JLfii
z_q($a7J%5q#90XoKw^GA1y0w)tN{i=V9AOVv+6+`ySuq^_UtgHoMmv3%V*BeH;!<O
z=}<y|S=^_!O9};CkG$Z)2gzBrisfZxM9$zGGZwR%UwrR-bQlaohKG|~P=F*!T)%h`
z<KQ5RGBf${?|w(<49=!$?CGJVs*0P{)o7cWXAv;Y8E1eFqme<o9Z{{OXvGRvZ`{bL
z4I7A=LB^vbN&NDaS2%s-h`V(RaXRfhXS-LFmGSCZZ_TJ}fbQP8!<nN;IbB&vV@(Z`
z!$E391S_+%X9qBztqZ`lyLX2dj3Jl#QoWuvn>Mj}<3<)vv#s#nuYSee|M(C0T#t9x
z>ZvE5eU|56etBBUd%LZT)0LH+K5~RB_4UKbsuM-RRVp3`aOb?~1ID9uY3=L7>hXrU
z0+qZc472m|-SDJjWK3y!5AE8;|NZGt0Z@w~@!{cg4h*<gONxR(VnhVDO(yKl8R+l4
z_8MDu?3mJWwqC!^sl$gkU0KQX%a@0P?3~yPSE<lBTgJG^NS3Ci&TL@3TNjtib~_#Y
z{YYMKudm>N^qd@4Z`{b5O`FKb%bV2l)_wjtKYQ^-B!>f05J<U)jn!&2BFQqMDDwAj
zzm5KZ2PU<A*DhV+bY&%{Dl2Kdc5Ot9CwR0hT0vleR?Dg&pV^F!xN}Gnt$lqsobdRI
zP)STpb;FZeSU90ssBRhz{QWn+f!Uc9C~b_%1X}v~kb$s>2!8hNyQJsjOjwy@S>{T8
zy&ICwwzlD2qbo$hLu!?ZxX@76jk6rHB1F?6NwoL(yQ9_oDQ?lCA$T@!<i66<pu!_u
z>gnp@$Im@SXL~zB0I;~!+}DQy#3v^5^MC($V#l#fj>B%}VoePvoi<62Ga%e&_w9rx
zLaTL046X^#xSiF&jA-(Ed$Eln8-gx2mX!}Z#Oh6(C|b3OkN{RMTFhqt_qV@IlXI<5
zx(6&@df^3@ty{;NU;EmyWB%9s?{jM3K0f`={~QL5%l`U5zyCej045!6Rx1ssPI2<^
zVa|T`8U4=aJ%6@dTv!;PUNhel1<R}frewngWJ#j-=+P11wHb|A#}K3x5f#P#>(;Sm
z(<VyRuJv1SvMlq<AN`1vpML7Dgh=O`x^C-M%75?!0RHDg4-Gr+*GG>cNfPh<<R{c0
zI|hK&;h@7A@walr244BcfArgBng<7|J${^1m6cRiRbe)n?s;zu!^7QCgMuJXvVJ|9
zurN*@I545G%o<?cs;op5MXY8sm(HA_{<F`hK6Gfr?_9o|QE%3{wn!5e#{Fy8vU=l2
zmakt=xYx4SKfe7oyWf2m7zzeYa(=&T%^IHn=}+C=oG)NtXomZrUwqMRfOeV9n5<R=
z;7i~52G2Qxb7{b6r24bZI8|9m-H8)eJ;EYJwc8>hP<i-yir22Cu&j*yHERfqib9ek
zUf!@_eggArA1#aBW}~U5hK8ytst+H=>XmW3%Vfgn3^njUj=LFGtJM^(UOfa)Ss5n|
z9_07`@DB)rfXZV;l$M*z_kZ&nLL(yFrx^_xfZI23^6M8~!0aqndw;)sxc&UgFSB;b
z7OJbNIC=Om=g*u$vfJI=i@TfgYKgodDOk0NqV?-3c<@0YeArhN-}=^s*Tt*_W|#-o
z;lNN|&-tn<&L2Ncw^y7;uh~qG+5FdBd9IO{SA_^3BMeU?H+In?Ui|HEiS=54?GG4$
ziziR=&X0fm*O8OaI4tPOb#)gY-mnNjvR53<(&fu3TDOj6>(&t!7w7l6Oa?G>BHN9q
zQjuFyLT*V3Uw-jLZZtO1P*p|4v14?$v=AK{O0?5v>9<<x8XO#o%6Bf5cfZ*lLwL^-
z(erP-F#?vc=)TpfdGb5oVedQd0FW9LMRRYj8wPKKRdzy~;sr@=Q4vLDWh`62e%j-O
z=G=B0f*_DlP(VgO0Z)GSyR<enx#4O1;tL`*8n*%KkR)1-#$j%LK@f(Gi2nACH%Pzl
zzM#wV@H5ZQW-w5F_^{iL)9m!oxS&x9!ibh6D?gv2vN8(Sub)xj6LW8W7B8jb=8}?|
z%Ol_XCLK3!&~WS+4OLa#ymSebD7xWr`Fc`4ytq%k@B&3;W#b0;=~rLnPD=|noZ+2m
zIvwpsBS~J6EY8cLu&j)t_3K$ULy|1bJ77GOuy`>Eix;!$*=Ol)Z+F9EsINyQio;-8
z^TZQuc;=Z2xvnNOl&`=3I=}he_b@tF61ZSV$;zUrtc;?vG7_hFeoO%-0L3LGQMO|T
zWjl7zd*==pjvuGKs*1~J&vM_&m2CUr4=4P3U;oKZ_~(~iA~8LkqV?-3Dk~$!Yssqu
z%q&p!f(1PA)Kfh0)Ki!T2GE3t`d#E7ta3_A`T73+!-nRwO$snxn(WG)&9J~si0M_N
z0Ha6&Mv)=~7)1&&iWFcJDZnUFfKj9Xqe#*01m@tM|BP)8Z5BS+a@g(s_lF-&=s9I)
z{LrkJ8u*tt-r$eF{Vf}we3H%O<)mh1DOC7S_wCyp-o2ZnAAA74y_6LcOb95Rnl*Dt
zecj#cdG9^;y!RgWm6oz)+cws2-i&qzXGxeUoj-Gi0~HmVIeHXPl89BQ#<df!FHmM3
zFrK=2?i?3uYIx`8Kd0>R$JtU|PIi9&yn<xFXyoX=eH{GLpWJEF)Pg{aT8$tG0j<Fr
z3n;S+nD~eYx|~Z@op%KcE$29}b0-HXD#%*8lr7t~vHr2gh?qeM2q#+CE??&0&Ye_!
z{4o}b#T~S+76jteY9hnJu!4INjfsQ>X5q@m=ANG6JCC>`|D6v`qt&u@%NDk5+eUtA
z>7<tBUaJNsN;a#N6Ne6Qu%co_+71|s2~G?NK^+>31T2h*AZHBe<%0oc)^$l~&g|g5
zW;5L;(_e4WxkSWjv2bMXUXJYDOG-uto6F02_{k?{RAQpBs-v})Lx27=hxhDphjx12
zE3%9V$k6GqGPF_qqKF8xgMekMnw4v-z17m&JCt9>Gi!mz-)gm*l@CA6=JIm%Yt~Fy
zW~j+%VI)c7-0|ZasHmX!`0-KSdS7Wr5+WnX3Sv3TSX-A_YxH_6)fxHUZ?)3d-~ZPg
zL7cMN?VLDth!cknu`n@_P0o!g7Ea=u7^r%?yQ%!}Lk|AwPjq_iQQ*0DNvGAi*H{gM
zB`S)nMT;gCmO0bH_)=S6A7(%6tVKbfWbIlumzT4mtPFJ!ql$@WVJ_FzaiF4t6Ne6A
z_i#?S)-1XH_LpiTF)E780AUGs1NJ!^)0^yUt{sv@b8qj6tX7gNQ+@0hHOGz-9T&%j
zr=DWd)~!>L3e7w?$Y=ZabD*Mv8%<3<69CB!rAAA>$A~Xcrz11K)sXTyw!oS5LEtJ;
zBqKI<$cQu=8Sr|GUERU%ci(0AAO1joX(^k_%Xwh)=74g!jLFve;tLK`RB&|PK1}`n
ze_hM%r9}}DBXYd>Qj$(b#uP7|onH&tJl@uuJv}%iY54kPS*EeNn#P(Me*cSKu>SGK
z*<4;uR)Co%J>{_5Id$X+2P!IPIDL9V0sz-~YSkEW=M8H?qoY|IL`Exlu5GY2RZ4db
z&$~<}`h0A&H()gK@y?xm{9pe?c78saw{2tnqmPcrB{Q13Iy(4d*Den2+QnU0dNF5y
z8uwy+Ste4eB|gCEjg;tU(#MhhOaW#biVqJbK0F+N=HA|+JbIpQp&(#rY{YQ!BLDWw
zU-ICVEo?3?_X$q3!NA=+cldbcPEH>^isY4(&-HeTUJL#Mf+Z$~^dNmo<858$^eAau
zMybulEu(R0lrl<IN`OqKZRFB*ujJI;(x}z<G-CZJd*MPB1({ZVB4ANkm{AlO5<-SE
zSx>9WDd@CuT;Pl~v8x~mBt%Az$%ysqYl?}Pc32c(#%M3VP;$d|XToMYd?fxxXK6up
zJKictPDU4G7{^4yq5u<sG%6K~orZF|(KvjAa;HL6Dndg-0ybj(X<2eIQ8NS<1(+a}
zG>RRPGQr#S<Stq?qhJ9g2z<sWchMpi1Zf~o7A#5&GgDznNMOMj{XJ6&ivr9HRIrJd
zCmR%Zmt?Wo>`FDwURYeqKc-5e0E0?Z%|2MB8WcA$R-4VFRM+f-Wx6Ex^!GO_RW>_d
znXXpFrT@Ng;iPD`TCd*qT*9GfifjQPU|6PGMyvI*h#(y6?&+b&r1VTvC6yqsYK+T$
zr@K{gX<tnZqAY(ZhKb@H8SHm^dbr!)uhixgz_Ky`Sf*QDy}j(KsR2Rgi;RukqiXEx
zGA@mai;*O0&7j4?fZ2>BN!T3@?2?2=t+;9?N?MhQ<(Zi?9uk163m0f;Zl<}rdnig!
z5We;QPM)k50Cp4<Xv}8wA7pSR*Y`Dj?`tDU_uu}0>psM5&5-L~&%Zq*(imG9fiTMT
z<x##HOIiKhlXtmB#O982O;=e)9Pj_;?s@&uuI00wPACOGaXwzpuMa`^{vT^=-yc!d
zFXiU0mu30uvLr1>6w?HVM3yyvZ_r0&`@FEP<9!v@3q&E12jt^H4Ex*@*3ll&Xyx&>
z5A<k&`gxH&?<=V5d%RGL@nsrz|D(NVf?yZGge;qY>%e6}5DrJh#_s-?qem56MNx42
Y|6GCN!Hxm}hX4Qo07*qoM6N<$f{|u$(*OVf

literal 0
HcmV?d00001

diff --git a/rma/static/description/index.html b/rma/static/description/index.html
new file mode 100644
index 000000000..a45186e63
--- /dev/null
+++ b/rma/static/description/index.html
@@ -0,0 +1,496 @@
+<?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/" />
+<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 $
+: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
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: grey; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="return-merchandise-authorization-management">
+<h1 class="title">Return Merchandise Authorization Management</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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/12.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-12-0/rma-12-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/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-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
+of the RMA module are fully integrated with the Receipts and Deliveries
+Operations of Odoo inventory core module. It also allows you to generate
+refunds in the same way as Odoo generates it.
+Besides, you have full integration of the RMA documents in the customer portal.</p>
+<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>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="configuration">
+<h1><a class="toc-backref" href="#id1">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>
+<li>Check ‘External Email Servers’ checkbox under <em>Discuss</em> section.</li>
+<li>Set an ‘alias domain’ and an incoming server.</li>
+<li>Go to <em>RMA &gt; Configuration &gt; RMA Team</em> and select a team or create a new
+one.</li>
+<li>Go to ‘Email’ tab and set an ‘Email Alias’.</li>
+</ol>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id2">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>
+<li>Select a partner, an invoice address, select a product
+(or select a picking and a move instead), write a quantity, fill the rest
+of the form and click on ‘confirm’ button in the status bar.</li>
+<li>You will see an smart button labeled ‘Receipt’. Click on that button to see
+the reception operation form.</li>
+<li>If everything is right, validate the operation and go back to the RMA to
+see it in a ‘received’ state.</li>
+<li>Now you are able to generate a refund, generate a delivery order to return
+to the customer the same product or another product as a replacement, split
+the RMA by extracting a part of the remaining quantity to another RMA,
+preview the RMA in the website. All of these operations can be done by
+clicking on the buttons in the status bar.<ul>
+<li>If you click on ‘Refund’ button, a refund will be created, and it will be
+accessible via the smart button labeled Refund. The RMA will be set
+automatically to ‘Refunded’ state when the refund is validated.</li>
+<li>If you click on ‘Replace’ or ‘Return to customer’ button instead,
+a popup wizard will guide you to create a Delivery order to the client
+and this order will be accessible via the smart button labeled Delivery.
+The RMA will be set automatically to ‘Replaced’ or ‘Returned’ state when
+the RMA quantity is equal or lower than the quantity in done delivery
+orders linked to it.</li>
+</ul>
+</li>
+</ol>
+<p>An RMA can also be created from a return of a delivery order:</p>
+<ol class="arabic simple">
+<li>Select a delivery order and click on ‘Return’ button to create a return.</li>
+<li>Check “Create RMAs” checkbox in the returning wizard, select the RMA
+stock location and click on ‘Return’ button.</li>
+<li>An RMA will be created for each product returned in the previous step.
+Every RMA will be in confirmed state and they will
+be linked to the returning operation generated previously.</li>
+</ol>
+<p><strong>Note: An RMA can also be created from an incoming email (See configuration
+section).</strong></p>
+</div>
+<div class="section" id="known-issues-roadmap">
+<h1><a class="toc-backref" href="#id3">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
+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>
+<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:%2012.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>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#id6">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>
+<ul class="simple">
+<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
+<li>Ernesto Tejeda</li>
+<li>Pedro M. Baeza</li>
+<li>David Vidal</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#id8">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/12.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>
+</div>
+</body>
+</html>
diff --git a/rma/tests/__init__.py b/rma/tests/__init__.py
new file mode 100644
index 000000000..5f9ab818b
--- /dev/null
+++ b/rma/tests/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import test_rma
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
new file mode 100644
index 000000000..197276ad4
--- /dev/null
+++ b/rma/tests/test_rma.py
@@ -0,0 +1,638 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo.tests import Form, SavepointCase
+from odoo.exceptions import UserError, ValidationError
+
+
+class TestRma(SavepointCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestRma, cls).setUpClass()
+        cls.res_partner = cls.env['res.partner']
+        cls.product_product = cls.env['product.product']
+        cls.company = cls.env.user.company_id
+        cls.warehouse_company = cls.env['stock.warehouse'].search(
+            [('company_id', '=', cls.company.id)], limit=1)
+        cls.rma_loc = cls.warehouse_company.rma_loc_id
+        account_pay = cls.env['account.account'].create({
+            'code': 'X1111',
+            'name': 'Creditors - (test)',
+            'user_type_id': cls.env.ref(
+                'account.data_account_type_payable').id,
+            'reconcile': True,
+        })
+        cls.journal = cls.env['account.journal'].create({
+            'name': 'sale_0',
+            'code': 'SALE0',
+            'type': 'sale',
+            'default_debit_account_id': account_pay.id,
+        })
+        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',
+        })
+        cls.account_receiv = cls.env['account.account'].create({
+            'name': 'Receivable',
+            'code': 'RCV00',
+            'user_type_id': account_type.id,
+            'reconcile': True,
+        })
+        cls.partner = cls.res_partner.create({
+            'name': 'Partner test',
+            'property_account_receivable_id': cls.account_receiv.id,
+        })
+        cls.partner_invoice = cls.res_partner.create({
+            'name': 'Partner invoice test',
+            'parent_id': cls.partner.id,
+            'type': 'invoice',
+        })
+
+    def _create_rma(self, partner=None, product=None, qty=None, location=None):
+        rma_form = Form(self.env['rma'])
+        if partner:
+            rma_form.partner_id = partner
+        if product:
+            rma_form.product_id = product
+        if qty:
+            rma_form.product_uom_qty = qty
+        if location:
+            rma_form.location_id = location
+        return rma_form.save()
+
+    def _create_confirm_receive(self, partner=None, product=None, qty=None,
+                                location=None):
+        rma = self._create_rma(partner, product, qty, location)
+        rma.action_confirm()
+        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        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(
+            [
+                ('code', '=', 'outgoing'),
+                '|',
+                ('warehouse_id.company_id', '=', self.company.id),
+                ('warehouse_id', '=', False)
+            ],
+            limit=1,
+        )
+        picking_form = Form(
+            recordp=self.env['stock.picking'].with_context(
+                default_picking_type_id=picking_type.id),
+            view="stock.view_picking_form",
+        )
+        picking_form.company_id = self.company
+        picking_form.partner_id = self.partner
+        with picking_form.move_ids_without_package.new() as move:
+            move.product_id = self.product
+            move.product_uom_qty = 10
+        with picking_form.move_ids_without_package.new() as move:
+            move.product_id = self.product_product.create(
+                {'name': 'Product 2 test', 'type': 'product'})
+            move.product_uom_qty = 20
+        picking = picking_form.save()
+        picking.action_confirm()
+        for move in picking.move_lines:
+            move.quantity_done = move.product_uom_qty
+        picking.button_validate()
+        return picking
+
+    def test_onchange(self):
+        rma_form = Form(self.env['rma'])
+        # If partner changes, the invoice address is set
+        rma_form.partner_id = self.partner
+        self.assertEqual(rma_form.partner_invoice_id, self.partner_invoice)
+        # If origin move changes, the product is set
+        uom_ten = self.env['uom.uom'].create({
+            'name': "Ten",
+            'category_id': self.env.ref('uom.product_uom_unit').id,
+            'factor_inv': 10,
+            'uom_type': 'bigger',
+        })
+        product_2 = self.product_product.create({
+            'name': 'Product test 2',
+            'type': 'product',
+            'uom_id': uom_ten.id,
+        })
+        outgoing_picking_type = self.env['stock.picking.type'].search(
+            [
+                ('code', '=', 'outgoing'),
+                '|',
+                ('warehouse_id.company_id', '=', self.company.id),
+                ('warehouse_id', '=', False)
+            ],
+            limit=1,
+        )
+        picking_form = Form(
+            recordp=self.env['stock.picking'].with_context(
+                default_picking_type_id=outgoing_picking_type.id),
+            view="stock.view_picking_form",
+        )
+        picking_form.company_id = self.company
+        picking_form.partner_id = self.partner
+        picking_form.partner_id = self.partner
+        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)
+        # 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 = rma_form.save()
+        # If product changes, unit of measure domain should also change
+        domain = rma._onchange_product_id()['domain']['product_uom']
+        self.assertListEqual(
+            domain, [('category_id', '=', self.product.uom_id.category_id.id)])
+
+    def test_ensure_required_fields_on_confirm(self):
+        rma = self._create_rma()
+        with self.assertRaises(ValidationError) as e:
+            rma.action_confirm()
+        self.assertEqual(
+            e.exception.name,
+            "Required field(s):\nCustomer\nInvoice Address\nProduct\nLocation"
+        )
+        with Form(rma) as rma_form:
+            rma_form.partner_id = self.partner
+        with self.assertRaises(ValidationError) as e:
+            rma.action_confirm()
+        self.assertEqual(
+            e.exception.name, "Required field(s):\nProduct\nLocation")
+        with Form(rma) as rma_form:
+            rma_form.product_id = self.product
+            rma_form.location_id = self.rma_loc
+        rma.action_confirm()
+        self.assertEqual(rma.state, 'confirmed')
+
+    def test_confirm_and_receive(self):
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        rma.action_confirm()
+        self.assertEqual(rma.reception_move_id.picking_id.state, 'assigned')
+        self.assertEqual(rma.reception_move_id.product_id, rma.product_id)
+        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()
+        rma.reception_move_id.quantity_done = 10
+        rma.reception_move_id.picking_id.action_done()
+        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()
+        rma.action_cancel()
+        self.assertEqual(rma.state, 'cancelled')
+        # A RMA is only cancelled from draft and confirmed states
+        rma = self._create_confirm_receive(self.partner, self.product, 10,
+                                           self.rma_loc)
+        with self.assertRaises(UserError):
+            rma.action_cancel()
+
+    def test_lock_unlock(self):
+        # A RMA is only locked from 'received' state
+        rma_1 = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        rma_2 = self._create_confirm_receive(self.partner, self.product, 10,
+                                             self.rma_loc)
+        self.assertEqual(rma_1.state, 'draft')
+        self.assertEqual(rma_2.state, 'received')
+        (rma_1 | rma_2).action_lock()
+        self.assertEqual(rma_1.state, 'draft')
+        self.assertEqual(rma_2.state, 'locked')
+        # A RMA is only unlocked from 'lock' state and it will be set
+        # to 'received' state
+        (rma_1 | rma_2).action_unlock()
+        self.assertEqual(rma_1.state, 'draft')
+        self.assertEqual(rma_2.state, 'received')
+
+    def test_action_refund(self):
+        rma = self._create_confirm_receive(self.partner, self.product, 10,
+                                           self.rma_loc)
+        self.assertEqual(rma.state, 'received')
+        self.assertTrue(rma.can_be_refunded)
+        self.assertTrue(rma.can_be_returned)
+        self.assertTrue(rma.can_be_replaced)
+        rma.action_refund()
+        self.assertEqual(rma.refund_id.type, 'out_refund')
+        self.assertEqual(rma.refund_id.state, 'draft')
+        self.assertEqual(rma.refund_line_id.product_id, rma.product_id)
+        self.assertEqual(rma.refund_line_id.quantity, 10)
+        self.assertEqual(rma.refund_line_id.uom_id, rma.product_uom)
+        self.assertEqual(rma.state, 'waiting_refund')
+        self.assertFalse(rma.can_be_refunded)
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.can_be_replaced)
+        rma.refund_line_id.quantity = 9
+        with self.assertRaises(ValidationError):
+            rma.refund_id.action_invoice_open()
+        rma.refund_line_id.quantity = 10
+        rma.refund_id.action_invoice_open()
+        self.assertEqual(rma.state, 'refunded')
+        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
+        rma_1 = self._create_confirm_receive(self.partner, self.product, 10,
+                                             self.rma_loc)
+        # create, confirm and receive 3 more RMAs
+        # rma_2: Same partner and same product as rma_1
+        rma_2 = self._create_confirm_receive(self.partner, self.product, 15,
+                                             self.rma_loc)
+        # rma_3: Same partner and different product than rma_1
+        product = self.product_product.create(
+            {'name': 'Product 2 test', 'type': 'product'})
+        rma_3 = self._create_confirm_receive(self.partner, product, 20,
+                                             self.rma_loc)
+        # rma_4: Different partner and same product as rma_1
+        partner = self.res_partner.create({
+            'name': 'Partner 2 test',
+            'property_account_receivable_id': self.account_receiv.id,
+            'company_id': self.company.id,
+        })
+        rma_4 = self._create_confirm_receive(partner, product, 25,
+                                             self.rma_loc)
+        # all rmas are ready to refund
+        all_rmas = (rma_1 | rma_2 | rma_3 | rma_4)
+        self.assertEqual(all_rmas.mapped('state'), ['received']*4)
+        self.assertEqual(all_rmas.mapped('can_be_refunded'), [True]*4)
+        # Mass refund of those four RMAs
+        action = self.env.ref('rma.rma_refund_action_server')
+        ctx = dict(self.env.context)
+        ctx.update(active_ids=all_rmas.ids, active_model='rma')
+        action.with_context(ctx).run()
+        # Two refunds were created
+        refund_1 = (rma_1 | rma_2 | rma_3).mapped('refund_id')
+        refund_2 = rma_4.refund_id
+        self.assertEqual(len(refund_1), 1)
+        self.assertEqual(len(refund_2), 1)
+        self.assertEqual((refund_1 | refund_2).mapped('state'), ['draft']*2)
+        # One refund per partner
+        self.assertNotEqual(refund_1.partner_id, refund_2.partner_id)
+        self.assertEqual(
+            refund_1.partner_id,
+            (rma_1 | rma_2 | rma_3).mapped('partner_invoice_id'),
+        )
+        self.assertEqual(refund_2.partner_id, rma_4.partner_invoice_id)
+        # Each RMA (rma_1, rma_2 and rma_3) is linked with a different
+        # line of refund_1
+        self.assertEqual(len(refund_1.invoice_line_ids), 3)
+        self.assertEqual(
+            refund_1.invoice_line_ids.mapped('rma_id'),
+            (rma_1 | rma_2 | rma_3),
+        )
+        self.assertEqual(
+            (rma_1 | rma_2 | rma_3).mapped('refund_line_id'),
+            refund_1.invoice_line_ids,
+        )
+        # rma_4 is linked with the unique line of refund_2
+        self.assertEqual(len(refund_2.invoice_line_ids), 1)
+        self.assertEqual(refund_2.invoice_line_ids.rma_id, rma_4)
+        self.assertEqual(rma_4.refund_line_id, refund_2.invoice_line_ids)
+        # Assert product and quantities are propagated correctly
+        for rma in all_rmas:
+            self.assertEqual(rma.product_id, rma.refund_line_id.product_id)
+            self.assertEqual(rma.product_uom_qty, rma.refund_line_id.quantity)
+            self.assertEqual(rma.product_uom, rma.refund_line_id.uom_id)
+        # Less quantity -> error on confirm
+        rma_2.refund_line_id.quantity = 14
+        with self.assertRaises(ValidationError):
+            refund_1.action_invoice_open()
+        rma_2.refund_line_id.quantity = 15
+        refund_1.action_invoice_open()
+        refund_2.action_invoice_open()
+        self.assertEqual(all_rmas.mapped('state'), ['refunded']*4)
+
+    def test_replace(self):
+        # Create, confirm and receive an RMA
+        rma = self._create_confirm_receive(self.partner, self.product, 10,
+                                           self.rma_loc)
+        # Replace with another product with quantity 2.
+        product_2 = self.product_product.create(
+            {'name': 'Product 2 test', 'type': 'product'})
+        delivery_form = Form(
+            self.env['rma.delivery.wizard'].with_context(
+                active_ids=rma.ids,
+                rma_delivery_type='replace',
+            )
+        )
+        delivery_form.product_id = product_2
+        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(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')
+        self.assertEqual(rma.state, 'waiting_replacement')
+        self.assertFalse(rma.can_be_refunded)
+        self.assertFalse(rma.can_be_returned)
+        self.assertTrue(rma.can_be_replaced)
+        self.assertEqual(rma.delivered_qty, 2)
+        self.assertEqual(rma.remaining_qty, 8)
+        self.assertEqual(rma.delivered_qty_done, 0)
+        self.assertEqual(rma.remaining_qty_to_done, 10)
+        first_move = rma.delivery_move_ids
+        picking = first_move.picking_id
+        # Replace again with another product with the remaining quantity
+        product_3 = self.product_product.create(
+            {'name': 'Product 3 test', 'type': 'product'})
+        delivery_form = Form(
+            self.env['rma.delivery.wizard'].with_context(
+                active_ids=rma.ids,
+                rma_delivery_type='replace',
+            )
+        )
+        delivery_form.product_id = product_3
+        delivery_wizard = delivery_form.save()
+        delivery_wizard.action_deliver()
+        second_move = rma.delivery_move_ids - first_move
+        self.assertEqual(len(rma.delivery_move_ids), 2)
+        self.assertEqual(rma.delivery_move_ids.mapped('picking_id'), picking)
+        self.assertEqual(first_move.product_id, product_2)
+        self.assertEqual(first_move.product_uom_qty, 2)
+        self.assertEqual(second_move.product_id, product_3)
+        self.assertEqual(second_move.product_uom_qty, 8)
+        self.assertTrue(picking.state, 'waiting')
+        self.assertEqual(rma.delivered_qty, 10)
+        self.assertEqual(rma.remaining_qty, 0)
+        self.assertEqual(rma.delivered_qty_done, 0)
+        self.assertEqual(rma.remaining_qty_to_done, 10)
+        # remaining_qty is 0 but rma is not set to 'replaced' until
+        # remaining_qty_to_done is less than or equal to 0
+        first_move.quantity_done = 2
+        second_move.quantity_done = 8
+        picking.button_validate()
+        self.assertEqual(picking.state, 'done')
+        self.assertEqual(rma.delivered_qty, 10)
+        self.assertEqual(rma.remaining_qty, 0)
+        self.assertEqual(rma.delivered_qty_done, 10)
+        self.assertEqual(rma.remaining_qty_to_done, 0)
+        # The RMA is now in 'replaced' state
+        self.assertEqual(rma.state, 'replaced')
+        self.assertFalse(rma.can_be_refunded)
+        self.assertFalse(rma.can_be_returned)
+        # 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
+        rma = self._create_confirm_receive(self.partner, self.product, 10,
+                                           self.rma_loc)
+        # Return the same product with quantity 2 to the customer.
+        delivery_form = Form(
+            self.env['rma.delivery.wizard'].with_context(
+                active_ids=rma.ids,
+                rma_delivery_type='return',
+            )
+        )
+        delivery_form.product_uom_qty = 2
+        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(rma.delivery_move_ids.product_id, self.product)
+        self.assertEqual(rma.delivery_move_ids.product_uom_qty, 2)
+        self.assertTrue(picking.state, 'waiting')
+        self.assertEqual(rma.state, 'waiting_return')
+        self.assertFalse(rma.can_be_refunded)
+        self.assertFalse(rma.can_be_replaced)
+        self.assertTrue(rma.can_be_returned)
+        self.assertEqual(rma.delivered_qty, 2)
+        self.assertEqual(rma.remaining_qty, 8)
+        self.assertEqual(rma.delivered_qty_done, 0)
+        self.assertEqual(rma.remaining_qty_to_done, 10)
+        first_move = rma.delivery_move_ids
+        picking = first_move.picking_id
+        # Validate the picking
+        first_move.quantity_done = 2
+        picking.button_validate()
+        self.assertEqual(picking.state, 'done')
+        self.assertEqual(rma.delivered_qty, 2)
+        self.assertEqual(rma.remaining_qty, 8)
+        self.assertEqual(rma.delivered_qty_done, 2)
+        self.assertEqual(rma.remaining_qty_to_done, 8)
+        # Return the remaining quantity to the customer
+        delivery_form = Form(
+            self.env['rma.delivery.wizard'].with_context(
+                active_ids=rma.ids,
+                rma_delivery_type='return',
+            )
+        )
+        delivery_wizard = delivery_form.save()
+        delivery_wizard.action_deliver()
+        second_move = rma.delivery_move_ids - first_move
+        second_move.quantity_done = 8
+        self.assertEqual(rma.delivered_qty, 10)
+        self.assertEqual(rma.remaining_qty, 0)
+        self.assertEqual(rma.delivered_qty_done, 2)
+        self.assertEqual(rma.remaining_qty_to_done, 8)
+        self.assertEqual(rma.state, 'waiting_return')
+        # remaining_qty is 0 but rma is not set to 'returned' until
+        # remaining_qty_to_done is less than or equal to 0
+        picking_2 = second_move.picking_id
+        picking_2.button_validate()
+        self.assertEqual(picking_2.state, 'done')
+        self.assertEqual(rma.delivered_qty, 10)
+        self.assertEqual(rma.remaining_qty, 0)
+        self.assertEqual(rma.delivered_qty_done, 10)
+        self.assertEqual(rma.remaining_qty_to_done, 0)
+        # The RMA is now in 'returned' state
+        self.assertEqual(rma.state, 'returned')
+        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_return_to_customer(self):
+        # Create, confirm and receive rma_1
+        rma_1 = self._create_confirm_receive(self.partner, self.product, 10,
+                                             self.rma_loc)
+        # create, confirm and receive 3 more RMAs
+        # rma_2: Same partner and same product as rma_1
+        rma_2 = self._create_confirm_receive(self.partner, self.product, 15,
+                                             self.rma_loc)
+        # rma_3: Same partner and different product than rma_1
+        product = self.product_product.create(
+            {'name': 'Product 2 test', 'type': 'product'})
+        rma_3 = self._create_confirm_receive(self.partner, product, 20,
+                                             self.rma_loc)
+        # rma_4: Different partner and same product as rma_1
+        partner = self.res_partner.create({'name': 'Partner 2 test'})
+        rma_4 = self._create_confirm_receive(partner, product, 25,
+                                             self.rma_loc)
+        # all rmas are ready to be returned to the customer
+        all_rmas = (rma_1 | rma_2 | rma_3 | rma_4)
+        self.assertEqual(all_rmas.mapped('state'), ['received'] * 4)
+        self.assertEqual(all_rmas.mapped('can_be_returned'), [True] * 4)
+        # Mass return of those four RMAs
+        delivery_wizard = self.env['rma.delivery.wizard'].with_context(
+            active_ids=all_rmas.ids, rma_delivery_type='return').create({})
+        delivery_wizard.action_deliver()
+        # Two pickings were created
+        pick_1 = (rma_1 | rma_2 | rma_3).mapped('delivery_move_ids.picking_id')
+        pick_2 = rma_4.delivery_move_ids.picking_id
+        self.assertEqual(len(pick_1), 1)
+        self.assertEqual(len(pick_2), 1)
+        self.assertNotEqual(pick_1, pick_2)
+        self.assertEqual((pick_1 | pick_2).mapped('state'), ['assigned'] * 2)
+        # One picking per partner
+        self.assertNotEqual(pick_1.partner_id, pick_2.partner_id)
+        self.assertEqual(
+            pick_1.partner_id,
+            (rma_1 | rma_2 | rma_3).mapped('partner_id'),
+        )
+        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(
+            pick_1.move_lines.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,
+        )
+        # 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)
+        # Assert product and quantities are propagated correctly
+        for rma in all_rmas:
+            self.assertEqual(rma.product_id, rma.delivery_move_ids.product_id)
+            self.assertEqual(rma.product_uom_qty,
+                             rma.delivery_move_ids.product_uom_qty)
+            self.assertEqual(rma.product_uom,
+                             rma.delivery_move_ids.product_uom)
+            rma.delivery_move_ids.quantity_done = rma.product_uom_qty
+        pick_1.button_validate()
+        pick_2.button_validate()
+        self.assertEqual(all_rmas.mapped('state'), ['returned'] * 4)
+
+    def test_rma_from_picking_return(self):
+        # Create a return from a delivery picking
+        origin_delivery = self._create_delivery()
+        return_wizard = self.env['stock.return.picking'].with_context(
+            active_id=origin_delivery.id,
+            active_ids=origin_delivery.ids,
+        ).create({'create_rma': True})
+        picking_action = return_wizard.create_returns()
+        # Each origin move is linked to a different RMA
+        origin_moves = origin_delivery.move_lines
+        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
+        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)
+        # Validate the reception picking to set rmas to 'received' state
+        reception_moves[0].quantity_done = reception_moves[0].product_uom_qty
+        reception_moves[1].quantity_done = reception_moves[1].product_uom_qty
+        reception.button_validate()
+        self.assertEqual(rmas.mapped('state'), ['received'] * 2)
+
+    def test_split(self):
+        origin_delivery = self._create_delivery()
+        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(
+            lambda r: r.product_id == self.product)
+        rma = rma_form.save()
+        rma.action_confirm()
+        rma.reception_move_id.quantity_done = 10
+        rma.reception_move_id.picking_id.action_done()
+        # Return quantity 4 of the same product to the customer
+        delivery_form = Form(
+            self.env['rma.delivery.wizard'].with_context(
+                active_ids=rma.ids,
+                rma_delivery_type='return',
+            )
+        )
+        delivery_form.product_uom_qty = 4
+        delivery_wizard = delivery_form.save()
+        delivery_wizard.action_deliver()
+        rma.delivery_move_ids.quantity_done = 4
+        rma.delivery_move_ids.picking_id.button_validate()
+        self.assertEqual(rma.state, 'waiting_return')
+        # Extract the remaining quantity to another RMA
+        self.assertTrue(rma.can_be_split)
+        split_wizard = self.env['rma.split.wizard'].with_context(
+            active_id=rma.id,
+            active_ids=rma.ids,
+        ).create({})
+        action = split_wizard.action_split()
+        # Check rma is set to 'returned' after split. Check new_rma values
+        self.assertEqual(rma.state, 'returned')
+        new_rma = self.env['rma'].browse(action['res_id'])
+        self.assertEqual(new_rma.origin_split_rma_id, rma)
+        self.assertEqual(new_rma.delivered_qty, 0)
+        self.assertEqual(new_rma.remaining_qty, 6)
+        self.assertEqual(new_rma.delivered_qty_done, 0)
+        self.assertEqual(new_rma.remaining_qty_to_done, 6)
+        self.assertEqual(new_rma.state, 'received')
+        self.assertTrue(new_rma.can_be_refunded)
+        self.assertTrue(new_rma.can_be_returned)
+        self.assertTrue(new_rma.can_be_replaced)
+        self.assertEqual(new_rma.move_id, rma.move_id)
+        self.assertEqual(new_rma.reception_move_id, rma.reception_move_id)
+        self.assertEqual(new_rma.product_uom_qty + rma.product_uom_qty, 10)
+        self.assertEqual(new_rma.move_id.quantity_done, 10)
+        self.assertEqual(new_rma.reception_move_id.quantity_done, 10)
diff --git a/rma/views/menus.xml b/rma/views/menus.xml
new file mode 100644
index 000000000..568c906d4
--- /dev/null
+++ b/rma/views/menus.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <menuitem
+        id="rma_menu"
+        name="RMA"
+        web_icon="rma,static/description/icon.png"/>
+    <menuitem
+        id="rma_orders_menu"
+        parent="rma_menu"
+        name="Orders"
+        sequence="10"/>
+    <menuitem
+        id="rma_reporting_menu"
+        parent="rma_menu"
+        name="Reporting"
+        sequence="20"/>
+    <menuitem
+        id="rma_configuration_menu"
+        parent="rma_menu"
+        name="Configuration"
+        sequence="30"/>
+</odoo>
diff --git a/rma/views/report_rma.xml b/rma/views/report_rma.xml
new file mode 100644
index 000000000..c6320d0d7
--- /dev/null
+++ b/rma/views/report_rma.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template id="report_rma_document">
+        <t t-call="web.external_layout">
+            <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)" />
+            <t t-if="doc.partner_id">
+                <t t-set="address">
+                    <div t-field="doc.partner_id"
+                        t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
+                    <p t-if="doc.partner_id.vat"><t t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"/>: <span t-field="doc.partner_id.vat"/></p>
+                </t>
+            </t>
+            <t t-if="(doc.partner_id or doc.partner_invoice_id) and doc.partner_id != doc.partner_invoice_id">
+                <t t-set="information_block">
+                    <strong>Invoicing address:</strong>
+                    <div t-field="doc.partner_invoice_id"
+                    t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
+                </t>
+            </t>
+            <div class="page">
+                <h2 class="mt16">
+                    <span t-if="doc.state not in ['draft', 'cancelled']">RMA # </span>
+                    <span t-field="doc.name"/>
+                </h2>
+                <div class="row mt32 mb32" id="general_information">
+                    <div t-if="doc.origin" class="col-auto mw-100 mb-2">
+                        <strong>Origin:</strong>
+                        <p class="m-0" t-field="doc.origin"/>
+                    </div>
+                    <div class="col-auto mw-100 mb-2">
+                        <strong>Date:</strong>
+                        <p class="m-0" t-field="doc.date"/>
+                    </div>
+                    <div t-if="doc.deadline" class="col-auto mw-100 mb-2">
+                        <strong>Deadline:</strong>
+                        <p class="m-0" t-field="doc.deadline"/>
+                    </div>
+                    <div t-if="doc.user_id" class="col-auto mw-100 mb-2">
+                        <strong>Responsible:</strong>
+                        <p class="m-0" t-field="doc.user_id"/>
+                    </div>
+                    <div class="col-auto mw-100 mb-2">
+                        <strong>State:</strong>
+                        <p class="m-0">
+                            <t t-if="doc.state in ['refunded', 'replaced', 'returned']">
+                                <span class="small text-success orders_label_text_align"><i class="fa fa-fw fa-check"/> <b><span t-field="doc.state"/></b></span>
+                            </t>
+                            <t t-elif="doc.state in ['cancelled', 'locked']">
+                                <span class="small text-danger orders_label_text_align"><i class="fa fa-fw fa-times"/> <b><span t-field="doc.state"/></b></span>
+                            </t>
+                            <t t-else="">
+                                <span class="small text-info orders_label_text_align"><i class="fa fa-fw fa-clock-o"/> <b><span t-field="doc.state"/></b></span>
+                            </t>
+                        </p>
+                    </div>
+                </div>
+                <div class="row mt32 mb32" id="product_information">
+                    <div t-if="doc.picking_id" class="col-auto mw-100 mb-2">
+                        <strong>Origin delivery:</strong>
+                        <p class="m-0" t-field="doc.picking_id"/>
+                    </div>
+                    <div t-if="doc.move_id" class="col-auto mw-100 mb-2">
+                        <strong>Move:</strong>
+                        <p class="m-0" t-field="doc.move_id"/>
+                    </div>
+                    <div t-if="doc.product_id" class="col-auto mw-100 mb-2">
+                        <strong>Product:</strong>
+                        <p class="m-0" t-field="doc.product_id"/>
+                    </div>
+                    <div t-if="doc.product_id" class="col-auto mw-100 mb-2">
+                        <strong>Quantity:</strong>
+                        <p class="m-0" t-field="doc.product_uom_qty">
+                            <span t-field="doc.product_uom_qty"/>
+                            <span t-field="doc.uom_id"  groups="uom.group_uom"/>
+                        </p>
+                    </div>
+                    <div t-if="doc.delivered_qty" class="col-auto mw-100 mb-2">
+                        <strong>Delivered qty:</strong>
+                        <p class="m-0" t-field="doc.delivered_qty"/>
+                    </div>
+                </div>
+                <div t-if="doc.description">
+                    <strong>RMA Note:</strong>
+                    <p t-field="doc.description" />
+                </div>
+            </div>
+        </t>
+    </template>
+    <template id="report_rma">
+        <t t-call="web.html_container">
+            <t t-foreach="docs" t-as="doc">
+                <t t-call="rma.report_rma_document" t-lang="doc.partner_id.lang" />
+            </t>
+        </t>
+    </template>
+</odoo>
diff --git a/rma/views/res_partner_views.xml b/rma/views/res_partner_views.xml
new file mode 100644
index 000000000..d783f1f69
--- /dev/null
+++ b/rma/views/res_partner_views.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     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="arch" type="xml">
+            <div name="button_box">
+                <button name="action_view_rma"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-reply"
+                        attrs="{'invisible': [('rma_count', '=', 0)]}">
+                    <field name="rma_count"
+                           widget="statinfo"
+                           string="RMA"/>
+                </button>
+            </div>
+        </field>
+    </record>
+</odoo>
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
new file mode 100644
index 000000000..16cff15b0
--- /dev/null
+++ b/rma/views/rma_portal_templates.xml
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <template id="portal_my_home_menu_rma" name="Portal layout : RMA menu entries" inherit_id="portal.portal_breadcrumbs" priority="35">
+        <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
+            <li t-if="page_name == 'RMA'" t-attf-class="breadcrumb-item #{'active ' if not rma else ''}">
+                <a t-if="rma" t-attf-href="/my/rmas?{{ keep_query() }}">RMA Orders</a>
+                <t t-else="">RMA Orders</t>
+            </li>
+            <li t-if="rma" class="breadcrumb-item active">
+                <t t-esc="rma.name"/>
+            </li>
+        </xpath>
+    </template>
+
+    <template id="portal_my_home_rma" name="Portal My Home : RMA entries" inherit_id="portal.portal_my_home" priority="30">
+        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+            <t t-call="portal.portal_docs_entry">
+                <t t-set="title">RMA Orders</t>
+                <t t-set="url" t-value="'/my/rmas'"/>
+                <t t-set="count" t-value="rma_count"/>
+            </t>
+        </xpath>
+    </template>
+
+    <template id="portal_my_rmas" name="My RMA Orders">
+      <t t-call="portal.portal_layout">
+        <t t-set="breadcrumbs_searchbar" t-value="True"/>
+
+        <t t-call="portal.portal_searchbar">
+            <t t-set="title">RMA Orders</t>
+        </t>
+        <t t-if="rmas" t-call="portal.portal_table">
+            <thead>
+                <tr class="active">
+                    <th>RMA #</th>
+                    <th class='d-none d-md-table-cell'>Date</th>
+                    <th>Product</th>
+                    <th class='text-right'>Quantity</th>
+                    <th class='d-none d-md-table-cell'>Status</th>
+                </tr>
+            </thead>
+            <tbody>
+                <t t-foreach="rmas" t-as="rma">
+                    <tr>
+                        <td>
+                            <a t-att-href="rma.get_portal_url()" t-att-title="rma.name">
+                                <t t-esc="rma.name"/>
+                            </a>
+                        </td>
+                        <td class="d-none d-md-table-cell"><span t-field="rma.date"/></td>
+                        <td><span t-field="rma.product_id.name"/></td>
+                        <td class='text-right'><span t-field="rma.product_uom_qty"/></td>
+                        <td class="d-none d-md-table-cell tx_status">
+                            <span class="badge badge-pill badge-secondary"><span t-field="rma.state"/></span>
+                        </td>
+                    </tr>
+                </t>
+            </tbody>
+        </t>
+      </t>
+    </template>
+
+    <template id="portal_rma_page" name="My RMA">
+        <t t-call="portal.portal_layout">
+            <t t-set="o_portal_fullwidth_alert" groups="rma.rma_group_user_own">
+                <t t-call="portal.portal_back_in_edit_mode">
+                    <t t-set="backend_url" t-value="'/web#return_label=Website&amp;model=rma&amp;id=%s&amp;view_type=form' % (rma.id)"/>
+                </t>
+            </t>
+
+            <t t-call="portal.portal_record_layout">
+                <t t-set="card_header">
+                    <h5 class="mb-0">
+                        <span>
+                            RMA Order - <span t-field="rma.name"/>
+                        </span>
+                        <span style="position: absolute; left: 50%;" class="d-none d-sm-inline">
+                            <a t-att-href="rma.get_portal_url(report_type='pdf', download=True)">
+                                <i class="fa fa-download" role="img" aria-label="Download" title="Download"/>
+                            </a>
+                        </span>
+                        <span class="float-right">
+                            <t t-if="rma.state in ['refunded', 'returned', 'replaced']">
+                                <span class="small text-success orders_label_text_align"><i class="fa fa-fw fa-check"/> <b><span t-field="rma.state"/></b></span>
+                            </t>
+                            <t t-elif="rma.state in ['cancelled', 'locked']">
+                                <span class="small text-danger orders_label_text_align"><i class="fa fa-fw fa-times"/> <b><span t-field="rma.state"/></b></span>
+                            </t>
+                            <t t-else="">
+                                <span class="small text-info orders_label_text_align"><i class="fa fa-fw fa-clock-o"/> <b><span t-field="rma.state"/></b></span>
+                            </t>
+                        </span>
+                    </h5>
+                </t>
+                <t t-set="card_body">
+                    <div id="general_information">
+                        <div class="row mt4">
+                            <div t-if="rma.partner_id" class="col-12 col-md-6 mb-4 mb-md-0">
+                                <h6><strong>Customer:</strong></h6>
+                                <div class="row">
+                                    <div class="col flex-grow-0 pr-3">
+                                        <img t-if="rma.partner_id.image" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(rma.partner_id.image)" alt="Contact"/>
+                                        <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    </div>
+                                    <div class="col pl-sm-0">
+                                        <address t-field="rma.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                    </div>
+                                </div>
+                            </div>
+                            <div t-if="rma.user_id" class="col-12 col-md-6">
+                                <h6><strong>Responsible:</strong></h6>
+                                <div class="row">
+                                    <div class="col flex-grow-0 pr-3">
+                                        <img t-if="rma.user_id.image" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(rma.user_id.image)" alt="Contact"/>
+                                        <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    </div>
+                                    <div class="col pl-sm-0">
+                                        <address t-field="rma.user_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row mt32" id="product_information">
+                            <div class="col-12 col-md-6 mb-4 mb-md-0">
+                                <div t-if="rma.picking_id" class="row mb-2 mb-sm-1">
+                                    <div class="col-12 col-sm-4">
+                                        <strong>Origin delivery</strong>
+                                    </div>
+                                    <div class="col-12 col-sm-8">
+                                        <span t-field="rma.picking_id"/>
+                                    </div>
+                                </div>
+                                <div t-if="rma.product_id" class="row mb-2 mb-sm-1">
+                                    <div class="col-12 col-sm-4">
+                                        <strong>Product</strong>
+                                    </div>
+                                    <div class="col-12 col-sm-8">
+                                        <span t-field="rma.product_id"/>
+                                    </div>
+                                </div>
+                                <div t-if="rma.product_uom_qty" class="row mb-2 mb-sm-1">
+                                    <div class="col-12 col-sm-4">
+                                        <strong>Quantity</strong>
+                                    </div>
+                                    <div class="col-12 col-sm-8">
+                                        <span t-field="rma.product_uom_qty"/>
+                                    </div>
+                                </div>
+                                <div t-if="rma.delivered_qty" class="row">
+                                    <div class="col-12 col-sm-4">
+                                        <strong>Delivered quantity</strong>
+                                    </div>
+                                    <div class="col-12 col-sm-8">
+                                        <span t-field="rma.delivered_qty"/>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-12 col-md-6">
+                                <div t-if="rma.date" class="row mb-2 mb-sm-1">
+                                    <div class="col-12 col-sm-4">
+                                        <strong>RMA Date</strong>
+                                    </div>
+                                    <div class="col-12 col-sm-8">
+                                        <span t-field="rma.date" t-options='{"widget": "date"}'/>
+                                    </div>
+                                </div>
+                                <div t-if="rma.deadline" class="row mb-2 mb-sm-1">
+                                    <div class="col-12 col-sm-4">
+                                        <strong>Deadline</strong>
+                                    </div>
+                                    <div class="col-12 col-sm-8">
+                                        <span t-field="rma.deadline" t-options='{"widget": "date"}'/>
+                                    </div>
+                                </div>
+                                <div t-if="rma.origin" class="row">
+                                    <div class="col-12 col-sm-4">
+                                        <strong>Origin</strong>
+                                    </div>
+                                    <div class="col-12 col-sm-8">
+                                        <span t-field="rma.origin"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <section t-if="rma.reception_move_id" id="reception_section" style="page-break-inside: auto;" class="mt32">
+                        <strong class="d-block mb-1">Reception</strong>
+                        <t t-set="picking" t-value="rma.reception_move_id.picking_id"/>
+                        <t t-set="report_url" t-value="'/my/rma/picking/pdf/%s?%s' % (picking.id, keep_query())"/>
+                        <a class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3" t-att-href="report_url">
+                            <div>
+                                <i class="fa fa-truck mr-1" role="img" aria-label="Download" title="Download"/>
+                                <span t-esc="picking.name" class="mr-lg-3"/>
+                                <div class="d-lg-inline-block">Date: <span class="text-muted" t-field="picking.date"/></div>
+                            </div>
+                            <t t-if="picking.state == 'done'">
+                                <span class="badge badge-success label-text-align"><i class="fa fa-fw fa-truck"/> Shipped</span>
+                            </t>
+                            <t t-if="picking.state == 'partially_available'">
+                                <span class="badge badge-warning label-text-align"><i class="fa fa-fw fa-clock-o"/> Partially Available</span>
+                            </t>
+                            <t t-if="picking.state == 'cancel'">
+                                <span class="badge badge-danger label-text-align"><i class="fa fa-fw fa-times"/> Cancelled</span>
+                            </t>
+                            <t t-if="picking.state in ['draft', 'waiting', 'confirmed', 'assigned']">
+                                <span class="badge badge-info label-text-align"><i class="fa fa-fw fa-clock-o"/> Preparation</span>
+                            </t>
+                        </a>
+                    </section>
+                    <section t-if="rma.refund_id" id="refund_section" style="page-break-inside: auto;" class="mt32">
+                        <strong class="d-block mb-1">Refund</strong>
+                        <t t-set="refund" t-value="rma.refund_id"/>
+                        <t t-set="report_url" t-value="refund.get_portal_url(report_type='pdf')"/>
+                        <a class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3" t-att-href="report_url">
+                            <div>
+                                <i class="fa fa-pencil-square-o mr-1" role="img" aria-label="Download" title="Download"/>
+                                <span t-esc="refund.number" class="mr-lg-3"/>
+                                <div class="d-lg-inline-block">Date: <span class="text-muted" t-field="refund.date_invoice"/></div>
+                            </div>
+                            <span t-if="refund.state == 'paid'" class="small text-success orders_label_text_align"><i class="fa fa-fw fa-check"/> <b>Paid</b></span>
+                            <span t-else="" class="small text-info orders_label_text_align"><i class="fa fa-fw fa-clock-o"/> <b>Waiting Payment</b></span>
+                        </a>
+                    </section>
+                    <section t-if="rma.delivery_move_ids" id="reception_section" style="page-break-inside: auto;" class="mt32">
+                        <strong class="d-block mb-1">Delivery</strong>
+                        <ul class="list-group mb-4">
+                            <t t-foreach="rma.delivery_move_ids.mapped('picking_id')" t-as="picking">
+                                <t t-set="report_url" t-value="'/my/rma/picking/pdf/%s?%s' % (picking.id, keep_query())"/>
+                                <a class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3" t-att-href="report_url">
+                                    <div>
+                                        <i class="fa fa-truck mr-1" role="img" aria-label="Download" title="Download"/>
+                                        <span t-esc="picking.name" class="mr-lg-3"/>
+                                        <div class="d-lg-inline-block">Date: <span class="text-muted" t-field="picking.date"/></div>
+                                    </div>
+                                    <t t-if="picking.state == 'done'">
+                                        <span class="badge badge-success label-text-align"><i class="fa fa-fw fa-truck"/> Shipped</span>
+                                    </t>
+                                    <t t-if="picking.state == 'partially_available'">
+                                        <span class="badge badge-warning label-text-align"><i class="fa fa-fw fa-clock-o"/> Partially Available</span>
+                                    </t>
+                                    <t t-if="picking.state == 'cancel'">
+                                        <span class="badge badge-danger label-text-align"><i class="fa fa-fw fa-times"/> Cancelled</span>
+                                    </t>
+                                    <t t-if="picking.state in ['draft', 'waiting', 'confirmed', 'assigned']">
+                                        <span class="badge badge-info label-text-align"><i class="fa fa-fw fa-clock-o"/> Preparation</span>
+                                    </t>
+                                </a>
+                            </t>
+                        </ul>
+                    </section>
+                    <section id="description" class="mt-5" t-if="rma.description">
+                        <h3 class="">Description</h3>
+                        <hr class="mt-0 mb-1"/>
+                        <em t-field="rma.description"/>
+                    </section>
+                </t>
+            </t>
+            <!-- chatter -->
+            <div id="rma_communication" class="mt-4">
+                <h2>Communication</h2>
+                <t t-call="portal.message_thread">
+                    <t t-set="object" t-value="rma"/>
+                </t>
+            </div>
+        </t>
+    </template>
+</odoo>
diff --git a/rma/views/rma_team_views.xml b/rma/views/rma_team_views.xml
new file mode 100644
index 000000000..328e1ee6c
--- /dev/null
+++ b/rma/views/rma_team_views.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="rma_team_view_form" model="ir.ui.view">
+        <field name="name">rma.team.view.form</field>
+        <field name="model">rma.team</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+                            <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                        </button>
+                    </div>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" string="RMA Team" />
+                        <h1>
+                            <field name="name" />
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="user_id" />
+                            <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company" />
+                        </group>
+                    </group>
+                    <notebook>
+                        <page name="members" string="Team Members">
+                            <field name="member_ids" widget="many2many" options="{'not_delete': True}">
+                                <kanban quick_create="false" create="true" delete="true">
+                                    <field name="id"/>
+                                    <field name="name"/>
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <div class="oe_kanban_global_click" style="max-width: 200px">
+                                                <div class="o_kanban_record_top">
+                                                    <img t-att-src="kanban_image('res.users', 'image_small', record.id.raw_value)" height="40" width="40" class="oe_avatar oe_kanban_avatar_smallbox mb0" alt="Avatar"/>
+                                                    <div class="o_kanban_record_headings ml8">
+                                                        <strong class="o_kanban_record_title"><field name="name"/></strong>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                            </field>
+                        </page>
+                        <page name="emails" string="Email" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                            <group name="group_alias">
+                                <label for="alias_name" string="Email Alias"/>
+                                <div name="alias_def">
+                                    <field name="alias_id" class="oe_read_only oe_inline"
+                                            string="Email Alias" required="0"/>
+                                    <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
+                                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                                    </div>
+                                </div>
+                                <field name="alias_contact" class="oe_inline oe_edit_only"
+                                        string="Accept Emails From"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="rma_team_action" model="ir.actions.act_window">
+        <field name="name">RMA team</field>
+        <field name="res_model">rma.team</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Click to add a new RMA.
+            </p>
+        </field>
+    </record>
+
+    <menuitem
+        id="rma_configuration_rma_team_menu"
+        name="RMA Team"
+        parent="rma_configuration_menu"
+        action="rma_team_action"/>
+</odoo>
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
new file mode 100644
index 000000000..c86d14c28
--- /dev/null
+++ b/rma/views/rma_views.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="rma_view_search" model="ir.ui.view">
+        <field name="name">rma.view.search</field>
+        <field name="model">rma</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name" />
+                <field name="user_id" />
+                <filter name="draft_filter"
+                        string="Draft"
+                        domain="[('state','=', 'draft')]" />
+                <filter name="confirmed_filter"
+                        string="Confirmed"
+                        domain="[('state','=', 'confirmed')]" />
+                <filter name="received_filter"
+                        string="Received"
+                        domain="[('state','=', 'received')]" />
+                <separator />
+                <filter name="no_user_id_filter"
+                        string="Unassigned RMAs"
+                        domain="[('user_id','=', False)]" />
+                <group string="Group By" name="group_by">
+                    <filter string="Partner"
+                            name="partner_id_group_by"
+                            context="{'group_by':'partner_id'}" />
+                    <filter string="Responsible"
+                            name="user_id_group_by"
+                            context="{'group_by':'user_id'}" />
+                    <filter string="State"
+                            name="state_group_by"
+                            context="{'group_by':'state'}" />
+                    <filter string="Date"
+                            name="date_group_by"
+                            context="{'group_by':'date'}" />
+                    <filter string="Deadline"
+                            name="deadline_group_by"
+                            context="{'group_by':'deadline'}" />
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="rma_view_tree" model="ir.ui.view">
+        <field name="name">rma.view.tree</field>
+        <field name="model">rma</field>
+        <field name="arch" type="xml">
+            <tree decoration-muted="state in ['cancelled', 'locked']"
+                  decoration-bf="state == 'draft' and product_id == False">
+                <field name="name"/>
+                <field name="origin"/>
+                <field name="user_id"/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
+                <field name="product_uom_qty"/>
+                <field name="product_uom" groups="uom.group_uom"/>
+                <field name="date"/>
+                <field name="deadline"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="rma_view_form" model="ir.ui.view">
+        <field name="name">rma.view.form</field>
+        <field name="model">rma</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button name="%(portal.portal_share_action)d"
+                            string="Share"
+                            type="action"
+                            class="oe_highlight oe_read_only"/>
+                    <button type="object"
+                            string="Send by Email"
+                            name="action_rma_send"
+                            attrs="{'invisible':['|', ('sent','=',True), ('state', 'not in', ['draft', 'confirmed', 'received'])]}"
+                            class="btn-primary"/>
+                    <button type="object"
+                            string="Send by Mail"
+                            name="action_rma_send"
+                            attrs="{'invisible':['|', ('sent','=',False), ('state', 'not in', ['draft', 'confirmed', 'received'])]}" />
+                    <button type="object"
+                            string="Confirm"
+                            name="action_confirm"
+                            states="draft"
+                            class="btn-primary"/>
+                    <button type="object"
+                            string="To Refund"
+                            name="action_refund"
+                            attrs="{'invisible': [('can_be_refunded', '=', False)]}"
+                            class="btn-primary"/>
+                    <button type="object"
+                            string="Replace"
+                            name="action_replace"
+                            attrs="{'invisible': [('can_be_replaced', '=', False)]}"
+                            class="btn-primary"/>
+                    <button type="object"
+                            string="Return to customer"
+                            name="action_return"
+                            attrs="{'invisible': [('can_be_returned', '=', False)]}"
+                            class="btn-primary"/>
+                    <button type="object"
+                            string="Split"
+                            name="action_split"
+                            attrs="{'invisible': [('can_be_split', '=', False)]}"/>
+                    <button type="object"
+                            string="Cancel"
+                            name="action_cancel"
+                            confirm="Are you sure you want to cancel this RMA"
+                            states="draft,confirmed"/>
+                    <button type="object"
+                            string="Set to draft"
+                            name="action_draft"
+                            states="cancelled"/>
+                    <button type="object"
+                            string="Lock"
+                            name="action_lock"
+                            attrs="{'invisible': [('can_be_locked', '=', False)]}"/>
+                    <button type="object"
+                            string="Unlock"
+                            name="action_unlock"
+                            states="locked"/>
+                    <button type="object"
+                            string="Preview"
+                            name="action_preview"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,received"/>
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button type="object"
+                                name="action_view_receipt"
+                                string="Receipt"
+                                class="oe_stat_button"
+                                icon="fa-truck"
+                                attrs="{'invisible': [('reception_move_id', '=', False)]}">
+                        </button>
+                        <button type="object"
+                                name="action_view_delivery"
+                                class="oe_stat_button"
+                                icon="fa-truck"
+                                attrs="{'invisible': [('delivery_picking_count', '=', 0)]}">
+                            <field name="delivery_picking_count" widget="statinfo" string="Delivery"/>
+                        </button>
+                        <button type="object"
+                                string="Refund"
+                                name="action_view_refund"
+                                class="oe_stat_button"
+                                icon="fa-pencil-square-o"
+                                attrs="{'invisible': [('refund_id', '=', False)]}">
+                        </button>
+                    </div>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" readonly="1"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="partner_id" widget="res_partner_many2one" context="{'search_default_customer':1, 'show_address': 1, 'show_vat': True}" options="{'always_reload': True}"/>
+                            <field name="partner_invoice_id"/>
+                            <field name="picking_id"
+                                   options="{'no_create': True}"/>
+                            <field name="move_id"
+                                   attrs="{'required': [('picking_id', '!=', False)], 'readonly': [('picking_id', '=', False)]}"
+                                   options="{'no_create': True}"
+                                   force_save="1"/>
+                            <field name="product_id"
+                                   force_save="1"
+                                   attrs="{'readonly': ['|', ('picking_id', '!=', False), ('state', '!=', 'draft')]}"/>
+                            <label for="product_uom_qty"/>
+                            <div class="o_row">
+                                <field name="product_uom_qty"/>
+                                <field name="product_uom"
+                                       groups="uom.group_uom"/>
+                            </div>
+                            <field name="delivered_qty"
+                                   attrs="{'invisible': [('delivered_qty', '=', 0.0)]}"/>
+                        </group>
+                        <group>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                            <field name="team_id"/>
+                            <field name="origin"/>
+                            <field name="operation_id"/>
+                            <field name="company_id"
+                                   options="{'no_create': True}"
+                                   groups="base.group_multi_company"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page name="page_other"
+                              string="Other Information">
+                            <group>
+                                <group>
+                                    <field name="procurement_group_id"/>
+                                    <field name="location_id"
+                                           options="{'no_create': True, 'no_open': True}"
+                                           groups="stock.group_stock_multi_locations" />
+                                </group>
+                                <group>
+                                    <field name="deadline"/>
+                                    <field name="priority" widget="priority"/>
+                                    <field name="origin_split_rma_id"
+                                           attrs="{'invisible': [('origin_split_rma_id', '=', False)]}"/>
+                                </group>
+                            </group>
+                            <group>
+                                <label for="description" class="oe_edit_only"/>
+                                <field name="description" colspan="4" nolabel="1"/>
+                            </group>
+                        </page>
+                    </notebook>
+                    <field name="sent" invisible="1"/>
+                    <field name="reception_move_id" invisible="1"/>
+                    <field name="refund_id" invisible="1"/>
+                    <field name="can_be_refunded" invisible="1"/>
+                    <field name="can_be_returned" invisible="1"/>
+                    <field name="can_be_replaced" invisible="1"/>
+                    <field name="can_be_split" invisible="1"/>
+                    <field name="can_be_locked" invisible="1"/>
+                    <field name="commercial_partner_id" invisible="1"/>
+                    <field name="remaining_qty" invisible="1"/>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="activity_ids" widget="mail_activity"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="rma_view_pivot" model="ir.ui.view">
+        <field name="name">rma.pivot</field>
+        <field name="model">rma</field>
+        <field name="arch" type="xml">
+            <pivot>
+                <field name="date" type="row"/>
+                <field name="product_uom_qty" type="measure"/>
+                <field name="delivered_qty" type="measure"/>
+            </pivot>
+        </field>
+    </record>
+
+    <record id="rma_view_calendar" model="ir.ui.view">
+        <field name="name">rma.calendar</field>
+        <field name="model">rma</field>
+        <field name="arch" type="xml">
+            <calendar date_start="date" mode="month" color="state" quick_add="False">
+                <field name="name"/>
+                <field name="partner_id"/>
+                <field name="product_id"/>
+                <field name="product_uom_qty" widget="monetary"/>
+            </calendar>
+        </field>
+    </record>
+
+    <record id="rma_refund_action_server" model="ir.actions.server">
+        <field name="name">To Refund</field>
+        <field name="model_id" ref="model_rma"/>
+        <field name="binding_model_id" ref="model_rma"/>
+        <field name="state">code</field>
+        <field name="code">records.action_refund()</field>
+    </record>
+
+    <record id="rma_action" model="ir.actions.act_window">
+        <field name="name">RMA</field>
+        <field name="res_model">rma</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form,pivot,calendar</field>
+        <field name="context">{"search_default_user_id": uid}</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Click to add a new RMA.
+            </p>
+        </field>
+    </record>
+
+    <record id="rma.rma_orders_menu" model="ir.ui.menu">
+        <field name="action" ref="rma_action"/>
+    </record>
+</odoo>
diff --git a/rma/views/stock_picking_views.xml b/rma/views/stock_picking_views.xml
new file mode 100644
index 000000000..d1f754001
--- /dev/null
+++ b/rma/views/stock_picking_views.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="view_picking_form" model="ir.ui.view">
+        <field name="name">stock.picking.form</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <div name="button_box">
+                <button name="action_view_rma"
+                        type="object"
+                        class="oe_stat_button"
+                        icon="fa-reply"
+                        attrs="{'invisible': [('rma_count', '=', 0)]}">
+                    <field name="rma_count"
+                           widget="statinfo"
+                           string="RMA"/>
+                </button>
+            </div>
+        </field>
+    </record>
+</odoo>
diff --git a/rma/views/stock_warehouse_views.xml b/rma/views/stock_warehouse_views.xml
new file mode 100644
index 000000000..2371182e5
--- /dev/null
+++ b/rma/views/stock_warehouse_views.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_warehouse_inherit_mrp" model="ir.ui.view">
+        <field name="name">Stock Warehouse Inherit MRP</field>
+        <field name="model">stock.warehouse</field>
+        <field name="inherit_id" ref="stock.view_warehouse"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='wh_output_stock_loc_id']/..">
+                <field name="rma_loc_id"/>
+            </xpath>
+            <xpath expr="//field[@name='out_type_id']/..">
+                <field name="rma_in_type_id"/>
+                <field name="rma_out_type_id"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/rma/wizard/__init__.py b/rma/wizard/__init__.py
new file mode 100644
index 000000000..b81a7402c
--- /dev/null
+++ b/rma/wizard/__init__.py
@@ -0,0 +1,5 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import rma_delivery
+from . import rma_split
+from . import stock_picking_return
diff --git a/rma/wizard/rma_delivery.py b/rma/wizard/rma_delivery.py
new file mode 100644
index 000000000..ef72053be
--- /dev/null
+++ b/rma/wizard/rma_delivery.py
@@ -0,0 +1,102 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+import odoo.addons.decimal_precision as dp
+
+
+class RmaReDeliveryWizard(models.TransientModel):
+    _name = 'rma.delivery.wizard'
+    _description = 'RMA Delivery Wizard'
+
+    rma_count = fields.Integer()
+    type = fields.Selection(
+        selection=[
+            ('replace', 'Replace'),
+            ('return', 'Return to customer'),
+        ],
+        string="Type",
+        required=True,
+    )
+    product_id = fields.Many2one(
+        comodel_name="product.product",
+        string="Replace Product",
+    )
+    product_uom_qty = fields.Float(
+        string='Product qty',
+        digits=dp.get_precision('Product Unit of Measure'),
+    )
+    product_uom = fields.Many2one(
+        comodel_name="uom.uom",
+        string="Unit of measure",
+    )
+    scheduled_date = fields.Datetime(
+        required=True,
+        default=fields.Datetime.now(),
+    )
+    warehouse_id = fields.Many2one(
+        comodel_name="stock.warehouse",
+        string='Warehouse',
+        required=True,
+    )
+
+    @api.constrains('product_uom_qty')
+    def _check_product_uom_qty(self):
+        self.ensure_one()
+        rma_ids = self.env.context.get('active_ids')
+        if len(rma_ids) == 1 and self.product_uom_qty <= 0:
+            raise ValidationError(_('Quantity must be greater than 0.'))
+
+    @api.model
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        rma_ids = self.env.context.get('active_ids')
+        rma = self.env['rma'].browse(rma_ids)
+        warehouse_id = self.env['stock.warehouse'].search(
+            [('company_id', '=', rma[0].company_id.id)], limit=1).id
+        delivery_type = self.env.context.get('rma_delivery_type')
+        product_id = False
+        if len(rma) == 1 and delivery_type == 'return':
+            product_id = rma.product_id.id
+        product_uom_qty = 0.0
+        if len(rma) == 1 and rma.remaining_qty > 0.0:
+            product_uom_qty = rma.remaining_qty
+        res.update(
+            rma_count=len(rma),
+            warehouse_id=warehouse_id,
+            type=delivery_type,
+            product_id=product_id,
+            product_uom_qty=product_uom_qty,
+        )
+        return res
+
+    @api.onchange("product_id")
+    def _onchange_product_id(self):
+        domain_product_uom = []
+        if self.product_id:
+            domain_product_uom = [
+                ('category_id', '=', self.product_id.uom_id.category_id.id)
+            ]
+            if (not self.product_uom
+                    or self.product_id.uom_id.id != self.product_uom.id):
+                self.product_uom = self.product_id.uom_id
+        return {'domain': {'product_uom': domain_product_uom}}
+
+    def action_deliver(self):
+        self.ensure_one()
+        rma_ids = self.env.context.get('active_ids')
+        rma = self.env['rma'].browse(rma_ids)
+        if self.type == 'replace':
+            rma.create_replace(
+                self.scheduled_date,
+                self.warehouse_id,
+                self.product_id,
+                self.product_uom_qty,
+                self.product_uom,
+            )
+        elif self.type == 'return':
+            qty = uom = None
+            if self.rma_count == 1:
+                qty, uom = self.product_uom_qty, self.product_uom
+            rma.create_return(self.scheduled_date, qty, uom)
diff --git a/rma/wizard/rma_delivery_views.xml b/rma/wizard/rma_delivery_views.xml
new file mode 100644
index 000000000..2efcbc05e
--- /dev/null
+++ b/rma/wizard/rma_delivery_views.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="rma_redelivery_wizard_view_form" model="ir.ui.view">
+        <field name="name">rma.delivery.wizard.form</field>
+        <field name="model">rma.delivery.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <group>
+                    <group>
+                        <field name="scheduled_date"/>
+                        <field name="warehouse_id"
+                               attrs="{'invisible': [('type', '!=', 'replace')]}"/>
+                    </group>
+                    <group>
+                        <field name="product_id"
+                               attrs="{'invisible': ['|', ('type', '!=', 'replace'), ('rma_count', '>', 1)], 'required': [('type', '=', 'replace'), ('rma_count', '=', 1)]}"/>
+                        <label for="product_uom_qty"
+                               attrs="{'invisible': [('rma_count', '>', 1)]}"/>
+                        <div class="o_row"
+                             attrs="{'invisible': [('rma_count', '>', 1)]}">
+                            <field name="product_uom_qty"
+                                   attrs="{'required': [('rma_count', '=', 1)]}"/>
+                            <field name="product_uom"
+                                   groups="uom.group_uom"
+                                   attrs="{'required': [('rma_count', '=', 1)]}"/>
+                        </div>
+                    </group>
+                </group>
+                <field name="rma_count" invisible="1"/>
+                <field name="type" invisible="1"/>
+                <footer>
+                    <button name="action_deliver" string="Deliver" type="object" class="btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+    <act_window id="rma_delivery_wizard_action"
+                name="Return to customer"
+                src_model="rma"
+                res_model="rma.delivery.wizard"
+                view_type="form"
+                view_mode="form"
+                key2="client_action_multi"
+                target="new"
+                multi="True"
+                context="{'rma_delivery_type': 'return'}"/>
+</odoo>
diff --git a/rma/wizard/rma_split.py b/rma/wizard/rma_split.py
new file mode 100644
index 000000000..fc8ea8500
--- /dev/null
+++ b/rma/wizard/rma_split.py
@@ -0,0 +1,70 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, fields, models
+import odoo.addons.decimal_precision as dp
+
+
+class RmaReSplitWizard(models.TransientModel):
+    _name = 'rma.split.wizard'
+    _description = 'RMA Split Wizard'
+
+    rma_id = fields.Many2one(
+        comodel_name='rma',
+        string='RMA',
+    )
+    product_uom_qty = fields.Float(
+        string='Quantity to extract',
+        digits=dp.get_precision('Product Unit of Measure'),
+        required=True,
+        help="Quantity to extract to a new RMA."
+    )
+    product_uom = fields.Many2one(
+        comodel_name='uom.uom',
+        string='Unit of measure',
+        required=True,
+    )
+
+    _sql_constraints = [
+        (
+            'check_product_uom_qty_positive',
+            'CHECK(product_uom_qty > 0)',
+            'Quantity must be greater than 0.'
+        ),
+    ]
+
+    @api.model
+    def fields_get(self, allfields=None, attributes=None):
+        res = super().fields_get(allfields, attributes=attributes)
+        rma_id = self.env.context.get('active_id')
+        rma = self.env['rma'].browse(rma_id)
+        res['product_uom']['domain'] = [
+            ('category_id', '=', rma.product_uom.category_id.id)
+        ]
+        return res
+
+    @api.model
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        rma_id = self.env.context.get('active_id')
+        rma = self.env['rma'].browse(rma_id)
+        res.update(
+            rma_id=rma.id,
+            product_uom_qty=rma.remaining_qty,
+            product_uom=rma.product_uom.id,
+        )
+        return res
+
+    def action_split(self):
+        self.ensure_one()
+        extracted_rma = self.rma_id.extract_quantity(
+            self.product_uom_qty, self.product_uom)
+        return {
+            'name': _('Extracted RMA'),
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'rma',
+            'views': [(self.env.ref('rma.rma_view_form').id, 'form')],
+            'res_id': extracted_rma.id,
+        }
diff --git a/rma/wizard/rma_split_views.xml b/rma/wizard/rma_split_views.xml
new file mode 100644
index 000000000..d33ba877b
--- /dev/null
+++ b/rma/wizard/rma_split_views.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="rma_split_wizard_view_form2" model="ir.ui.view">
+        <field name="name">rma.split.wizard.form</field>
+        <field name="model">rma.split.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <group>
+                    <group>
+                        <label for="product_uom_qty"/>
+                        <div class="o_row">
+                            <field name="product_uom_qty"/>
+                            <field name="product_uom" groups="uom.group_uom"/>
+                        </div>
+                    </group>
+                </group>
+                <footer>
+                    <button name="action_split" string="Split" type="object" class="btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+    <record id="rma_split_wizard_action" model="ir.actions.act_window">
+        <field name="name">Split RMA</field>
+        <field name="res_model">rma.split.wizard</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+</odoo>
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
new file mode 100644
index 000000000..0608c3410
--- /dev/null
+++ b/rma/wizard/stock_picking_return.py
@@ -0,0 +1,83 @@
+# Copyright 2020 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class ReturnPicking(models.TransientModel):
+    _inherit = 'stock.return.picking'
+
+    create_rma = fields.Boolean(
+        string="Create RMAs"
+    )
+    picking_type_code = fields.Selection(
+        selection=[
+            ('incoming', 'Vendors'),
+            ('outgoing', 'Customers'),
+            ('internal', 'Internal'),
+        ],
+        related='picking_id.picking_type_id.code',
+        store=True,
+        readonly=True,
+    )
+
+    @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([]).mapped('rma_loc_id')
+            rma_loc_domain = [('id', 'child_of', rma_loc.ids)]
+        else:
+            self.location_id = self.default_get(['location_id'])['location_id']
+            rma_loc_domain = [
+                '|',
+                ('id', '=', self.picking_id.location_id.id),
+                ('return_location', '=', True),
+            ]
+        return {'domain': {'location_id': rma_loc_domain}}
+
+    def create_returns(self):
+        """ Override create_returns method for creating one or more
+        'confirmed' RMAs after return a delivery picking in case
+        'Create RMAs' checkbox is checked in this wizard.
+        New RMAs will be linked to the delivery picking as the origin
+        delivery and also RMAs will be linked to the returned picking
+        as the 'Receipt'.
+        """
+        if self.create_rma:
+            # set_rma_picking_type is to override the copy() method of stock
+            # picking and change the default picking type to rma picking type
+            self_with_context = self.with_context(set_rma_picking_type=True)
+            res = super(ReturnPicking, self_with_context).create_returns()
+            partner = self.picking_id.partner_id
+            if not partner:
+                raise ValidationError(_(
+                    "You must specify the 'Customer' in the "
+                    "'Stock Picking' from which RMAs will be created"))
+            picking = self.picking_id
+            returned_picking = self.env['stock.picking'].browse(res['res_id'])
+            if hasattr(picking, 'sale_id') and picking.sale_id:
+                partner_invoice_id = picking.sale_id.partner_invoice_id.id
+            else:
+                partner_invoice_id = partner.address_get(
+                    ['invoice']).get('invoice', False),
+            for move in returned_picking.move_lines:
+                self.env['rma'].create({
+                    'partner_id': partner.id,
+                    'partner_invoice_id': partner_invoice_id,
+                    'origin': picking.name,
+                    'picking_id': picking.id,
+                    'move_id': move.origin_returned_move_id.id,
+                    'product_id': move.origin_returned_move_id.product_id.id,
+                    'product_uom_qty': move.product_uom_qty,
+                    'product_uom': move.product_uom.id,
+                    'reception_move_id': move.id,
+                    'company_id': move.company_id.id,
+                    'location_id': move.location_dest_id.id,
+                    'state': 'confirmed',
+                })
+            return res
+        else:
+            return super().create_returns()
diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
new file mode 100644
index 000000000..87b8f8ed2
--- /dev/null
+++ b/rma/wizard/stock_picking_return_views.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="view_stock_return_picking_form" model="ir.ui.view">
+        <field name="name">Return lines inherit RMA</field>
+        <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">
+                <group name="group_rma">
+                    <field name="create_rma"
+                           attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"/>
+                    <field name="picking_id" invisible="1"/>
+                    <field name="picking_type_code" invisible="1"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+</odoo>

From 051bad1e1cf627d890b7c0efd15ee8e42e43e78c Mon Sep 17 00:00:00 2001
From: Fernando Colus <fcolus1@gmail.com>
Date: Wed, 22 Jul 2020 16:44:50 +0000
Subject: [PATCH 002/108] Added translation using Weblate (Portuguese (Brazil))

---
 rma/i18n/pt_BR.po | 1570 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1570 insertions(+)
 create mode 100644 rma/i18n/pt_BR.po

diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
new file mode 100644
index 000000000..34cfc5f76
--- /dev/null
+++ b/rma/i18n/pt_BR.po
@@ -0,0 +1,1570 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-07-27 20:19+0000\n"
+"Last-Translator: Fernando Colus <fcolus1@gmail.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.10\n"
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_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
+#: code:addons/rma/models/rma_team.py:43
+#, python-format
+msgid "%s (copy)"
+msgstr "%s (Cópia)"
+
+#. 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"
+"</div>\n"
+"        "
+msgstr ""
+"<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"
+"    Aqui está o RMA <strong>${object.name}</strong> from "
+"${object.company_id.name}.\n"
+"    <br/><br/>\n"
+"    Não deixe de nos contactar se houver qualquer dúvida ou outra questão.\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\"/>"
+msgstr ""
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\""
+"Download\"/>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<i class=\"fa fa-fw fa-check\"/> <b>Paid</b>"
+msgstr "<i class=\"fa fa-fw fa-check\"/> <b>Pago</b>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<i class=\"fa fa-fw fa-clock-o\"/> <b>Waiting Payment</b>"
+msgstr "<i class=\"fa fa-fw fa-clock-o\"/> <b>Aguardando Pagamento</b>"
+
+#. 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 ""
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
+
+#. 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 ""
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title=\""
+"Download\"/>"
+
+#. 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>"
+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>"
+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>"
+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>"
+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.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr "<strong class=\"d-block mb-1\">Entrega</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr "<strong class=\"d-block mb-1\">Recebimento</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr "<strong class=\"d-block mb-1\">Restituição</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr "<strong>Cliente:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr "<strong>Data:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr "<strong>Prazo Final:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr "<strong>Prazo Final</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr "<strong>Quantidade Enviada:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr "<strong>Quantidade Enviada</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Invoicing address:</strong>"
+msgstr "<strong>Endereço de Cobrança:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr "<strong>Movimentação:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr "<strong> Origem da Entrega: </strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin delivery</strong>"
+msgstr "<strong>Origem da Entrega</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr "<strong>Origem:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr "<strong>Origem</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr "<strong>Produto:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr "<strong>Produto</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr "<strong>Quantidade:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr "<strong>Quantidade</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr "<strong>Data de RMA</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr "<strong>Comentário do RMA:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr "<strong>Responsável:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr "<strong>Situação:</strong>"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+msgid "A Python dictionary that will be evaluated to provide default values when creating new records for this alias."
+msgstr ""
+"Um dicionário Python que será avaliado para fornecer valores padrão ao criar "
+"novos registros para esse alias."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Accept Emails From"
+msgstr "Aceitar e-mails de"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr "Aviso de acesso"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr "Ação Necessária"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+msgid "Active"
+msgstr "Ativar/Ativo(a)"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr "Atividades"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr "Situação da Atividade"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr "Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr "Segurança do Contato de Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr "Nome do Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr "Domínio do Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr "Modelo do Alias"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr "tem certeza que quer cancelar este RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr "Contagem de Anexos"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr "Avatar"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr "Pode Ser Travado"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr "Pode Ser Reembolsado"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr "Pode Ser Substituído"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr "Pode Ser Devolvido"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr "Pode Ser Dividido"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Canceled"
+msgstr "Cancelado(a)"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr "Clique para adicionar um novo RMA."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr "Entidade Comercial"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr "Comunicação"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr "Empresa"
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr "Configuração"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#: selection:rma,state:0
+msgid "Confirmed"
+msgstr "Confirmado(a)"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr "Contato"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr "Criar RMAs"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr "Criado Por"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr "Criado em"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr "URL do portal do cliente"
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:38
+#: model:ir.model.fields,field_description:rma.field_rma__date
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr "Data"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr "Data:"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr "Prazo Final"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr "Valores Padrão"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr "Entrega"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered qty"
+msgstr "Quantidade Enviada"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered qty done"
+msgstr "Quantidade Envidada Concluída"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr "Entrega"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr "Contagem de Entregas"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr "Reserva de Entrega"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Description"
+msgstr "Descrição"
+
+#. module: rma
+#: 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_operation__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_team__display_name
+msgid "Display Name"
+msgstr "Exibir Nome"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#: selection:rma,state:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr "Rascunho do RMA"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:1076
+#, python-format
+msgid "E-mail subject: %s\n"
+"\n"
+"E-mail body:\n"
+"%s"
+msgstr ""
+"Assunto do E-mail: %s\n"
+"\n"
+"Corpo do E-mail:\n"
+"%s"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr "Email"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr "Alias do Email"
+
+#. module: rma
+#: code:addons/rma/wizard/rma_split.py:63
+#, python-format
+msgid "Extracted RMA"
+msgstr "RMA Extraído"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr "Extraído de"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+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
+msgid "Followers (Partners)"
+msgstr "Seguidores (Parceiros)"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+msgstr "Agrupado Por"
+
+#. 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_operation__id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_team__id
+msgid "ID"
+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)"
+msgstr ""
+"ID do registro pai que contém o alias (exemplo: projeto que contém o alias "
+"de criação da tarefa)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_unread
+#: 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_needaction
+#: model:ir.model.fields,help:rma.field_rma_team__message_needaction
+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_team__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr "Se marcada, algumas mensagens apresentam um erro de entrega."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid "If the active field is set to false, it will allow you to hide the RMA Team without removing it."
+msgstr ""
+"Se o campo ativo estiver definido como falso, permitirá ocultar a equipe RMA "
+"sem removê-lo."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:1080
+#, python-format
+msgid "Incoming e-mail"
+msgstr "E-mail recebido"
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_invoice
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr "Endereço de Faturamento"
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Linha da Fatura"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr "É Seguidor"
+
+#. module: rma
+#: 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_operation____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_team____last_update
+msgid "Last Modified on"
+msgstr "Última Modificação Feita em"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr "Última Atualização Feita por"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr "Última Atualização Feita em"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr "Localização"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr "Travar"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Locked"
+msgstr "Travado"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr "Anexo Principal"
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr "Gerenciar Autorizações de Devolução de Mercadoria (RMAs)."
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr "Gerente"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr "Erro de Entrega de Mensagem"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:39
+#: model:ir.model.fields,field_description:rma.field_rma__name
+#: model:ir.model.fields,field_description:rma.field_rma_operation__name
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+msgid "Name"
+msgstr "Nome"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:31
+#: code:addons/rma/models/rma.py:496
+#: code:addons/rma/models/rma.py:1079
+#, python-format
+msgid "New"
+msgstr "Novo(a)"
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "New RMA in draft state"
+msgstr "Novo Rascunho de RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "Prazo Final da Próxima Atividade"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr "Resumo da Próxima Atividade"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+msgid "Next Activity Type"
+msgstr "Tipo da Próxima Atividade"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:757
+#, python-format
+msgid "None of the selected RMAs can perform a replacement."
+msgstr "Nenhum dos RMAs selecionados pode executar uma substituição."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:740
+#, python-format
+msgid "None of the selected RMAs can perform a return."
+msgstr "Nenhum dos RMAs selecionados pode executar uma devolução."
+
+#. module: rma
+#: selection:rma,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: rma
+#: selection:rma,priority:0
+msgid "Not urgent"
+msgstr "Não é urgente"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr "Número de Ações"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of error"
+msgstr "Número de Erros"
+
+#. 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"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+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 "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
+msgstr ""
+"ID opcional de um encadeamento (registro) ao qual todas as mensagens "
+"recebidas serão anexadas, mesmo que não tenham respondido. Se definido, isso "
+"desativará a criação de novos registros completamente."
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr "Pedidos"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr "Origem da Entrega"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr "Origem da Movimentação"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr "Outra Informação"
+
+#. module: rma
+#: selection:rma,activity_state:0
+msgid "Overdue"
+msgstr "Vencidos(as)"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr "Proprietário"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr "Modelo Pai"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+msgstr "ID do Encadeamento do Registro Pai"
+
+#. 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) and task (model))"
+msgstr ""
+"Modelo pai que contém o alias. O modelo que contém a referência de alias não "
+"é necessariamente o modelo fornecido pelo alias_model_id (exemplo: projeto "
+"(pai_modelo) e tarefa (modelo))"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: rma
+#: selection:rma,activity_state:0
+msgid "Planned"
+msgstr "Planejado)a)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+""
+msgstr ""
+"Política para postar uma mensagem no documento usando o mail gateway.\n"
+"- todos: todos podem postar\n"
+"- parceiros: apenas parceiros autenticados\n"
+"- seguidores: apenas seguidores do documento relacionado ou membros dos "
+"seguintes canais\n"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr "URL de acesso ao portal"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr "Pré-visualização"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr "Agrupamento de Aquisição"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr "Produto"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr "Quantidade de Produto"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Quantity"
+msgstr "Quantidade"
+
+#. module: rma
+#: code:addons/rma/wizard/rma_delivery.py:49
+#: sql_constraint:rma.split.wizard:0
+#, python-format
+msgid "Quantity must be greater than 0."
+msgstr "Quantidade precisa ser maior que zero."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract"
+msgstr "Quantidade a extrair"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:790
+#, 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)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr "Quantidade a extrair para um novo RMA."
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_invoice_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr "RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr "RMA #"
+
+#. module: rma
+#: code:addons/rma/models/res_company.py:18
+#, python-format
+msgid "RMA Code"
+msgstr "Código RMA"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:82
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr "Pedidos de Entrega RMA"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+msgid "RMA Delivery Wizard"
+msgstr "Assistente de Entrega RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr "Tipo Entrada RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr "Localização RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr "Pedido RMA -"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr "Pedidos RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr "Tipo Saída RMA"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:73
+#, python-format
+msgid "RMA Receipts"
+msgstr "Recebimentos RMA"
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr "Relatório RMA"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr "Assistente para divisão de RMA"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr "Equipe RMA"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr "Equipe de RMA da qual o usuário é membro."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr "Contagem de RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr "Destinatários RMA"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr "Os produtos relacionados ao RMA podem ser armazenados neste armazém."
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr "Operação solicitada pelo RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr "Devolução RMA"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr "Equipe RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr "RMAs"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr "Recebimento"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#: selection:rma,state:0
+msgid "Received"
+msgstr "Recebido"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr "Recebimento de Movimentação"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr "ID do segmento de registro"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+msgid "Reference of the document that generated this RMA."
+msgstr "Referência do documento que gerou este RMA."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:679
+#: model:ir.model.fields,field_description:rma.field_rma__refund_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: model:rma.operation,name:rma.rma_operation_refund
+#, python-format
+msgid "Refund"
+msgstr "Restituição"
+
+#. 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
+#: selection:rma,state:0
+msgid "Refunded"
+msgstr "Restituído"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr "Quantidade Entregue Restante"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr "Quantidade restante entregue a concluir"
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr "Reparo"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: selection:rma.delivery.wizard,type:0
+#: model:rma.operation,name:rma.rma_operation_replace
+msgid "Replace"
+msgstr "Substituir"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr "Substituir Produto"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Replaced"
+msgstr "Substituído"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:995
+#, 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."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:1006
+#, 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."
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_reporting_menu
+msgid "Reporting"
+msgstr "Comunicando"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+msgid "Requested operation"
+msgstr "Operação Solicitada"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:721
+#, python-format
+msgid "Required field(s):%s"
+msgstr "Campo(s) Solicitado(s):%s"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr "Responsável"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+msgid "Responsible User"
+msgstr "Usuário Responsável"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking
+msgid "Return Picking"
+msgstr "Retorno de Coleta"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: selection:rma.delivery.wizard,type:0
+msgid "Return to customer"
+msgstr "Retornar ao cliente"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:956
+#, 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."
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Returned"
+msgstr "Retornado(a)"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+msgid "Rma Count"
+msgstr "Contagem de RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
+msgid "Scheduled Date"
+msgstr "Data Programada"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr "Token de Segurança"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr "Enviado por Email"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr "Enviado(a) por Correio"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr "Enviado(a)"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:48
+#, python-format
+msgid "Sequence RMA in"
+msgstr "Sequência de Entrada RMA"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:53
+#, python-format
+msgid "Sequence RMA out"
+msgstr "Sequência de Saída RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr "Marcado como Rascunho"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr "Compartilhar"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr "Documento Fonte"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr "Dividir"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+msgid "Split RMA"
+msgstr "Dividir RMA"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:874
+#, 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."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__state
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "State"
+msgstr "Situação"
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:40
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#, python-format
+msgid "Status"
+msgstr "Status"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid "Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+"Status baseado em atividades\n"
+"Vencido: a data de vencimento já passou\n"
+"Hoje: a data da atividade é hoje\n"
+"Planejado: Atividades futuras."
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr "Movimentação de Estoque"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr "Regra de Estoque"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr "Líder de Equipe"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr "Membros da Equipe"
+
+#. module: rma
+#: sql_constraint:rma.operation:0
+msgid "That operation name already exists !"
+msgstr "Esse nome de operação já existe!"
+
+#. 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)"
+msgstr ""
+"Modelo (tipo de documento Odoo) ao qual esse alias corresponde. Qualquer e-"
+"mail recebido que não responda a um registro existente causará a criação de "
+"um novo registro desse modelo (por exemplo, uma tarefa do projeto)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+msgid "The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.odoo.com>"
+msgstr ""
+"O nome do alias do email, por exemplo 'jobs' se você deseja receber e-mails "
+"de <jobs@example.odoo.com>"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid "The owner of records created upon receiving emails on this alias. If this field is not set the system will attempt to find the right owner based on the sender (From) address, or will use the Administrator account if no system user is found for that address."
+msgstr ""
+"O proprietário dos registros criados ao receber emails nesse alias. Se esse "
+"campo não estiver definido, o sistema tentará encontrar o proprietário certo "
+"com base no endereço do remetente (De) ou usará a conta de Administrador se "
+"nenhum usuário do sistema for encontrado para esse endereço."
+
+#. module: rma
+#: code:addons/rma/models/stock_move.py:60
+#, 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)."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:778
+#, python-format
+msgid "The quantity to return is greater than remaining quantity."
+msgstr "A quantidade a retornar é maior que a quantidade restante."
+
+#. module: rma
+#: code:addons/rma/models/account_invoice.py:22
+#, python-format
+msgid "There is at least one invoice lines whose quantity is less than the quantity specified in its linked RMA."
+msgstr ""
+"Há pelo menos uma linha de fatura cuja quantidade é menor que a quantidade "
+"especificada na sua RMA vinculada."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:767
+#, python-format
+msgid "This RMA cannot be split."
+msgstr "Esta RMA não pode ser dividida."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:754
+#, python-format
+msgid "This RMA cannot perform a replacement."
+msgstr "Esta RMA não pode executar uma substituição."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:737
+#, python-format
+msgid "This RMA cannot perform a return."
+msgstr "Este RMA não pode executar uma devolução."
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr "A Ser Restituído"
+
+#. module: rma
+#: selection:rma,activity_state:0
+msgid "Today"
+msgstr "Hoje"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+msgid "Transfer"
+msgstr "Transferir"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr "Tipo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr "Tipo de Operação"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr "RMAs não atribuídos"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr "Unidade de Medida"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr "Unidade de Medida"
+
+#. module: rma
+#: selection:rma,priority:0
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_all
+msgid "User: All Documents"
+msgstr "Usuário: Todos os Documentos"
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+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
+#: selection:rma,priority:0
+msgid "Very Urgent"
+msgstr "Muito Urgente"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Waiting for refund"
+msgstr "Aguardando Restituição"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Waiting for replacement"
+msgstr "Aguardando Substituição"
+
+#. module: rma
+#: selection:rma,state:0
+msgid "Waiting for return"
+msgstr "Aguardando Devolução"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr "Armazém"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr "Mensagens do Site"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr "Histórico de Comunicação Através do Site"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:514
+#, 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
+#: code:addons/rma/wizard/stock_picking_return.py:56
+#, python-format
+msgid "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will be created"
+msgstr ""
+"Você deve especificar o 'Cliente' na 'Seleção de estoque' a partir do qual "
+"as RMAs serão criadas"
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid "the user will have access to all records of everyone in the RMA application."
+msgstr "o usuário terá acesso a todos os registros de todos na aplicação RMA."
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr "o usuário terá acesso aos seus próprios dados na aplicação RMA."
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+msgid "the user will have an access to the RMA configuration as well as statistic reports."
+msgstr ""
+"o usuário terá acesso à configuração RMA, bem como aos relatórios "
+"estatísticos."

From f94eadee13dcd45f88bf2fe3a721c3cd49ad3f4b Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Fri, 14 Aug 2020 12:15:42 +0200
Subject: [PATCH 003/108] [FIX+IMP] rma: view permissions + portal views access
 errors + teams flow + Translated using Weblate (Spanish)

[FIX] rma: views permissions

Regular users don't have permissions to rma models, so we should avoid
loading views that lead to permission errors.

TT24986

rma 12.0.1.1.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/

[FIX] rma: portal views access errors

- Portal mail thread needs token config.
- Unpublished products will raise AccessError on RMAs portal views for
portal users due to record rules.
- Ensure active_id when getting actions in rma, since we could come from
a context that pollutes the expected active rma id.

[IMP] rma: teams flow

- If no RMA Team is set, we'll assign a default one to the new RMA.
- A sequence is now used to search for the top team and assign it.
- No default user is assigned when it's not in the context (i.e. portal
rmas).

[UPD] Update rma.pot

rma 12.0.1.2.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/

Translated using Weblate (Spanish)

Currently translated at 96.2% (253 of 263 strings)

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/es/
---
 rma/README.rst                      |  19 ++-
 rma/__manifest__.py                 |   2 +-
 rma/i18n/es.po                      |  66 ++++-----
 rma/i18n/pt_BR.po                   | 200 ++++++++++++++++++----------
 rma/i18n/rma.pot                    |  43 +++---
 rma/models/rma.py                   |  29 +++-
 rma/models/rma_team.py              |   3 +-
 rma/readme/USAGE.rst                |  19 ++-
 rma/static/description/index.html   |  25 +++-
 rma/views/res_partner_views.xml     |   1 +
 rma/views/rma_portal_templates.xml  |  12 +-
 rma/views/rma_team_views.xml        |  11 ++
 rma/views/stock_picking_views.xml   |   1 +
 rma/views/stock_warehouse_views.xml |   1 +
 14 files changed, 294 insertions(+), 138 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index 788f6684a..dea2df0f2 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -89,8 +89,23 @@ An RMA can also be created from a return of a delivery order:
    Every RMA will be in confirmed state and they will
    be linked to the returning operation generated previously.
 
-**Note: An RMA can also be created from an incoming email (See configuration
-section).**
+There are Optional RMA Teams that can be used for:
+
+  - Organize RMAs in sections.
+  - Subscribe users to notifications.
+  - Create RMAs from incoming mail to special aliases (See configuration
+    section).
+
+To create an RMA Team (RMA Responsible user level required):
+
+  #. Go to *RMA > Configuration > RMA Teams*
+  #. Create a new team and assign a name, a responsible and members.
+  #. Subscribe users to notifications, that can be of these subtypes:
+
+     - RMA draft. When a new RMA is created.
+     - Notes, Debates, Activities. As in standard Odoo.
+  #. In the list view, use the cross handle to sort RMA Teams. The top team
+     will be the default one if no team is set.
 
 Known issues / Roadmap
 ======================
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index c06a9a0ad..469596dad 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "12.0.1.0.0",
+    "version": "12.0.1.2.0",
     "development_status": "Beta",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 242403e8d..e778d696c 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 05:13+0000\n"
-"PO-Revision-Date: 2020-06-21 01:16-0400\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2020-08-18 13:59+0000\n"
+"Last-Translator: David Vidal <david.vidal@tecnativa.com>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Generator: Poedit 2.0.6\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.10\n"
 
 #. module: rma
 #: model:mail.template,report_name:rma.mail_template_rma_notification
@@ -28,7 +28,7 @@ msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma_team.py:43
+#: code:addons/rma/models/rma_team.py:44
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -202,7 +202,6 @@ msgstr "<strong>Orden de Entrega:</strong>"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 #, fuzzy
-#| msgid "<strong>Origin delivery:</strong>"
 msgid "<strong>Origin delivery</strong>"
 msgstr "<strong>Orden de Entrega:</strong>"
 
@@ -325,7 +324,7 @@ msgstr "Modelo con seudónimo"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Are you sure you want to cancel this RMA"
-msgstr ""
+msgstr "¿Está seguro de querer cancelar este RMA?"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
@@ -538,7 +537,7 @@ msgid "Draft RMA"
 msgstr "RMA en estado Borrador"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1076
+#: code:addons/rma/models/rma.py:1091
 #, python-format
 msgid ""
 "E-mail subject: %s\n"
@@ -641,7 +640,7 @@ msgstr ""
 "sin eliminarlo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1080
+#: code:addons/rma/models/rma.py:1095
 #, python-format
 msgid "Incoming e-mail"
 msgstr "Correo electrónico entrante"
@@ -747,8 +746,8 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:496
-#: code:addons/rma/models/rma.py:1079
+#: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:495
+#: code:addons/rma/models/rma.py:1094
 #, python-format
 msgid "New"
 msgstr "Nuevo"
@@ -774,13 +773,13 @@ msgid "Next Activity Type"
 msgstr "Siguiente tipo de actividad"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:757
+#: code:addons/rma/models/rma.py:772
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Ninguno de los RMAs seleccionados puede realizar un reemplazo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:740
+#: code:addons/rma/models/rma.py:755
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr "Ninguno de los RMAs seleccionados puede realizar una devolución."
@@ -961,7 +960,7 @@ msgid "Quantity to extract"
 msgstr "Cantidad a extraer"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:790
+#: code:addons/rma/models/rma.py:805
 #, python-format
 msgid ""
 "Quantity to extract cannot be greater than remaining delivery quantity (%s "
@@ -1087,7 +1086,7 @@ msgstr ""
 #. module: rma
 #: model:ir.model,name:rma.model_rma_operation
 msgid "RMA requested operation"
-msgstr ""
+msgstr "Operación de RMA solicitada"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
@@ -1133,7 +1132,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referencia al documento que generó este RMA."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:679
+#: code:addons/rma/models/rma.py:693
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1169,7 +1168,7 @@ msgstr "Ctd. entregada restante por realizar"
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
-msgstr ""
+msgstr "Reparar"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -1189,7 +1188,7 @@ msgid "Replaced"
 msgstr "Reemplazado"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:995
+#: code:addons/rma/models/rma.py:1010
 #, python-format
 msgid ""
 "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
@@ -1201,7 +1200,7 @@ msgstr ""
 "picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1006
+#: code:addons/rma/models/rma.py:1021
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
@@ -1221,13 +1220,11 @@ msgstr "Informes"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__operation_id
-#, fuzzy
-#| msgid "Type of Operation"
 msgid "Requested operation"
-msgstr "Tipo de operación"
+msgstr "Operación solicitada"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:721
+#: code:addons/rma/models/rma.py:736
 #, python-format
 msgid "Required field(s):%s"
 msgstr "Campo(s) requerido(s):%s"
@@ -1256,7 +1253,7 @@ msgid "Return to customer"
 msgstr "Devolver al cliente"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:956
+#: code:addons/rma/models/rma.py:971
 #, python-format
 msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
@@ -1300,6 +1297,11 @@ msgstr "Enviar por correo"
 msgid "Sent"
 msgstr "Enviado"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+msgid "Sequence"
+msgstr "Secuencia"
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:48
 #, python-format
@@ -1339,7 +1341,7 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:874
+#: code:addons/rma/models/rma.py:889
 #, python-format
 msgid ""
 "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
@@ -1352,7 +1354,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma__state
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "State"
-msgstr "Provincia"
+msgstr "Estado"
 
 #. module: rma
 #: code:addons/rma/controllers/main.py:40
@@ -1398,7 +1400,7 @@ msgstr "Miembros del equipo"
 #. module: rma
 #: sql_constraint:rma.operation:0
 msgid "That operation name already exists !"
-msgstr ""
+msgstr "¡El nombre de operación ya existe!"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
@@ -1446,7 +1448,7 @@ msgstr ""
 "inicial porque el movimiento está enlazado a un RMA (%s)."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:778
+#: code:addons/rma/models/rma.py:793
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr "La cantidad a devolver es mayor que la cantidad restante del RMA."
@@ -1462,19 +1464,19 @@ msgstr ""
 "cantidad especificada en el RMA asociado."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:767
+#: code:addons/rma/models/rma.py:782
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Este RMA no puede ser dividido."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:754
+#: code:addons/rma/models/rma.py:769
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Este RMA no puede realizar un reemplazo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:737
+#: code:addons/rma/models/rma.py:752
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr "Este RMA no puede realizar una devolución."
@@ -1598,7 +1600,7 @@ msgid "Website communication history"
 msgstr "Historial de comunicaciones del sitio web"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:514
+#: code:addons/rma/models/rma.py:516
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr "No puede "
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 34cfc5f76..a64ce4790 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* rma
+# 	* rma
 #
 msgid ""
 msgstr ""
@@ -27,21 +27,23 @@ 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
-#: code:addons/rma/models/rma_team.py:43
+#: code:addons/rma/models/rma_team.py:44
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Cópia)"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
-msgid "<div style=\"margin: 0px; padding: 0px;\">\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"
-"    Here is the RMA <strong>${object.name}</strong> from ${object.company_id.name}.\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"
@@ -55,8 +57,8 @@ msgstr ""
 "        (${object.partner_id.parent_id.name})\n"
 "    % endif\n"
 "    <br/><br/>\n"
-"    Aqui está o RMA <strong>${object.name}</strong> from "
-"${object.company_id.name}.\n"
+"    Aqui está o RMA <strong>${object.name}</strong> from ${object.company_id."
+"name}.\n"
 "    <br/><br/>\n"
 "    Não deixe de nos contactar se houver qualquer dúvida ou outra questão.\n"
 "</p>\n"
@@ -65,10 +67,12 @@ 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 ""
-"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\""
-"Download\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
+"\"Download\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -82,42 +86,54 @@ msgstr "<i class=\"fa fa-fw fa-clock-o\"/> <b>Aguardando Pagamento</b>"
 
 #. 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\"/>"
+msgid ""
+"<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\"/>"
 
 #. 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\"/>"
+msgid ""
+"<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\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
+"\"Download\"/>"
 
 #. 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>"
+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>"
 
 #. 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>"
+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>"
 
 #. 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>"
+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>"
 
 #. 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>"
+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>"
@@ -240,7 +256,9 @@ msgstr "<strong>Situação:</strong>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
-msgid "A Python dictionary that will be evaluated to provide default values when creating new records for this alias."
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
 msgstr ""
 "Um dicionário Python que será avaliado para fornecer valores padrão ao criar "
 "novos registros para esse alias."
@@ -392,8 +410,7 @@ msgid "Confirm"
 msgstr "Confirmar"
 
 #. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
-#: selection:rma,state:0
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
 msgid "Confirmed"
 msgstr "Confirmado(a)"
 
@@ -507,8 +524,7 @@ msgid "Display Name"
 msgstr "Exibir Nome"
 
 #. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
-#: selection:rma,state:0
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
 msgid "Draft"
 msgstr "Rascunho"
 
@@ -519,9 +535,10 @@ msgid "Draft RMA"
 msgstr "Rascunho do RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1076
+#: code:addons/rma/models/rma.py:1091
 #, python-format
-msgid "E-mail subject: %s\n"
+msgid ""
+"E-mail subject: %s\n"
 "\n"
 "E-mail body:\n"
 "%s"
@@ -586,7 +603,9 @@ 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)"
+msgid ""
+"ID of the parent record holding the alias (example: project holding the task "
+"creation alias)"
 msgstr ""
 "ID do registro pai que contém o alias (exemplo: projeto que contém o alias "
 "de criação da tarefa)"
@@ -611,13 +630,15 @@ msgstr "Se marcada, algumas mensagens apresentam um erro de entrega."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
-msgid "If the active field is set to false, it will allow you to hide the RMA Team without removing it."
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
 msgstr ""
 "Se o campo ativo estiver definido como falso, permitirá ocultar a equipe RMA "
 "sem removê-lo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1080
+#: code:addons/rma/models/rma.py:1095
 #, python-format
 msgid "Incoming e-mail"
 msgstr "E-mail recebido"
@@ -723,9 +744,8 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:31
-#: code:addons/rma/models/rma.py:496
-#: code:addons/rma/models/rma.py:1079
+#: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:495
+#: code:addons/rma/models/rma.py:1094
 #, python-format
 msgid "New"
 msgstr "Novo(a)"
@@ -751,13 +771,13 @@ msgid "Next Activity Type"
 msgstr "Tipo da Próxima Atividade"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:757
+#: code:addons/rma/models/rma.py:772
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Nenhum dos RMAs selecionados pode executar uma substituição."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:740
+#: code:addons/rma/models/rma.py:755
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr "Nenhum dos RMAs selecionados pode executar uma devolução."
@@ -804,7 +824,10 @@ msgstr "Número de Mensagens Não Lidas"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
-msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
+msgid ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
 msgstr ""
 "ID opcional de um encadeamento (registro) ao qual todas as mensagens "
 "recebidas serão anexadas, mesmo que não tenham respondido. Se definido, isso "
@@ -852,7 +875,10 @@ msgstr "ID do Encadeamento do Registro Pai"
 
 #. 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) and task (model))"
+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) and task (model))"
 msgstr ""
 "Modelo pai que contém o alias. O modelo que contém a referência de alias não "
 "é necessariamente o modelo fornecido pelo alias_model_id (exemplo: projeto "
@@ -870,11 +896,12 @@ msgstr "Planejado)a)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_contact
-msgid "Policy to post a message on the document using the mailgateway.\n"
+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 ""
 "Política para postar uma mensagem no documento usando o mail gateway.\n"
 "- todos: todos podem postar\n"
@@ -920,8 +947,7 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: rma
-#: code:addons/rma/wizard/rma_delivery.py:49
-#: sql_constraint:rma.split.wizard:0
+#: code:addons/rma/wizard/rma_delivery.py:49 sql_constraint:rma.split.wizard:0
 #, python-format
 msgid "Quantity must be greater than 0."
 msgstr "Quantidade precisa ser maior que zero."
@@ -932,9 +958,11 @@ msgid "Quantity to extract"
 msgstr "Quantidade a extrair"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:790
+#: code:addons/rma/models/rma.py:805
 #, python-format
-msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
+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)"
@@ -1082,8 +1110,7 @@ msgid "Receipt"
 msgstr "Recebimento"
 
 #. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
-#: selection:rma,state:0
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
 msgid "Received"
 msgstr "Recebido"
 
@@ -1103,7 +1130,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referência do documento que gerou este RMA."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:679
+#: code:addons/rma/models/rma.py:693
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1159,18 +1186,25 @@ msgid "Replaced"
 msgstr "Substituído"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:995
+#: code:addons/rma/models/rma.py:1010
 #, 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."
+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."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1006
+#: code:addons/rma/models/rma.py:1021
 #, 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."
+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 "
@@ -1188,7 +1222,7 @@ msgid "Requested operation"
 msgstr "Operação Solicitada"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:721
+#: code:addons/rma/models/rma.py:736
 #, python-format
 msgid "Required field(s):%s"
 msgstr "Campo(s) Solicitado(s):%s"
@@ -1217,12 +1251,14 @@ msgid "Return to customer"
 msgstr "Retornar ao cliente"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:956
+#: code:addons/rma/models/rma.py:971
 #, python-format
-msgid "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a> has been created."
+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."
+"Retorno: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
+"a> foi criado."
 
 #. module: rma
 #: selection:rma,state:0
@@ -1259,6 +1295,11 @@ msgstr "Enviado(a) por Correio"
 msgid "Sent"
 msgstr "Enviado(a)"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+msgid "Sequence"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:48
 #, python-format
@@ -1298,9 +1339,11 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:874
+#: code:addons/rma/models/rma.py:889
 #, python-format
-msgid "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been created."
+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."
@@ -1320,7 +1363,8 @@ msgstr "Status"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_state
-msgid "Status based on activities\n"
+msgid ""
+"Status based on activities\n"
 "Overdue: Due date is already passed\n"
 "Today: Activity date is today\n"
 "Planned: Future activities."
@@ -1358,7 +1402,10 @@ msgstr "Esse nome de operação já existe!"
 
 #. 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)"
+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)"
 msgstr ""
 "Modelo (tipo de documento Odoo) ao qual esse alias corresponde. Qualquer e-"
 "mail recebido que não responda a um registro existente causará a criação de "
@@ -1366,14 +1413,20 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_name
-msgid "The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.odoo.com>"
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
 msgstr ""
 "O nome do alias do email, por exemplo 'jobs' se você deseja receber e-mails "
 "de <jobs@example.odoo.com>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid "The owner of records created upon receiving emails on this alias. If this field is not set the system will attempt to find the right owner based on the sender (From) address, or will use the Administrator account if no system user is found for that address."
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
 msgstr ""
 "O proprietário dos registros criados ao receber emails nesse alias. Se esse "
 "campo não estiver definido, o sistema tentará encontrar o proprietário certo "
@@ -1383,13 +1436,15 @@ msgstr ""
 #. module: rma
 #: code:addons/rma/models/stock_move.py:60
 #, 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)."
+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)."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:778
+#: code:addons/rma/models/rma.py:793
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr "A quantidade a retornar é maior que a quantidade restante."
@@ -1397,25 +1452,27 @@ msgstr "A quantidade a retornar é maior que a quantidade restante."
 #. module: rma
 #: code:addons/rma/models/account_invoice.py:22
 #, python-format
-msgid "There is at least one invoice lines whose quantity is less than the quantity specified in its linked RMA."
+msgid ""
+"There is at least one invoice lines whose quantity is less than the quantity "
+"specified in its linked RMA."
 msgstr ""
 "Há pelo menos uma linha de fatura cuja quantidade é menor que a quantidade "
 "especificada na sua RMA vinculada."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:767
+#: code:addons/rma/models/rma.py:782
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Esta RMA não pode ser dividida."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:754
+#: code:addons/rma/models/rma.py:769
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Esta RMA não pode executar uma substituição."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:737
+#: code:addons/rma/models/rma.py:752
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr "Este RMA não pode executar uma devolução."
@@ -1539,7 +1596,7 @@ msgid "Website communication history"
 msgstr "Histórico de Comunicação Através do Site"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:514
+#: code:addons/rma/models/rma.py:516
 #, 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\""
@@ -1547,14 +1604,17 @@ msgstr "Você não pode apagar RMAs que não estejam na situação \"Rascunho\""
 #. module: rma
 #: code:addons/rma/wizard/stock_picking_return.py:56
 #, python-format
-msgid "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will be created"
+msgid ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
 msgstr ""
 "Você deve especificar o 'Cliente' na 'Seleção de estoque' a partir do qual "
 "as RMAs serão criadas"
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
-msgid "the user will have access to all records of everyone in the RMA application."
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
 msgstr "o usuário terá acesso a todos os registros de todos na aplicação RMA."
 
 #. module: rma
@@ -1564,7 +1624,9 @@ msgstr "o usuário terá acesso aos seus próprios dados na aplicação RMA."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_manager
-msgid "the user will have an access to the RMA configuration as well as statistic reports."
+msgid ""
+"the user will have an access to the RMA configuration as well as statistic "
+"reports."
 msgstr ""
 "o usuário terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 7b327b2b5..6eac770ea 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -24,7 +24,7 @@ msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma_team.py:43
+#: code:addons/rma/models/rma_team.py:44
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -486,7 +486,7 @@ msgid "Draft RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1076
+#: code:addons/rma/models/rma.py:1091
 #, python-format
 msgid "E-mail subject: %s\n"
 "\n"
@@ -576,7 +576,7 @@ msgid "If the active field is set to false, it will allow you to hide the RMA Te
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1080
+#: code:addons/rma/models/rma.py:1095
 #, python-format
 msgid "Incoming e-mail"
 msgstr ""
@@ -683,8 +683,8 @@ msgstr ""
 
 #. module: rma
 #: code:addons/rma/models/rma.py:31
-#: code:addons/rma/models/rma.py:496
-#: code:addons/rma/models/rma.py:1079
+#: code:addons/rma/models/rma.py:495
+#: code:addons/rma/models/rma.py:1094
 #, python-format
 msgid "New"
 msgstr ""
@@ -710,13 +710,13 @@ msgid "Next Activity Type"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:757
+#: code:addons/rma/models/rma.py:772
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:740
+#: code:addons/rma/models/rma.py:755
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr ""
@@ -880,7 +880,7 @@ msgid "Quantity to extract"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:790
+#: code:addons/rma/models/rma.py:805
 #, python-format
 msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
 msgstr ""
@@ -1049,7 +1049,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:679
+#: code:addons/rma/models/rma.py:693
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1105,13 +1105,13 @@ msgid "Replaced"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:995
+#: code:addons/rma/models/rma.py:1010
 #, 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 ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1006
+#: code:addons/rma/models/rma.py:1021
 #, 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 ""
@@ -1127,7 +1127,7 @@ msgid "Requested operation"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:721
+#: code:addons/rma/models/rma.py:736
 #, python-format
 msgid "Required field(s):%s"
 msgstr ""
@@ -1156,7 +1156,7 @@ msgid "Return to customer"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:956
+#: code:addons/rma/models/rma.py:971
 #, python-format
 msgid "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
@@ -1196,6 +1196,11 @@ msgstr ""
 msgid "Sent"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+msgid "Sequence"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:48
 #, python-format
@@ -1235,7 +1240,7 @@ msgid "Split RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:874
+#: code:addons/rma/models/rma.py:889
 #, python-format
 msgid "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
@@ -1309,7 +1314,7 @@ msgid "The quantity done for the product '%s' must be equal to its initial deman
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:778
+#: code:addons/rma/models/rma.py:793
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr ""
@@ -1321,19 +1326,19 @@ msgid "There is at least one invoice lines whose quantity is less than the quant
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:767
+#: code:addons/rma/models/rma.py:782
 #, python-format
 msgid "This RMA cannot be split."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:754
+#: code:addons/rma/models/rma.py:769
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:737
+#: code:addons/rma/models/rma.py:752
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr ""
@@ -1457,7 +1462,7 @@ msgid "Website communication history"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:514
+#: code:addons/rma/models/rma.py:516
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 8367c5b36..8a9ddcd85 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -55,7 +55,6 @@ def _domain_location_id(self):
         comodel_name="res.users",
         string="Responsible",
         track_visibility="always",
-        default=lambda self: self.env.user,
         states={
             'locked': [('readonly', True)],
             'cancelled': [('readonly', True)],
@@ -499,6 +498,9 @@ def create(self, vals):
                 ir_sequence = ir_sequence.with_context(
                     force_company=vals['company_id'])
             vals['name'] = ir_sequence.next_by_code('rma')
+        # Assign a default team_id which will be the first in the sequence
+        if "team_id" not in vals:
+            vals["team_id"] = self.env["rma.team"].search([], limit=1).id
         return super().create(vals)
 
     def copy(self, default=None):
@@ -599,7 +601,10 @@ def action_replace(self):
         """Invoked when 'Replace' button in rma form view is clicked."""
         self.ensure_one()
         self._ensure_can_be_replaced()
-        action = self.env.ref("rma.rma_delivery_wizard_action").read()[0]
+        # Force active_id to avoid issues when coming from smart buttons
+        # in other models
+        action = self.env.ref("rma.rma_delivery_wizard_action").with_context(
+            active_id=self.id).read()[0]
         action['name'] = 'Replace product(s)'
         action['context'] = dict(self.env.context)
         action['context'].update(
@@ -615,7 +620,10 @@ def action_return(self):
         """
         self.ensure_one()
         self._ensure_can_be_returned()
-        action = self.env.ref("rma.rma_delivery_wizard_action").read()[0]
+        # Force active_id to avoid issues when coming from smart buttons
+        # in other models
+        action = self.env.ref("rma.rma_delivery_wizard_action").with_context(
+            active_id=self.id).read()[0]
         action['context'] = dict(self.env.context)
         action['context'].update(
             active_id=self.id,
@@ -628,9 +636,12 @@ def action_split(self):
         """Invoked when 'Split' button in rma form view is clicked."""
         self.ensure_one()
         self._ensure_can_be_split()
-        action = self.env.ref("rma.rma_split_wizard_action").read()[0]
+        # Force active_id to avoid issues when coming from smart buttons
+        # in other models
+        action = self.env.ref("rma.rma_split_wizard_action").with_context(
+            active_id=self.id).read()[0]
         action['context'] = dict(self.env.context)
-        action['context'].update(active_ids=self.ids)
+        action['context'].update(active_id=self.id, active_ids=self.ids)
         return action
 
     def action_cancel(self):
@@ -663,7 +674,10 @@ def action_preview(self):
     def action_view_receipt(self):
         """Invoked when 'Receipt' smart button in rma form view is clicked."""
         self.ensure_one()
-        action = self.env.ref('stock.action_picking_tree_all').read()[0]
+        # Force active_id to avoid issues when coming from smart buttons
+        # in other models
+        action = self.env.ref('stock.action_picking_tree_all').with_context(
+            active_id=self.id).read()[0]
         action.update(
             res_id=self.reception_move_id.picking_id.id,
             view_mode="form",
@@ -687,7 +701,8 @@ def action_view_refund(self):
 
     def action_view_delivery(self):
         """Invoked when 'Delivery' smart button in rma form view is clicked."""
-        action = self.env.ref('stock.action_picking_tree_all').read()[0]
+        action = self.env.ref('stock.action_picking_tree_all').with_context(
+            active_id=self.id).read()[0]
         picking = self.delivery_move_ids.mapped('picking_id')
         if len(picking) > 1:
             action['domain'] = [('id', 'in', picking.ids)]
diff --git a/rma/models/rma_team.py b/rma/models/rma_team.py
index 31b600972..018fa8820 100644
--- a/rma/models/rma_team.py
+++ b/rma/models/rma_team.py
@@ -8,8 +8,9 @@ class RmaTeam(models.Model):
     _name = "rma.team"
     _inherit = ['mail.alias.mixin', 'mail.thread']
     _description = "RMA Team"
-    _order = "name"
+    _order = "sequence, name"
 
+    sequence = fields.Integer()
     name = fields.Char(
         required=True,
         translate=True,
diff --git a/rma/readme/USAGE.rst b/rma/readme/USAGE.rst
index 6e6194a94..aa524e7a0 100644
--- a/rma/readme/USAGE.rst
+++ b/rma/readme/USAGE.rst
@@ -33,5 +33,20 @@ An RMA can also be created from a return of a delivery order:
    Every RMA will be in confirmed state and they will
    be linked to the returning operation generated previously.
 
-**Note: An RMA can also be created from an incoming email (See configuration
-section).**
+There are Optional RMA Teams that can be used for:
+
+  - Organize RMAs in sections.
+  - Subscribe users to notifications.
+  - Create RMAs from incoming mail to special aliases (See configuration
+    section).
+
+To create an RMA Team (RMA Responsible user level required):
+
+  #. Go to *RMA > Configuration > RMA Teams*
+  #. Create a new team and assign a name, a responsible and members.
+  #. Subscribe users to notifications, that can be of these subtypes:
+
+     - RMA draft. When a new RMA is created.
+     - Notes, Debates, Activities. As in standard Odoo.
+  #. In the list view, use the cross handle to sort RMA Teams. The top team
+     will be the default one if no team is set.
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index a45186e63..88523ce37 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -440,8 +440,29 @@ <h1><a class="toc-backref" href="#id2">Usage</a></h1>
 Every RMA will be in confirmed state and they will
 be linked to the returning operation generated previously.</li>
 </ol>
-<p><strong>Note: An RMA can also be created from an incoming email (See configuration
-section).</strong></p>
+<p>There are Optional RMA Teams that can be used for:</p>
+<blockquote>
+<ul class="simple">
+<li>Organize RMAs in sections.</li>
+<li>Subscribe users to notifications.</li>
+<li>Create RMAs from incoming mail to special aliases (See configuration
+section).</li>
+</ul>
+</blockquote>
+<p>To create an RMA Team (RMA Responsible user level required):</p>
+<blockquote>
+<ol class="arabic simple">
+<li>Go to <em>RMA &gt; Configuration &gt; RMA Teams</em></li>
+<li>Create a new team and assign a name, a responsible and members.</li>
+<li>Subscribe users to notifications, that can be of these subtypes:<ul>
+<li>RMA draft. When a new RMA is created.</li>
+<li>Notes, Debates, Activities. As in standard Odoo.</li>
+</ul>
+</li>
+<li>In the list view, use the cross handle to sort RMA Teams. The top team
+will be the default one if no team is set.</li>
+</ol>
+</blockquote>
 </div>
 <div class="section" id="known-issues-roadmap">
 <h1><a class="toc-backref" href="#id3">Known issues / Roadmap</a></h1>
diff --git a/rma/views/res_partner_views.xml b/rma/views/res_partner_views.xml
index d783f1f69..bdf58616d 100644
--- a/rma/views/res_partner_views.xml
+++ b/rma/views/res_partner_views.xml
@@ -6,6 +6,7 @@
         <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 name="action_view_rma"
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index 16cff15b0..e4ae704e1 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -50,7 +50,8 @@
                             </a>
                         </td>
                         <td class="d-none d-md-table-cell"><span t-field="rma.date"/></td>
-                        <td><span t-field="rma.product_id.name"/></td>
+                        <!-- Portal users don't have access to unpublished products -->
+                        <td><span t-esc="rma.sudo().product_id.display_name"/></td>
                         <td class='text-right'><span t-field="rma.product_uom_qty"/></td>
                         <td class="d-none d-md-table-cell tx_status">
                             <span class="badge badge-pill badge-secondary"><span t-field="rma.state"/></span>
@@ -132,12 +133,14 @@
                                         <span t-field="rma.picking_id"/>
                                     </div>
                                 </div>
-                                <div t-if="rma.product_id" class="row mb-2 mb-sm-1">
+                                <!-- We need to prevent access errors if the product is
+                                     unpublished-->
+                                <div t-if="rma.sudo().product_id" class="row mb-2 mb-sm-1">
                                     <div class="col-12 col-sm-4">
                                         <strong>Product</strong>
                                     </div>
                                     <div class="col-12 col-sm-8">
-                                        <span t-field="rma.product_id"/>
+                                        <span t-esc="rma.sudo().product_id.display_name"/>
                                     </div>
                                 </div>
                                 <div t-if="rma.product_uom_qty" class="row mb-2 mb-sm-1">
@@ -262,6 +265,9 @@
                 <h2>Communication</h2>
                 <t t-call="portal.message_thread">
                     <t t-set="object" t-value="rma"/>
+                    <t t-set="token" t-value="rma.access_token"/>
+                    <t t-set="pid" t-value="pid"/>
+                    <t t-set="hash" t-value="hash"/>
                 </t>
             </div>
         </t>
diff --git a/rma/views/rma_team_views.xml b/rma/views/rma_team_views.xml
index 328e1ee6c..9202da2dd 100644
--- a/rma/views/rma_team_views.xml
+++ b/rma/views/rma_team_views.xml
@@ -2,6 +2,17 @@
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
+    <record id="rma_team_view_tree" model="ir.ui.view">
+        <field name="model">rma.team</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="sequence" widget="handle" />
+                <field name="name" />
+                <field name="user_id" />
+                <field name="company_id" groups="base.group_multi_company" />
+            </tree>
+        </field>
+    </record>
     <record id="rma_team_view_form" model="ir.ui.view">
         <field name="name">rma.team.view.form</field>
         <field name="model">rma.team</field>
diff --git a/rma/views/stock_picking_views.xml b/rma/views/stock_picking_views.xml
index d1f754001..95734fb08 100644
--- a/rma/views/stock_picking_views.xml
+++ b/rma/views/stock_picking_views.xml
@@ -6,6 +6,7 @@
         <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 name="action_view_rma"
diff --git a/rma/views/stock_warehouse_views.xml b/rma/views/stock_warehouse_views.xml
index 2371182e5..5d25dd8d3 100644
--- a/rma/views/stock_warehouse_views.xml
+++ b/rma/views/stock_warehouse_views.xml
@@ -4,6 +4,7 @@
         <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"/>

From 481c22f9db961704d34a40bb5e503a151187647d Mon Sep 17 00:00:00 2001
From: Ernesto Tejeda <ernesto.tejeda@tecnativa.com>
Date: Wed, 19 Aug 2020 00:19:25 -0400
Subject: [PATCH 004/108] [FIX+IMP] rma, rma_sale: fix bugs and add
 improvements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix thrown error when trying to download a picking from the portal.
- Add the hook method to prepare RMA values ​​from the return pick wizard.
- Add the access rule for portal users.
- Show the portal 'Request RMAs' button on the sales page only to users
related to the sales order.

[UPD] Update rma.pot

rma 12.0.1.3.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/
---
 rma/__manifest__.py                |  2 +-
 rma/controllers/main.py            | 16 ++++++++--------
 rma/data/mail_data.xml             |  2 +-
 rma/i18n/es.po                     | 21 ++++++++++++---------
 rma/i18n/pt_BR.po                  | 21 ++++++++++++---------
 rma/i18n/rma.pot                   | 18 +++++++++---------
 rma/models/rma.py                  |  6 ++++++
 rma/models/stock_move.py           | 26 ++++++++++++++++++++++++++
 rma/models/stock_warehouse.py      |  2 +-
 rma/security/rma_security.xml      | 11 +++++++++--
 rma/views/rma_portal_templates.xml |  4 ++--
 rma/views/rma_views.xml            |  2 +-
 rma/wizard/stock_picking_return.py | 27 ++++-----------------------
 13 files changed, 92 insertions(+), 66 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 469596dad..c55334f17 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "12.0.1.2.0",
+    "version": "12.0.1.3.0",
     "development_status": "Beta",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/controllers/main.py b/rma/controllers/main.py
index f53942f1f..aeb6d1c89 100644
--- a/rma/controllers/main.py
+++ b/rma/controllers/main.py
@@ -102,13 +102,13 @@ def portal_my_rma_detail(self, rma_id, access_token=None,
         values = self._rma_get_page_view_values(rma_sudo, access_token, **kw)
         return request.render("rma.portal_rma_page", values)
 
-    @http.route(['/my/rma/picking/pdf/<int:picking_id>'],
+    @http.route(['/my/rma/picking/pdf/<int:rma_id>/<int:picking_id>'],
                 type='http', auth="public", website=True)
-    def portal_my_rma_picking_report(self, picking_id, access_token=None,
-                                     **kw):
+    def portal_my_rma_picking_report(self, rma_id, picking_id,
+                                     access_token=None, **kw):
         try:
-            picking_sudo = self._stock_picking_check_access(
-                picking_id, access_token=access_token)
+            picking_sudo = self._picking_check_access(
+                rma_id, picking_id, access_token=access_token)
         except exceptions.AccessError:
             return request.redirect('/my')
         report_sudo = request.env.ref('stock.action_report_delivery').sudo()
@@ -119,14 +119,14 @@ def portal_my_rma_picking_report(self, picking_id, access_token=None,
         ]
         return request.make_response(pdf, headers=pdfhttpheaders)
 
-    def _stock_picking_check_access(self, picking_id, access_token=None):
+    def _picking_check_access(self, rma_id, picking_id, access_token=None):
+        rma = request.env['rma'].browse([rma_id])
         picking = request.env['stock.picking'].browse([picking_id])
         picking_sudo = picking.sudo()
         try:
             picking.check_access_rights('read')
             picking.check_access_rule('read')
         except exceptions.AccessError:
-            if not access_token or not consteq(
-                    picking_sudo.sale_id.access_token, access_token):
+            if not access_token or not consteq(rma.access_token, access_token):
                 raise
         return picking_sudo
diff --git a/rma/data/mail_data.xml b/rma/data/mail_data.xml
index 207747bc6..7c1187269 100644
--- a/rma/data/mail_data.xml
+++ b/rma/data/mail_data.xml
@@ -5,7 +5,7 @@
         <field name="name">Draft RMA</field>
         <field name="res_model">rma</field>
         <field name="default" eval="False"/>
-        <field name="description">New RMA in draft state</field>
+        <field name="description">RMA in draft state</field>
     </record>
     <!-- rma_team-related subtypes for messaging / Chatter -->
     <record id="mt_rma_team_rma_draft" model="mail.message.subtype">
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index e778d696c..6a157e2f3 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -537,7 +537,7 @@ msgid "Draft RMA"
 msgstr "RMA en estado Borrador"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1091
+#: code:addons/rma/models/rma.py:1097
 #, python-format
 msgid ""
 "E-mail subject: %s\n"
@@ -640,7 +640,7 @@ msgstr ""
 "sin eliminarlo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1095
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "Incoming e-mail"
 msgstr "Correo electrónico entrante"
@@ -747,16 +747,11 @@ msgstr "Nombre"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:495
-#: code:addons/rma/models/rma.py:1094
+#: code:addons/rma/models/rma.py:1100
 #, python-format
 msgid "New"
 msgstr "Nuevo"
 
-#. module: rma
-#: model:mail.message.subtype,description:rma.mt_rma_draft
-msgid "New RMA in draft state"
-msgstr "Nuevo RMA en estado Borrador"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
 msgid "Next Activity Deadline"
@@ -1073,6 +1068,11 @@ msgstr "Equipo de RMA del cual el usuario es miembro."
 msgid "RMA count"
 msgstr "Cantidad de RMAs"
 
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1606,7 +1606,7 @@ msgid "You cannot delete RMAs that are not in draft state"
 msgstr "No puede "
 
 #. module: rma
-#: code:addons/rma/wizard/stock_picking_return.py:56
+#: code:addons/rma/wizard/stock_picking_return.py:55
 #, python-format
 msgid ""
 "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
@@ -1635,3 +1635,6 @@ msgid ""
 msgstr ""
 "El usuario tendrá acceso a la configuración de RMA y a los informes "
 "estadísticos."
+
+#~ msgid "New RMA in draft state"
+#~ msgstr "Nuevo RMA en estado Borrador"
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index a64ce4790..f3feed428 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -535,7 +535,7 @@ msgid "Draft RMA"
 msgstr "Rascunho do RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1091
+#: code:addons/rma/models/rma.py:1097
 #, python-format
 msgid ""
 "E-mail subject: %s\n"
@@ -638,7 +638,7 @@ msgstr ""
 "sem removê-lo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1095
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "Incoming e-mail"
 msgstr "E-mail recebido"
@@ -745,16 +745,11 @@ msgstr "Nome"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:495
-#: code:addons/rma/models/rma.py:1094
+#: code:addons/rma/models/rma.py:1100
 #, python-format
 msgid "New"
 msgstr "Novo(a)"
 
-#. module: rma
-#: model:mail.message.subtype,description:rma.mt_rma_draft
-msgid "New RMA in draft state"
-msgstr "Novo Rascunho de RMA"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
 msgid "Next Activity Deadline"
@@ -1071,6 +1066,11 @@ msgstr "Equipe de RMA da qual o usuário é membro."
 msgid "RMA count"
 msgstr "Contagem de RMA"
 
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1602,7 +1602,7 @@ 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
-#: code:addons/rma/wizard/stock_picking_return.py:56
+#: code:addons/rma/wizard/stock_picking_return.py:55
 #, python-format
 msgid ""
 "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
@@ -1630,3 +1630,6 @@ msgid ""
 msgstr ""
 "o usuário terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
+
+#~ msgid "New RMA in draft state"
+#~ msgstr "Novo Rascunho de RMA"
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 6eac770ea..a7f7ba9ba 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -486,7 +486,7 @@ msgid "Draft RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1091
+#: code:addons/rma/models/rma.py:1097
 #, python-format
 msgid "E-mail subject: %s\n"
 "\n"
@@ -576,7 +576,7 @@ msgid "If the active field is set to false, it will allow you to hide the RMA Te
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1095
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "Incoming e-mail"
 msgstr ""
@@ -684,16 +684,11 @@ msgstr ""
 #. module: rma
 #: code:addons/rma/models/rma.py:31
 #: code:addons/rma/models/rma.py:495
-#: code:addons/rma/models/rma.py:1094
+#: code:addons/rma/models/rma.py:1100
 #, python-format
 msgid "New"
 msgstr ""
 
-#. module: rma
-#: model:mail.message.subtype,description:rma.mt_rma_draft
-msgid "New RMA in draft state"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
 msgid "Next Activity Deadline"
@@ -989,6 +984,11 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1468,7 +1468,7 @@ msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/wizard/stock_picking_return.py:56
+#: code:addons/rma/wizard/stock_picking_return.py:55
 #, python-format
 msgid "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will be created"
 msgstr ""
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 8a9ddcd85..ab95a420c 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1080,6 +1080,12 @@ def _prepare_procurement_values(
         }
 
     # Mail business methods
+    def _track_subtype(self, init_values):
+        self.ensure_one()
+        if 'state' in init_values and self.state == 'draft':
+            return 'rma.mt_rma_draft'
+        return super()._track_subtype(init_values)
+
     def message_new(self, msg_dict, custom_values=None):
         """Extract the needed values from an incoming rma emails data-set
         to be used to create an RMA.
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index 8ab511cec..c20e64c63 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -88,6 +88,32 @@ def _prepare_move_split_vals(self, qty):
         res['rma_id'] = self.rma_id.id
         return res
 
+    def _prepare_return_rma_vals(self, original_picking):
+        """ hook method for preparing an RMA from the 'return picking wizard'.
+        """
+        self.ensure_one()
+        partner = original_picking.partner_id
+        if hasattr(original_picking, 'sale_id') and original_picking.sale_id:
+            partner_invoice_id = original_picking.sale_id.partner_invoice_id.id
+        else:
+            partner_invoice_id = partner.address_get(
+                ['invoice']).get('invoice', False),
+        return {
+            'user_id': self.env.user.id,
+            'partner_id': partner.id,
+            'partner_invoice_id': partner_invoice_id,
+            'origin': original_picking.name,
+            'picking_id': original_picking.id,
+            'move_id': self.origin_returned_move_id.id,
+            'product_id': self.origin_returned_move_id.product_id.id,
+            'product_uom_qty': self.product_uom_qty,
+            'product_uom': self.product_uom.id,
+            'reception_move_id': self.id,
+            'company_id': self.company_id.id,
+            'location_id': self.location_dest_id.id,
+            'state': 'confirmed',
+        }
+
 
 class StockRule(models.Model):
     _inherit = 'stock.rule'
diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py
index 7c0716d23..5896accd1 100644
--- a/rma/models/stock_warehouse.py
+++ b/rma/models/stock_warehouse.py
@@ -62,7 +62,7 @@ def _update_name_and_code(self, new_name=False, new_code=False):
             sequence_data = warehouse._get_sequence_values()
             warehouse.rma_in_type_id.sequence_id.write(
                 sequence_data['rma_in_type_id'])
-            warehouse.rma_in_type_id.sequence_id.write(
+            warehouse.rma_out_type_id.sequence_id.write(
                 sequence_data['rma_out_type_id'])
 
     def _get_picking_type_create_values(self, max_sequence):
diff --git a/rma/security/rma_security.xml b/rma/security/rma_security.xml
index 5a8037c90..6604005fd 100644
--- a/rma/security/rma_security.xml
+++ b/rma/security/rma_security.xml
@@ -30,16 +30,23 @@
     <!-- Record Rules -->
     <record id="rma_rule_user_own" model="ir.rule">
         <field name="name">Personal RMAs</field>
-        <field ref="model_rma" name="model_id"/>
+        <field name="model_id" ref="model_rma"/>
         <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
         <field name="groups" eval="[(4, ref('rma_group_user_own'))]"/>
     </record>
     <record id="rma_rule_user_all" model="ir.rule">
         <field name="name">All RMAs</field>
-        <field ref="model_rma" name="model_id"/>
+        <field name="model_id" ref="model_rma"/>
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4, ref('rma_group_user_all'))]"/>
     </record>
+    <!-- RMA model rules for portal users -->
+    <record id="rma_rule_portal" model="ir.rule">
+        <field name="name">RMA portal users</field>
+        <field name="model_id" ref="rma.model_rma"/>
+        <field name="domain_force">[('message_partner_ids', 'child_of', [user.partner_id.commercial_partner_id.id])]</field>
+        <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+    </record>
     <!-- Multi-Company Rules -->
     <record id="rma_rule_multi_company" model="ir.rule">
         <field name="name">RMA multi-company</field>
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index e4ae704e1..9219c0449 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -191,7 +191,7 @@
                     <section t-if="rma.reception_move_id" id="reception_section" style="page-break-inside: auto;" class="mt32">
                         <strong class="d-block mb-1">Reception</strong>
                         <t t-set="picking" t-value="rma.reception_move_id.picking_id"/>
-                        <t t-set="report_url" t-value="'/my/rma/picking/pdf/%s?%s' % (picking.id, keep_query())"/>
+                        <t t-set="report_url" t-value="'/my/rma/picking/pdf/%s/%s?%s' % (rma.id, picking.id, keep_query())"/>
                         <a class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3" t-att-href="report_url">
                             <div>
                                 <i class="fa fa-truck mr-1" role="img" aria-label="Download" title="Download"/>
@@ -230,7 +230,7 @@
                         <strong class="d-block mb-1">Delivery</strong>
                         <ul class="list-group mb-4">
                             <t t-foreach="rma.delivery_move_ids.mapped('picking_id')" t-as="picking">
-                                <t t-set="report_url" t-value="'/my/rma/picking/pdf/%s?%s' % (picking.id, keep_query())"/>
+                                <t t-set="report_url" t-value="'/my/rma/picking/pdf/%s/%s?%s' % (rma.id, picking.id, keep_query())"/>
                                 <a class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3" t-att-href="report_url">
                                     <div>
                                         <i class="fa fa-truck mr-1" role="img" aria-label="Download" title="Download"/>
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index c86d14c28..463a29a38 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -164,7 +164,7 @@
                             <field name="picking_id"
                                    options="{'no_create': True}"/>
                             <field name="move_id"
-                                   attrs="{'required': [('picking_id', '!=', False)], 'readonly': [('picking_id', '=', False)]}"
+                                   attrs="{'required': [('picking_id', '!=', False)], 'readonly': ['|', ('picking_id', '=', False), ('state', '!=', 'draft')]}"
                                    options="{'no_create': True}"
                                    force_save="1"/>
                             <field name="product_id"
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
index 0608c3410..a97913704 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -51,33 +51,14 @@ def create_returns(self):
             # picking and change the default picking type to rma picking type
             self_with_context = self.with_context(set_rma_picking_type=True)
             res = super(ReturnPicking, self_with_context).create_returns()
-            partner = self.picking_id.partner_id
-            if not partner:
+            if not self.picking_id.partner_id:
                 raise ValidationError(_(
                     "You must specify the 'Customer' in the "
                     "'Stock Picking' from which RMAs will be created"))
-            picking = self.picking_id
             returned_picking = self.env['stock.picking'].browse(res['res_id'])
-            if hasattr(picking, 'sale_id') and picking.sale_id:
-                partner_invoice_id = picking.sale_id.partner_invoice_id.id
-            else:
-                partner_invoice_id = partner.address_get(
-                    ['invoice']).get('invoice', False),
-            for move in returned_picking.move_lines:
-                self.env['rma'].create({
-                    'partner_id': partner.id,
-                    'partner_invoice_id': partner_invoice_id,
-                    'origin': picking.name,
-                    'picking_id': picking.id,
-                    'move_id': move.origin_returned_move_id.id,
-                    'product_id': move.origin_returned_move_id.product_id.id,
-                    'product_uom_qty': move.product_uom_qty,
-                    'product_uom': move.product_uom.id,
-                    'reception_move_id': move.id,
-                    'company_id': move.company_id.id,
-                    'location_id': move.location_dest_id.id,
-                    'state': 'confirmed',
-                })
+            vals_list = [move._prepare_return_rma_vals(self.picking_id)
+                         for move in returned_picking.move_lines]
+            self.env['rma'].create(vals_list)
             return res
         else:
             return super().create_returns()

From 942abab42a3fbe1dc56a7972ab3dce39a9697f81 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@gmail.com>
Date: Sat, 22 Aug 2020 11:08:37 +0000
Subject: [PATCH 005/108] Translated using Weblate (Spanish)

Currently translated at 100.0% (263 of 263 strings)

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/es/
---
 rma/i18n/es.po | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 6a157e2f3..46c50ceb3 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 05:13+0000\n"
-"PO-Revision-Date: 2020-08-18 13:59+0000\n"
-"Last-Translator: David Vidal <david.vidal@tecnativa.com>\n"
+"PO-Revision-Date: 2020-08-22 13:59+0000\n"
+"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
 #. module: rma
 #: model:mail.template,report_name:rma.mail_template_rma_notification
 msgid "${(object.name or '')}"
-msgstr ""
+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 ""
+msgstr "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
 
 #. module: rma
 #: code:addons/rma/models/rma_team.py:44
@@ -201,9 +201,8 @@ msgstr "<strong>Orden de Entrega:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-#, fuzzy
 msgid "<strong>Origin delivery</strong>"
-msgstr "<strong>Orden de Entrega:</strong>"
+msgstr "<strong>Entrega origen</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
@@ -335,7 +334,7 @@ msgstr "Conteo de archivos adjuntos"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Avatar"
-msgstr ""
+msgstr "Avatar"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
@@ -601,7 +600,7 @@ msgstr "Agrupar por"
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_team__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_thread_id
@@ -616,7 +615,7 @@ msgstr ""
 #: model:ir.model.fields,help:rma.field_rma__message_unread
 #: 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"
+msgstr "Si está marcado, hay nuevos mensajes que requieren su atención."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
@@ -782,7 +781,7 @@ msgstr "Ninguno de los RMAs seleccionados puede realizar una devolución."
 #. module: rma
 #: selection:rma,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: rma
 #: selection:rma,priority:0
@@ -967,7 +966,7 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
 msgid "Quantity to extract to a new RMA."
-msgstr "Cantidad a extraer en nuevo RMA"
+msgstr "Cantidad a extraer en nuevo RMA."
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_action
@@ -980,13 +979,13 @@ msgstr "Cantidad a extraer en nuevo RMA"
 #: model_terms:ir.ui.view,arch_db:rma.view_partner_form
 #: model_terms:ir.ui.view,arch_db:rma.view_picking_form
 msgid "RMA"
-msgstr ""
+msgstr "RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "RMA #"
-msgstr ""
+msgstr "RMA nº"
 
 #. module: rma
 #: code:addons/rma/models/res_company.py:18
@@ -1071,7 +1070,7 @@ msgstr "Cantidad de RMAs"
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
-msgstr ""
+msgstr "RMA en estado borrador"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
@@ -1081,7 +1080,7 @@ msgstr "RMAs que originaron esta orden"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_stock_warehouse__rma
 msgid "RMA related products can be stored in this warehouse."
-msgstr ""
+msgstr "Productos relacionados con el RMA pueden ser guardados en este almacén."
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_operation
@@ -1104,7 +1103,7 @@ msgstr "Equipo de RMA"
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
 msgid "RMAs"
-msgstr ""
+msgstr "RMAs"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -1153,7 +1152,7 @@ msgstr "Línea de factura rectificativa"
 #. module: rma
 #: selection:rma,state:0
 msgid "Refunded"
-msgstr "reembolsado"
+msgstr "Reembolsado"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
@@ -1419,9 +1418,8 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
 msgstr ""
-"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos"
-"\",  si lo que quiere es obtener los correos para <trabajos@example.odoo."
-"com>."
+"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos\""
+", si lo que quiere es obtener los correos para <trabajos@example.odoo.com>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
@@ -1603,7 +1601,7 @@ msgstr "Historial de comunicaciones del sitio web"
 #: code:addons/rma/models/rma.py:516
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
-msgstr "No puede "
+msgstr "No puede eliminar RMAs que no estén en estado borrador"
 
 #. module: rma
 #: code:addons/rma/wizard/stock_picking_return.py:55
@@ -1613,7 +1611,7 @@ msgid ""
 "be created"
 msgstr ""
 "Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los "
-"RMAs serán creados."
+"RMAs serán creados"
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
@@ -1625,7 +1623,7 @@ msgstr ""
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_own
 msgid "the user will have access to his own data in the RMA application."
-msgstr "El usuario tendrá acceso solo a sus propios RMAs"
+msgstr "el usuario tendrá acceso solo a sus propios RMAs."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_manager

From 3d888947acaacfbfc8c7f8665d3aa107c617e753 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Mon, 24 Aug 2020 16:17:28 +0200
Subject: [PATCH 006/108] [FIX] rma: permissions for general users

- Avoid permission blockings on users who doesn't have RMA permissions.
- Add activities view on RMA list.

[UPD] Update rma.pot

rma 12.0.1.3.1
---
 rma/__manifest__.py           |  2 +-
 rma/i18n/rma.pot              |  2 +-
 rma/models/account_invoice.py |  6 ++++--
 rma/models/stock_move.py      | 23 ++++++++++++++---------
 rma/views/rma_views.xml       |  2 +-
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index c55334f17..04089d2d5 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "12.0.1.3.0",
+    "version": "12.0.1.3.1",
     "development_status": "Beta",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index a7f7ba9ba..96bc451a9 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -1308,7 +1308,7 @@ msgid "The owner of records created upon receiving emails on this alias. If this
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/stock_move.py:60
+#: code:addons/rma/models/stock_move.py:64
 #, 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 ""
diff --git a/rma/models/account_invoice.py b/rma/models/account_invoice.py
index 731891cff..62c3951d1 100644
--- a/rma/models/account_invoice.py
+++ b/rma/models/account_invoice.py
@@ -15,14 +15,16 @@ def action_invoice_open(self):
         """
         precision = self.env['decimal.precision'].precision_get(
             'Product Unit of Measure')
-        if self.mapped('invoice_line_ids').filtered(
+        if self.sudo().mapped('invoice_line_ids').filtered(
                 lambda r: (r.rma_id and float_compare(
                     r.quantity, r.rma_id.product_uom_qty, precision) < 0)):
             raise ValidationError(
                 _("There is at least one invoice lines whose quantity is "
                   "less than the quantity specified in its linked RMA."))
         res = super().action_invoice_open()
-        self.mapped('invoice_line_ids.rma_id').write({'state': 'refunded'})
+        self.sudo().mapped('invoice_line_ids.rma_id').write(
+            {'state': 'refunded'}
+        )
         return res
 
 
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index c20e64c63..295561467 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -30,8 +30,10 @@ class StockMove(models.Model):
     )
 
     def unlink(self):
-        rma_receiver = self.mapped('rma_receiver_ids')
-        rma = self.mapped('rma_id')
+        # A stock user could have no RMA permissions, so the ids wouldn't
+        # be accessible due to record rules.
+        rma_receiver = self.sudo().mapped('rma_receiver_ids')
+        rma = self.sudo().mapped('rma_id')
         res = super().unlink()
         rma_receiver.write({'state': 'draft'})
         rma.update_received_state()
@@ -40,7 +42,9 @@ def unlink(self):
 
     def _action_cancel(self):
         res = super()._action_cancel()
-        cancelled_moves = self.filtered(lambda r: r.state == 'cancel')
+        # A stock user could have no RMA permissions, so the ids wouldn't
+        # be accessible due to record rules.
+        cancelled_moves = self.filtered(lambda r: r.state == 'cancel').sudo()
         cancelled_moves.mapped('rma_receiver_ids').write({'state': 'draft'})
         cancelled_moves.mapped('rma_id').update_received_state()
         cancelled_moves.mapped('rma_id').update_replaced_state()
@@ -53,7 +57,7 @@ def _action_done(self):
         """
         for move in self.filtered(
                 lambda r: r.state not in ('done', 'cancel')):
-            rma_receiver = move.rma_receiver_ids
+            rma_receiver = move.rma_receiver_ids.sudo()
             if (rma_receiver
                     and move.quantity_done != rma_receiver.product_uom_qty):
                 raise ValidationError(
@@ -63,12 +67,13 @@ def _action_done(self):
                     % (move.product_id.name, move.rma_receiver_ids.name)
                 )
         res = super()._action_done()
-        move_done = self.filtered(lambda r: r.state == 'done')
-        # set RMAs as received
-        to_be_received = move_done.mapped('rma_receiver_ids').filtered(
+        move_done = self.filtered(lambda r: r.state == 'done').sudo()
+        # Set RMAs as received. We sudo so we can grant the operation even
+        # if the stock user has no RMA permissions.
+        to_be_received = move_done.sudo().mapped('rma_receiver_ids').filtered(
             lambda r: r.state == 'confirmed')
         to_be_received.write({'state': 'received'})
-        # set RMAs as delivered
+        # Set RMAs as delivered
         move_done.mapped('rma_id').update_replaced_state()
         move_done.mapped('rma_id').update_returned_state()
         return res
@@ -85,7 +90,7 @@ def _prepare_move_split_vals(self, qty):
         RMA link id.
         """
         res = super()._prepare_move_split_vals(qty)
-        res['rma_id'] = self.rma_id.id
+        res['rma_id'] = self.sudo().rma_id.id
         return res
 
     def _prepare_return_rma_vals(self, original_picking):
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 463a29a38..16f646ffb 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -270,7 +270,7 @@
         <field name="name">RMA</field>
         <field name="res_model">rma</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,form,pivot,calendar</field>
+        <field name="view_mode">tree,form,pivot,calendar,activity</field>
         <field name="context">{"search_default_user_id": uid}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">

From 36a5de7c41fe3facd3d85771811a6fe616878dcc Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Sat, 22 Aug 2020 19:14:54 +0200
Subject: [PATCH 007/108] [IMP] rma: Return created sequence on
 create_rma_index

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/
---
 rma/i18n/es.po            | 9 +++++----
 rma/i18n/pt_BR.po         | 2 +-
 rma/models/res_company.py | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 46c50ceb3..392008720 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -1080,7 +1080,8 @@ msgstr "RMAs que originaron esta orden"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_stock_warehouse__rma
 msgid "RMA related products can be stored in this warehouse."
-msgstr "Productos relacionados con el RMA pueden ser guardados en este almacén."
+msgstr ""
+"Productos relacionados con el RMA pueden ser guardados en este almacén."
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_operation
@@ -1418,8 +1419,8 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
 msgstr ""
-"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos\""
-", si lo que quiere es obtener los correos para <trabajos@example.odoo.com>"
+"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos"
+"\", si lo que quiere es obtener los correos para <trabajos@example.odoo.com>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
@@ -1436,7 +1437,7 @@ msgstr ""
 "dirección."
 
 #. module: rma
-#: code:addons/rma/models/stock_move.py:60
+#: code:addons/rma/models/stock_move.py:64
 #, python-format
 msgid ""
 "The quantity done for the product '%s' must be equal to its initial demand "
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index f3feed428..f0061455a 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -1434,7 +1434,7 @@ msgstr ""
 "nenhum usuário do sistema for encontrado para esse endereço."
 
 #. module: rma
-#: code:addons/rma/models/stock_move.py:60
+#: code:addons/rma/models/stock_move.py:64
 #, python-format
 msgid ""
 "The quantity done for the product '%s' must be equal to its initial demand "
diff --git a/rma/models/res_company.py b/rma/models/res_company.py
index 555f09bd9..cb65960c5 100644
--- a/rma/models/res_company.py
+++ b/rma/models/res_company.py
@@ -14,7 +14,7 @@ def create(self, vals):
         return company
 
     def create_rma_index(self):
-        self.env['ir.sequence'].sudo().create({
+        return self.env['ir.sequence'].sudo().create({
             'name': _('RMA Code'),
             'prefix': 'RMA',
             'code': 'rma',

From e9bd9b1433a1fca34563094a41f13795873887a7 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Fri, 28 Aug 2020 16:54:59 +0200
Subject: [PATCH 008/108] [IMP] rma_sale: portal improvents

- Now it's possible to open several RMAs in a sale order from the portal
- A new comment button has been added to allow the portal user to enter
relevant information like serial numbers o issue description.
- If the requested operation isn't set no RMA will be opened
- The RMA product qty is now a numeric control with limits according to
the qty available to return

[FIX] rma,rma_sale: fix linter errors

[UPD] Update rma.pot

rma 12.0.1.4.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/
---
 rma/__manifest__.py         |  2 +-
 rma/i18n/es.po              | 36 ++++++++++++++++++------------------
 rma/i18n/pt_BR.po           | 36 ++++++++++++++++++------------------
 rma/i18n/rma.pot            | 36 ++++++++++++++++++------------------
 rma/models/rma.py           |  1 +
 rma/models/rma_team.py      |  4 +++-
 rma/models/stock_picking.py |  4 +++-
 rma/views/rma_views.xml     |  2 +-
 8 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 04089d2d5..df7b0147d 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "12.0.1.3.1",
+    "version": "12.0.1.4.0",
     "development_status": "Beta",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 392008720..8f14ece3e 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -28,7 +28,7 @@ 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
-#: code:addons/rma/models/rma_team.py:44
+#: code:addons/rma/models/rma_team.py:46
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
@@ -536,7 +536,7 @@ msgid "Draft RMA"
 msgstr "RMA en estado Borrador"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1097
+#: code:addons/rma/models/rma.py:1098
 #, python-format
 msgid ""
 "E-mail subject: %s\n"
@@ -639,7 +639,7 @@ msgstr ""
 "sin eliminarlo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:1102
 #, python-format
 msgid "Incoming e-mail"
 msgstr "Correo electrónico entrante"
@@ -746,7 +746,7 @@ msgstr "Nombre"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:495
-#: code:addons/rma/models/rma.py:1100
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "New"
 msgstr "Nuevo"
@@ -767,13 +767,13 @@ msgid "Next Activity Type"
 msgstr "Siguiente tipo de actividad"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:772
+#: code:addons/rma/models/rma.py:773
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Ninguno de los RMAs seleccionados puede realizar un reemplazo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:755
+#: code:addons/rma/models/rma.py:756
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr "Ninguno de los RMAs seleccionados puede realizar una devolución."
@@ -954,7 +954,7 @@ msgid "Quantity to extract"
 msgstr "Cantidad a extraer"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:805
+#: code:addons/rma/models/rma.py:806
 #, python-format
 msgid ""
 "Quantity to extract cannot be greater than remaining delivery quantity (%s "
@@ -1132,7 +1132,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referencia al documento que generó este RMA."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:693
+#: code:addons/rma/models/rma.py:694
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1188,7 +1188,7 @@ msgid "Replaced"
 msgstr "Reemplazado"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1010
+#: code:addons/rma/models/rma.py:1011
 #, python-format
 msgid ""
 "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
@@ -1200,7 +1200,7 @@ msgstr ""
 "picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1021
+#: code:addons/rma/models/rma.py:1022
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
@@ -1224,7 +1224,7 @@ msgid "Requested operation"
 msgstr "Operación solicitada"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:736
+#: code:addons/rma/models/rma.py:737
 #, python-format
 msgid "Required field(s):%s"
 msgstr "Campo(s) requerido(s):%s"
@@ -1253,7 +1253,7 @@ msgid "Return to customer"
 msgstr "Devolver al cliente"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:971
+#: code:addons/rma/models/rma.py:972
 #, python-format
 msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
@@ -1341,7 +1341,7 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:889
+#: code:addons/rma/models/rma.py:890
 #, python-format
 msgid ""
 "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
@@ -1447,7 +1447,7 @@ msgstr ""
 "inicial porque el movimiento está enlazado a un RMA (%s)."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:793
+#: code:addons/rma/models/rma.py:794
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr "La cantidad a devolver es mayor que la cantidad restante del RMA."
@@ -1463,19 +1463,19 @@ msgstr ""
 "cantidad especificada en el RMA asociado."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:782
+#: code:addons/rma/models/rma.py:783
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Este RMA no puede ser dividido."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:769
+#: code:addons/rma/models/rma.py:770
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Este RMA no puede realizar un reemplazo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:752
+#: code:addons/rma/models/rma.py:753
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr "Este RMA no puede realizar una devolución."
@@ -1599,7 +1599,7 @@ msgid "Website communication history"
 msgstr "Historial de comunicaciones del sitio web"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:516
+#: code:addons/rma/models/rma.py:517
 #, 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"
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index f0061455a..0ddc48127 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -27,7 +27,7 @@ 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
-#: code:addons/rma/models/rma_team.py:44
+#: code:addons/rma/models/rma_team.py:46
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Cópia)"
@@ -535,7 +535,7 @@ msgid "Draft RMA"
 msgstr "Rascunho do RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1097
+#: code:addons/rma/models/rma.py:1098
 #, python-format
 msgid ""
 "E-mail subject: %s\n"
@@ -638,7 +638,7 @@ msgstr ""
 "sem removê-lo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:1102
 #, python-format
 msgid "Incoming e-mail"
 msgstr "E-mail recebido"
@@ -745,7 +745,7 @@ msgstr "Nome"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:495
-#: code:addons/rma/models/rma.py:1100
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "New"
 msgstr "Novo(a)"
@@ -766,13 +766,13 @@ msgid "Next Activity Type"
 msgstr "Tipo da Próxima Atividade"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:772
+#: code:addons/rma/models/rma.py:773
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Nenhum dos RMAs selecionados pode executar uma substituição."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:755
+#: code:addons/rma/models/rma.py:756
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr "Nenhum dos RMAs selecionados pode executar uma devolução."
@@ -953,7 +953,7 @@ msgid "Quantity to extract"
 msgstr "Quantidade a extrair"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:805
+#: code:addons/rma/models/rma.py:806
 #, python-format
 msgid ""
 "Quantity to extract cannot be greater than remaining delivery quantity (%s "
@@ -1130,7 +1130,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referência do documento que gerou este RMA."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:693
+#: code:addons/rma/models/rma.py:694
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1186,7 +1186,7 @@ msgid "Replaced"
 msgstr "Substituído"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1010
+#: code:addons/rma/models/rma.py:1011
 #, python-format
 msgid ""
 "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
@@ -1198,7 +1198,7 @@ msgstr ""
 "data-oe-id=\"%d\">%s</a> foi criada."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1021
+#: code:addons/rma/models/rma.py:1022
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
@@ -1222,7 +1222,7 @@ msgid "Requested operation"
 msgstr "Operação Solicitada"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:736
+#: code:addons/rma/models/rma.py:737
 #, python-format
 msgid "Required field(s):%s"
 msgstr "Campo(s) Solicitado(s):%s"
@@ -1251,7 +1251,7 @@ msgid "Return to customer"
 msgstr "Retornar ao cliente"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:971
+#: code:addons/rma/models/rma.py:972
 #, python-format
 msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
@@ -1339,7 +1339,7 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:889
+#: code:addons/rma/models/rma.py:890
 #, python-format
 msgid ""
 "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
@@ -1444,7 +1444,7 @@ msgstr ""
 "inicial, porque a movimentação do estoque está vinculada a uma RMA (%s)."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:793
+#: code:addons/rma/models/rma.py:794
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr "A quantidade a retornar é maior que a quantidade restante."
@@ -1460,19 +1460,19 @@ msgstr ""
 "especificada na sua RMA vinculada."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:782
+#: code:addons/rma/models/rma.py:783
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Esta RMA não pode ser dividida."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:769
+#: code:addons/rma/models/rma.py:770
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Esta RMA não pode executar uma substituição."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:752
+#: code:addons/rma/models/rma.py:753
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr "Este RMA não pode executar uma devolução."
@@ -1596,7 +1596,7 @@ msgid "Website communication history"
 msgstr "Histórico de Comunicação Através do Site"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:516
+#: code:addons/rma/models/rma.py:517
 #, 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\""
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 96bc451a9..b7eca793e 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -24,7 +24,7 @@ msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma_team.py:44
+#: code:addons/rma/models/rma_team.py:46
 #, python-format
 msgid "%s (copy)"
 msgstr ""
@@ -486,7 +486,7 @@ msgid "Draft RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1097
+#: code:addons/rma/models/rma.py:1098
 #, python-format
 msgid "E-mail subject: %s\n"
 "\n"
@@ -576,7 +576,7 @@ msgid "If the active field is set to false, it will allow you to hide the RMA Te
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:1102
 #, python-format
 msgid "Incoming e-mail"
 msgstr ""
@@ -684,7 +684,7 @@ msgstr ""
 #. module: rma
 #: code:addons/rma/models/rma.py:31
 #: code:addons/rma/models/rma.py:495
-#: code:addons/rma/models/rma.py:1100
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "New"
 msgstr ""
@@ -705,13 +705,13 @@ msgid "Next Activity Type"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:772
+#: code:addons/rma/models/rma.py:773
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:755
+#: code:addons/rma/models/rma.py:756
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr ""
@@ -875,7 +875,7 @@ msgid "Quantity to extract"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:805
+#: code:addons/rma/models/rma.py:806
 #, python-format
 msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
 msgstr ""
@@ -1049,7 +1049,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:693
+#: code:addons/rma/models/rma.py:694
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1105,13 +1105,13 @@ msgid "Replaced"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1010
+#: code:addons/rma/models/rma.py:1011
 #, 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 ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1021
+#: code:addons/rma/models/rma.py:1022
 #, 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 ""
@@ -1127,7 +1127,7 @@ msgid "Requested operation"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:736
+#: code:addons/rma/models/rma.py:737
 #, python-format
 msgid "Required field(s):%s"
 msgstr ""
@@ -1156,7 +1156,7 @@ msgid "Return to customer"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:971
+#: code:addons/rma/models/rma.py:972
 #, python-format
 msgid "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
@@ -1240,7 +1240,7 @@ msgid "Split RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:889
+#: code:addons/rma/models/rma.py:890
 #, python-format
 msgid "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
@@ -1314,7 +1314,7 @@ msgid "The quantity done for the product '%s' must be equal to its initial deman
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:793
+#: code:addons/rma/models/rma.py:794
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr ""
@@ -1326,19 +1326,19 @@ msgid "There is at least one invoice lines whose quantity is less than the quant
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:782
+#: code:addons/rma/models/rma.py:783
 #, python-format
 msgid "This RMA cannot be split."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:769
+#: code:addons/rma/models/rma.py:770
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:752
+#: code:addons/rma/models/rma.py:753
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr ""
@@ -1462,7 +1462,7 @@ msgid "Website communication history"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:516
+#: code:addons/rma/models/rma.py:517
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
diff --git a/rma/models/rma.py b/rma/models/rma.py
index ab95a420c..9c3887cdd 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -503,6 +503,7 @@ def create(self, vals):
             vals["team_id"] = self.env["rma.team"].search([], limit=1).id
         return super().create(vals)
 
+    @api.multi
     def copy(self, default=None):
         team = super().copy(default)
         for follower in self.message_follower_ids:
diff --git a/rma/models/rma_team.py b/rma/models/rma_team.py
index 018fa8820..9a771705f 100644
--- a/rma/models/rma_team.py
+++ b/rma/models/rma_team.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, fields, models
+from odoo import _, api, fields, models
 
 
 class RmaTeam(models.Model):
@@ -37,7 +37,9 @@ class RmaTeam(models.Model):
         string='Team Members',
     )
 
+    @api.multi
     def copy(self, default=None):
+        self.ensure_one()
         if default is None:
             default = {}
         if not default.get('name'):
diff --git a/rma/models/stock_picking.py b/rma/models/stock_picking.py
index e341be0b6..bddb151db 100644
--- a/rma/models/stock_picking.py
+++ b/rma/models/stock_picking.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import api, fields, models
 
 
 class StockPicking(models.Model):
@@ -16,7 +16,9 @@ def _compute_rma_count(self):
         for rec in self:
             rec.rma_count = len(rec.move_lines.mapped('rma_ids'))
 
+    @api.multi
     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(
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 16f646ffb..f77660a67 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -279,7 +279,7 @@
         </field>
     </record>
 
-    <record id="rma.rma_orders_menu" model="ir.ui.menu">
+    <record id="rma_orders_menu" model="ir.ui.menu">
         <field name="action" ref="rma_action"/>
     </record>
 </odoo>

From 54fc124f2587b66e7fa49d8ad53589ab57e9e29f Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Mon, 14 Sep 2020 15:58:14 +0200
Subject: [PATCH 009/108] [FIX] rma: Perform refund with proper view

Not indicating account.invoice, it takes the default that is the vendor bill view.
We force the suitable one.
---
 rma/__manifest__.py | 2 +-
 rma/models/rma.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index df7b0147d..3b58598e9 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "12.0.1.4.0",
+    "version": "12.0.1.4.1",
     "development_status": "Beta",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 9c3887cdd..924d3f545 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -573,7 +573,7 @@ def action_refund(self):
             invoice_form = Form(self.env['account.invoice'].with_context(
                 default_type='out_refund',
                 company_id=rmas[0].company_id.id,
-            ))
+            ), "account.invoice_form")
             rmas[0]._prepare_refund(invoice_form, origin)
             refund = invoice_form.save()
             for rma in rmas:

From e0b110bf67f0504179e612b75d5bb0a351ccd7dd Mon Sep 17 00:00:00 2001
From: Ernesto Tejeda <ernesto.tejeda@tecnativa.com>
Date: Tue, 15 Sep 2020 16:04:43 -0400
Subject: [PATCH 010/108] [IMP] rma: set rma to received on invoice delete +
 incoming picking type use existing lot by default.

[IMP] rma: set rma to received on invoice delete.

Remove 'waiting_refund' rma state.
RMAs go from received to refunded.
When the linked refund is deleted the rma is set to received.

[UPD] Update rma.pot

rma 12.0.1.4.2

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/

[IMP] rma: incoming picking type use existing lot by default.

rma 12.0.1.4.3
---
 rma/__manifest__.py           |  2 +-
 rma/i18n/es.po                | 44 +++++++++++++++++------------------
 rma/i18n/pt_BR.po             | 44 +++++++++++++++++------------------
 rma/i18n/rma.pot              | 41 ++++++++++++++------------------
 rma/models/account_invoice.py | 11 +++++----
 rma/models/rma.py             |  5 ++--
 rma/models/stock_warehouse.py |  4 ++--
 rma/tests/test_rma.py         | 26 ++++++++++++++++++---
 8 files changed, 94 insertions(+), 83 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 3b58598e9..f63ea8555 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "12.0.1.4.1",
+    "version": "12.0.1.4.3",
     "development_status": "Beta",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 8f14ece3e..dd2e0d745 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -536,7 +536,7 @@ msgid "Draft RMA"
 msgstr "RMA en estado Borrador"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1098
+#: code:addons/rma/models/rma.py:1097
 #, python-format
 msgid ""
 "E-mail subject: %s\n"
@@ -639,7 +639,7 @@ msgstr ""
 "sin eliminarlo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1102
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "Incoming e-mail"
 msgstr "Correo electrónico entrante"
@@ -745,8 +745,8 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:495
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:494
+#: code:addons/rma/models/rma.py:1100
 #, python-format
 msgid "New"
 msgstr "Nuevo"
@@ -767,13 +767,13 @@ msgid "Next Activity Type"
 msgstr "Siguiente tipo de actividad"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:773
+#: code:addons/rma/models/rma.py:772
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Ninguno de los RMAs seleccionados puede realizar un reemplazo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:756
+#: code:addons/rma/models/rma.py:755
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr "Ninguno de los RMAs seleccionados puede realizar una devolución."
@@ -954,7 +954,7 @@ msgid "Quantity to extract"
 msgstr "Cantidad a extraer"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:806
+#: code:addons/rma/models/rma.py:805
 #, python-format
 msgid ""
 "Quantity to extract cannot be greater than remaining delivery quantity (%s "
@@ -1132,7 +1132,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referencia al documento que generó este RMA."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:694
+#: code:addons/rma/models/rma.py:693
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1188,7 +1188,7 @@ msgid "Replaced"
 msgstr "Reemplazado"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1011
+#: code:addons/rma/models/rma.py:1010
 #, python-format
 msgid ""
 "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
@@ -1200,7 +1200,7 @@ msgstr ""
 "picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1022
+#: code:addons/rma/models/rma.py:1021
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
@@ -1224,7 +1224,7 @@ msgid "Requested operation"
 msgstr "Operación solicitada"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:737
+#: code:addons/rma/models/rma.py:736
 #, python-format
 msgid "Required field(s):%s"
 msgstr "Campo(s) requerido(s):%s"
@@ -1253,7 +1253,7 @@ msgid "Return to customer"
 msgstr "Devolver al cliente"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:972
+#: code:addons/rma/models/rma.py:971
 #, python-format
 msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
@@ -1341,7 +1341,7 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:890
+#: code:addons/rma/models/rma.py:889
 #, python-format
 msgid ""
 "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
@@ -1447,7 +1447,7 @@ msgstr ""
 "inicial porque el movimiento está enlazado a un RMA (%s)."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:794
+#: code:addons/rma/models/rma.py:793
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr "La cantidad a devolver es mayor que la cantidad restante del RMA."
@@ -1463,19 +1463,19 @@ msgstr ""
 "cantidad especificada en el RMA asociado."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:783
+#: code:addons/rma/models/rma.py:782
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Este RMA no puede ser dividido."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:770
+#: code:addons/rma/models/rma.py:769
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Este RMA no puede realizar un reemplazo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:753
+#: code:addons/rma/models/rma.py:752
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr "Este RMA no puede realizar una devolución."
@@ -1564,11 +1564,6 @@ msgstr "Usuarios"
 msgid "Very Urgent"
 msgstr "Muy Urgente"
 
-#. module: rma
-#: selection:rma,state:0
-msgid "Waiting for refund"
-msgstr "Esperando por reembolso"
-
 #. module: rma
 #: selection:rma,state:0
 msgid "Waiting for replacement"
@@ -1599,7 +1594,7 @@ msgid "Website communication history"
 msgstr "Historial de comunicaciones del sitio web"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:517
+#: code:addons/rma/models/rma.py:516
 #, 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"
@@ -1635,5 +1630,8 @@ msgstr ""
 "El usuario tendrá acceso a la configuración de RMA y a los informes "
 "estadísticos."
 
+#~ msgid "Waiting for refund"
+#~ msgstr "Esperando por reembolso"
+
 #~ msgid "New RMA in draft state"
 #~ msgstr "Nuevo RMA en estado Borrador"
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 0ddc48127..042748082 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -535,7 +535,7 @@ msgid "Draft RMA"
 msgstr "Rascunho do RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1098
+#: code:addons/rma/models/rma.py:1097
 #, python-format
 msgid ""
 "E-mail subject: %s\n"
@@ -638,7 +638,7 @@ msgstr ""
 "sem removê-lo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1102
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "Incoming e-mail"
 msgstr "E-mail recebido"
@@ -744,8 +744,8 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:495
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:494
+#: code:addons/rma/models/rma.py:1100
 #, python-format
 msgid "New"
 msgstr "Novo(a)"
@@ -766,13 +766,13 @@ msgid "Next Activity Type"
 msgstr "Tipo da Próxima Atividade"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:773
+#: code:addons/rma/models/rma.py:772
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr "Nenhum dos RMAs selecionados pode executar uma substituição."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:756
+#: code:addons/rma/models/rma.py:755
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr "Nenhum dos RMAs selecionados pode executar uma devolução."
@@ -953,7 +953,7 @@ msgid "Quantity to extract"
 msgstr "Quantidade a extrair"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:806
+#: code:addons/rma/models/rma.py:805
 #, python-format
 msgid ""
 "Quantity to extract cannot be greater than remaining delivery quantity (%s "
@@ -1130,7 +1130,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referência do documento que gerou este RMA."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:694
+#: code:addons/rma/models/rma.py:693
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1186,7 +1186,7 @@ msgid "Replaced"
 msgstr "Substituído"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1011
+#: code:addons/rma/models/rma.py:1010
 #, python-format
 msgid ""
 "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
@@ -1198,7 +1198,7 @@ msgstr ""
 "data-oe-id=\"%d\">%s</a> foi criada."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1022
+#: code:addons/rma/models/rma.py:1021
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
@@ -1222,7 +1222,7 @@ msgid "Requested operation"
 msgstr "Operação Solicitada"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:737
+#: code:addons/rma/models/rma.py:736
 #, python-format
 msgid "Required field(s):%s"
 msgstr "Campo(s) Solicitado(s):%s"
@@ -1251,7 +1251,7 @@ msgid "Return to customer"
 msgstr "Retornar ao cliente"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:972
+#: code:addons/rma/models/rma.py:971
 #, python-format
 msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
@@ -1339,7 +1339,7 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:890
+#: code:addons/rma/models/rma.py:889
 #, python-format
 msgid ""
 "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
@@ -1444,7 +1444,7 @@ msgstr ""
 "inicial, porque a movimentação do estoque está vinculada a uma RMA (%s)."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:794
+#: code:addons/rma/models/rma.py:793
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr "A quantidade a retornar é maior que a quantidade restante."
@@ -1460,19 +1460,19 @@ msgstr ""
 "especificada na sua RMA vinculada."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:783
+#: code:addons/rma/models/rma.py:782
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Esta RMA não pode ser dividida."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:770
+#: code:addons/rma/models/rma.py:769
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr "Esta RMA não pode executar uma substituição."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:753
+#: code:addons/rma/models/rma.py:752
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr "Este RMA não pode executar uma devolução."
@@ -1561,11 +1561,6 @@ msgstr "Usuários"
 msgid "Very Urgent"
 msgstr "Muito Urgente"
 
-#. module: rma
-#: selection:rma,state:0
-msgid "Waiting for refund"
-msgstr "Aguardando Restituição"
-
 #. module: rma
 #: selection:rma,state:0
 msgid "Waiting for replacement"
@@ -1596,7 +1591,7 @@ msgid "Website communication history"
 msgstr "Histórico de Comunicação Através do Site"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:517
+#: code:addons/rma/models/rma.py:516
 #, 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\""
@@ -1631,5 +1626,8 @@ msgstr ""
 "o usuário terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
 
+#~ msgid "Waiting for refund"
+#~ msgstr "Aguardando Restituição"
+
 #~ msgid "New RMA in draft state"
 #~ msgstr "Novo Rascunho de RMA"
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index b7eca793e..1f74e33f7 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -486,7 +486,7 @@ msgid "Draft RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1098
+#: code:addons/rma/models/rma.py:1097
 #, python-format
 msgid "E-mail subject: %s\n"
 "\n"
@@ -576,7 +576,7 @@ msgid "If the active field is set to false, it will allow you to hide the RMA Te
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1102
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "Incoming e-mail"
 msgstr ""
@@ -683,8 +683,8 @@ msgstr ""
 
 #. module: rma
 #: code:addons/rma/models/rma.py:31
-#: code:addons/rma/models/rma.py:495
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:494
+#: code:addons/rma/models/rma.py:1100
 #, python-format
 msgid "New"
 msgstr ""
@@ -705,13 +705,13 @@ msgid "Next Activity Type"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:773
+#: code:addons/rma/models/rma.py:772
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:756
+#: code:addons/rma/models/rma.py:755
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr ""
@@ -875,7 +875,7 @@ msgid "Quantity to extract"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:806
+#: code:addons/rma/models/rma.py:805
 #, python-format
 msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
 msgstr ""
@@ -1049,7 +1049,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:694
+#: code:addons/rma/models/rma.py:693
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1105,13 +1105,13 @@ msgid "Replaced"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1011
+#: code:addons/rma/models/rma.py:1010
 #, 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 ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1022
+#: code:addons/rma/models/rma.py:1021
 #, 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 ""
@@ -1127,7 +1127,7 @@ msgid "Requested operation"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:737
+#: code:addons/rma/models/rma.py:736
 #, python-format
 msgid "Required field(s):%s"
 msgstr ""
@@ -1156,7 +1156,7 @@ msgid "Return to customer"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:972
+#: code:addons/rma/models/rma.py:971
 #, python-format
 msgid "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
@@ -1240,7 +1240,7 @@ msgid "Split RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:890
+#: code:addons/rma/models/rma.py:889
 #, python-format
 msgid "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
@@ -1314,7 +1314,7 @@ msgid "The quantity done for the product '%s' must be equal to its initial deman
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:794
+#: code:addons/rma/models/rma.py:793
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr ""
@@ -1326,19 +1326,19 @@ msgid "There is at least one invoice lines whose quantity is less than the quant
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:783
+#: code:addons/rma/models/rma.py:782
 #, python-format
 msgid "This RMA cannot be split."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:770
+#: code:addons/rma/models/rma.py:769
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:753
+#: code:addons/rma/models/rma.py:752
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr ""
@@ -1427,11 +1427,6 @@ msgstr ""
 msgid "Very Urgent"
 msgstr ""
 
-#. module: rma
-#: selection:rma,state:0
-msgid "Waiting for refund"
-msgstr ""
-
 #. module: rma
 #: selection:rma,state:0
 msgid "Waiting for replacement"
@@ -1462,7 +1457,7 @@ msgid "Website communication history"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:517
+#: code:addons/rma/models/rma.py:516
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
diff --git a/rma/models/account_invoice.py b/rma/models/account_invoice.py
index 62c3951d1..b3e86196f 100644
--- a/rma/models/account_invoice.py
+++ b/rma/models/account_invoice.py
@@ -21,11 +21,12 @@ def action_invoice_open(self):
             raise ValidationError(
                 _("There is at least one invoice lines whose quantity is "
                   "less than the quantity specified in its linked RMA."))
-        res = super().action_invoice_open()
-        self.sudo().mapped('invoice_line_ids.rma_id').write(
-            {'state': 'refunded'}
-        )
-        return res
+        return super().action_invoice_open()
+
+    def unlink(self):
+        rma = self.mapped('invoice_line_ids.rma_id')
+        rma.write({'state': 'received'})
+        return super().unlink()
 
 
 class AccountInvoiceLine(models.Model):
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 924d3f545..191bc9651 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -164,7 +164,6 @@ def _domain_location_id(self):
             ("draft", "Draft"),
             ("confirmed", "Confirmed"),
             ("received", "Received"),
-            ("waiting_refund", "Waiting for refund"),
             ("waiting_return", "Waiting for return"),
             ("waiting_replacement", "Waiting for replacement"),
             ("refunded", "Refunded"),
@@ -402,7 +401,7 @@ def _compute_can_be_split(self):
     def _compute_can_be_locked(self):
         for r in self:
             r.can_be_locked = (r.remaining_qty_to_done > 0
-                               and r.state in ['received', 'waiting_refund',
+                               and r.state in ['received',
                                                'waiting_return',
                                                'waiting_replacement'])
 
@@ -590,7 +589,7 @@ def action_refund(self):
                 rma.write({
                     'refund_line_id': line.id,
                     'refund_id': refund.id,
-                    'state': 'waiting_refund',
+                    'state': 'refunded',
                 })
             refund.message_post_with_view(
                 'mail.message_origin_link',
diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py
index 5896accd1..cf2281c18 100644
--- a/rma/models/stock_warehouse.py
+++ b/rma/models/stock_warehouse.py
@@ -72,8 +72,8 @@ def _get_picking_type_create_values(self, max_sequence):
             'rma_in_type_id': {
                 'name': _('RMA Receipts'),
                 'code': 'incoming',
-                'use_create_lots': True,
-                'use_existing_lots': False,
+                'use_create_lots': False,
+                'use_existing_lots': True,
                 'default_location_src_id': False,
                 'default_location_dest_id': self.rma_loc_id.id,
                 'sequence': max_sequence + 1,
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 197276ad4..b6310ecec 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -266,7 +266,7 @@ def test_action_refund(self):
         self.assertEqual(rma.refund_line_id.product_id, rma.product_id)
         self.assertEqual(rma.refund_line_id.quantity, 10)
         self.assertEqual(rma.refund_line_id.uom_id, rma.product_uom)
-        self.assertEqual(rma.state, 'waiting_refund')
+        self.assertEqual(rma.state, 'refunded')
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
@@ -275,7 +275,6 @@ def test_action_refund(self):
             rma.refund_id.action_invoice_open()
         rma.refund_line_id.quantity = 10
         rma.refund_id.action_invoice_open()
-        self.assertEqual(rma.state, 'refunded')
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
@@ -311,6 +310,8 @@ def test_mass_refund(self):
         ctx = dict(self.env.context)
         ctx.update(active_ids=all_rmas.ids, active_model='rma')
         action.with_context(ctx).run()
+        # After that all RMAs are in 'refunded' state
+        self.assertEqual(all_rmas.mapped('state'), ['refunded'] * 4)
         # Two refunds were created
         refund_1 = (rma_1 | rma_2 | rma_3).mapped('refund_id')
         refund_2 = rma_4.refund_id
@@ -351,7 +352,6 @@ def test_mass_refund(self):
         rma_2.refund_line_id.quantity = 15
         refund_1.action_invoice_open()
         refund_2.action_invoice_open()
-        self.assertEqual(all_rmas.mapped('state'), ['refunded']*4)
 
     def test_replace(self):
         # Create, confirm and receive an RMA
@@ -636,3 +636,23 @@ def test_split(self):
         self.assertEqual(new_rma.product_uom_qty + rma.product_uom_qty, 10)
         self.assertEqual(new_rma.move_id.quantity_done, 10)
         self.assertEqual(new_rma.reception_move_id.quantity_done, 10)
+
+    def test_rma_to_receive_on_delete_invoice(self):
+        rma = self._create_confirm_receive(self.partner, self.product, 10,
+                                           self.rma_loc)
+        rma.action_refund()
+        self.assertEqual(rma.state, 'refunded')
+        rma.refund_id.unlink()
+        self.assertFalse(rma.refund_id)
+        self.assertEqual(rma.state, 'received')
+        self.assertTrue(rma.can_be_refunded)
+        self.assertTrue(rma.can_be_returned)
+        self.assertTrue(rma.can_be_replaced)
+
+    def test_rma_picking_type_default_values(self):
+        warehouse = self.env['stock.warehouse'].create({
+            'name': 'Stock - RMA Test',
+            'code': 'SRT',
+        })
+        self.assertFalse(warehouse.rma_in_type_id.use_create_lots)
+        self.assertTrue(warehouse.rma_in_type_id.use_existing_lots)

From 47383b30fa53e920565ad608d89cf86cc15bf0c5 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Wed, 30 Sep 2020 16:32:04 +0200
Subject: [PATCH 011/108] [FIX+IMP] rma: usability + Translated using Weblate
 (Spanish) + 5 things:

[FIX+IMP] rma: usability

* IMP - Now the description will be an html son we can show rich styles
in the customers report.
* FIX - On locked sale orders it was need to unlock them to be able to open an RMA.
* IMP - Make the description label visible in the backend form so the
user can easily spot it.
* IMP - Added date and deadline filters.
* IMP - Added pending RMAs filter.
* IMP - Added late RMAs filter.
* IMP - Added danger decoration in tree view

rma 12.0.1.5.0

[UPD] Update rma.pot

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/

Translated using Weblate (Spanish)

Currently translated at 100.0% (268 of 268 strings)

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/es/

[FIX] rma: return permissions

When a user with no stock manager permissions was doing the return, an
access error would raise.

rma 12.0.1.5.1

[FIX] rma: multicompany returns

The move was created with the default company

[UPD] Update rma.pot

rma 12.0.1.5.2

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/

[FIX] rma: non rma users confirm

The sudo had to be before calling the records

rma 12.0.1.5.3

[FIX] rma: pass company as record to procurement

This upstream commit expects `company_id` as a record instead of as an
integer id: https://github.com/odoo/odoo/commit/836ff55dc9f473a61f0c50c15fb5468d75959a83

rma 12.0.1.5.4

[FIX] rma: internal users portal

Internal users with no RMA permissions got an access error when entering
the portal

[UPD] Update rma.pot

rma 12.0.1.6.0

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-12.0/rma-12.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-12-0/rma-12-0-rma/
---
 rma/__manifest__.py                         |  2 +-
 rma/controllers/main.py                     |  6 ++-
 rma/i18n/es.po                              | 52 ++++++++++++++++-----
 rma/i18n/pt_BR.po                           | 48 +++++++++++++++----
 rma/i18n/rma.pot                            | 48 +++++++++++++++----
 rma/migrations/12.0.2.0.0/post-migration.py | 10 ++++
 rma/models/rma.py                           |  7 +--
 rma/models/stock_move.py                    |  2 +-
 rma/views/report_rma.xml                    |  2 +-
 rma/views/rma_portal_templates.xml          |  4 +-
 rma/views/rma_views.xml                     | 17 +++++--
 11 files changed, 157 insertions(+), 41 deletions(-)
 create mode 100644 rma/migrations/12.0.2.0.0/post-migration.py

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index f63ea8555..fe9c9af8a 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "12.0.1.4.3",
+    "version": "12.0.1.6.0",
     "development_status": "Beta",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/controllers/main.py b/rma/controllers/main.py
index aeb6d1c89..d590b0f0e 100644
--- a/rma/controllers/main.py
+++ b/rma/controllers/main.py
@@ -13,7 +13,11 @@ class PortalRma(CustomerPortal):
 
     def _prepare_portal_layout_values(self):
         values = super()._prepare_portal_layout_values()
-        values['rma_count'] = request.env['rma'].search_count([])
+        if request.env['rma'].check_access_rights(
+                'read', raise_exception=False):
+            values['rma_count'] = request.env['rma'].search_count([])
+        else:
+            values['rma_count'] = 0
         return values
 
     def _rma_get_page_view_values(self, rma, access_token, **kwargs):
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index dd2e0d745..b807bbd73 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-21 05:13+0000\n"
-"PO-Revision-Date: 2020-08-22 13:59+0000\n"
-"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>\n"
+"PO-Revision-Date: 2020-10-06 14:16+0000\n"
+"Last-Translator: David Vidal <david.vidal@tecnativa.com>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -455,7 +455,7 @@ msgid "Customer Portal URL"
 msgstr "URL del portal de cliente"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:38
+#: code:addons/rma/controllers/main.py:42
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -536,7 +536,7 @@ msgid "Draft RMA"
 msgstr "RMA en estado Borrador"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1097
+#: code:addons/rma/models/rma.py:1098
 #, python-format
 msgid ""
 "E-mail subject: %s\n"
@@ -639,7 +639,7 @@ msgstr ""
 "sin eliminarlo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:1102
 #, python-format
 msgid "Incoming e-mail"
 msgstr "Correo electrónico entrante"
@@ -692,6 +692,11 @@ msgstr "Última actualización por"
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr "RMAs retrasados"
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -736,7 +741,7 @@ msgid "Messages"
 msgstr "Mensajes"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:39
+#: code:addons/rma/controllers/main.py:43
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
 #: model:ir.model.fields,field_description:rma.field_rma_team__name
@@ -746,7 +751,7 @@ msgstr "Nombre"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:494
-#: code:addons/rma/models/rma.py:1100
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "New"
 msgstr "Nuevo"
@@ -993,6 +998,16 @@ msgstr "RMA nº"
 msgid "RMA Code"
 msgstr "Código de RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr "Fecha de RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr "RMA fecha límite"
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:82
 #, python-format
@@ -1106,6 +1121,16 @@ msgstr "Equipo de RMA"
 msgid "RMAs"
 msgstr "RMAs"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr "RMAs pasados de fecha límite"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr "RMAs pendientes de ser procesados por completo"
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -1188,7 +1213,7 @@ msgid "Replaced"
 msgstr "Reemplazado"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1010
+#: code:addons/rma/models/rma.py:1011
 #, python-format
 msgid ""
 "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
@@ -1200,7 +1225,7 @@ msgstr ""
 "picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1021
+#: code:addons/rma/models/rma.py:1022
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
@@ -1253,7 +1278,7 @@ msgid "Return to customer"
 msgstr "Devolver al cliente"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:971
+#: code:addons/rma/models/rma.py:972
 #, python-format
 msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
@@ -1357,7 +1382,7 @@ msgid "State"
 msgstr "Estado"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:40
+#: code:addons/rma/controllers/main.py:44
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
@@ -1534,6 +1559,11 @@ msgstr "Mensajes por leer"
 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"
+msgstr "RMAs sin resolver"
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom
 msgid "UoM"
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 042748082..6475bdf3c 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -454,7 +454,7 @@ msgid "Customer Portal URL"
 msgstr "URL do portal do cliente"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:38
+#: code:addons/rma/controllers/main.py:42
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -535,7 +535,7 @@ msgid "Draft RMA"
 msgstr "Rascunho do RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1097
+#: code:addons/rma/models/rma.py:1098
 #, python-format
 msgid ""
 "E-mail subject: %s\n"
@@ -638,7 +638,7 @@ msgstr ""
 "sem removê-lo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:1102
 #, python-format
 msgid "Incoming e-mail"
 msgstr "E-mail recebido"
@@ -691,6 +691,11 @@ msgstr "Última Atualização Feita por"
 msgid "Last Updated on"
 msgstr "Última Atualização Feita em"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -735,7 +740,7 @@ msgid "Messages"
 msgstr "Mensagens"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:39
+#: code:addons/rma/controllers/main.py:43
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
 #: model:ir.model.fields,field_description:rma.field_rma_team__name
@@ -745,7 +750,7 @@ msgstr "Nome"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:494
-#: code:addons/rma/models/rma.py:1100
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "New"
 msgstr "Novo(a)"
@@ -992,6 +997,16 @@ msgstr "RMA #"
 msgid "RMA Code"
 msgstr "Código RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:82
 #, python-format
@@ -1104,6 +1119,16 @@ msgstr "Equipe RMA"
 msgid "RMAs"
 msgstr "RMAs"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -1186,7 +1211,7 @@ msgid "Replaced"
 msgstr "Substituído"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1010
+#: code:addons/rma/models/rma.py:1011
 #, python-format
 msgid ""
 "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
@@ -1198,7 +1223,7 @@ msgstr ""
 "data-oe-id=\"%d\">%s</a> foi criada."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1021
+#: code:addons/rma/models/rma.py:1022
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
@@ -1251,7 +1276,7 @@ msgid "Return to customer"
 msgstr "Retornar ao cliente"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:971
+#: code:addons/rma/models/rma.py:972
 #, python-format
 msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
@@ -1355,7 +1380,7 @@ msgid "State"
 msgstr "Situação"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:40
+#: code:addons/rma/controllers/main.py:44
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
@@ -1531,6 +1556,11 @@ msgstr "Mensagens não lidas"
 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"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom
 msgid "UoM"
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 1f74e33f7..0e633fe8d 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -404,7 +404,7 @@ msgid "Customer Portal URL"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:38
+#: code:addons/rma/controllers/main.py:42
 #: model:ir.model.fields,field_description:rma.field_rma__date
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -486,7 +486,7 @@ msgid "Draft RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1097
+#: code:addons/rma/models/rma.py:1098
 #, python-format
 msgid "E-mail subject: %s\n"
 "\n"
@@ -576,7 +576,7 @@ msgid "If the active field is set to false, it will allow you to hide the RMA Te
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:1102
 #, python-format
 msgid "Incoming e-mail"
 msgstr ""
@@ -629,6 +629,11 @@ msgstr ""
 msgid "Last Updated on"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -673,7 +678,7 @@ msgid "Messages"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:39
+#: code:addons/rma/controllers/main.py:43
 #: model:ir.model.fields,field_description:rma.field_rma__name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__name
 #: model:ir.model.fields,field_description:rma.field_rma_team__name
@@ -684,7 +689,7 @@ msgstr ""
 #. module: rma
 #: code:addons/rma/models/rma.py:31
 #: code:addons/rma/models/rma.py:494
-#: code:addons/rma/models/rma.py:1100
+#: code:addons/rma/models/rma.py:1101
 #, python-format
 msgid "New"
 msgstr ""
@@ -910,6 +915,16 @@ msgstr ""
 msgid "RMA Code"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:82
 #, python-format
@@ -1022,6 +1037,16 @@ msgstr ""
 msgid "RMAs"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -1105,13 +1130,13 @@ msgid "Replaced"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1010
+#: code:addons/rma/models/rma.py:1011
 #, 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 ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1021
+#: code:addons/rma/models/rma.py:1022
 #, 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 ""
@@ -1156,7 +1181,7 @@ msgid "Return to customer"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:971
+#: code:addons/rma/models/rma.py:972
 #, python-format
 msgid "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
@@ -1252,7 +1277,7 @@ msgid "State"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:40
+#: code:addons/rma/controllers/main.py:44
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
@@ -1397,6 +1422,11 @@ msgstr ""
 msgid "Unread Messages Counter"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unresolved RMAs"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom
 msgid "UoM"
diff --git a/rma/migrations/12.0.2.0.0/post-migration.py b/rma/migrations/12.0.2.0.0/post-migration.py
new file mode 100644
index 000000000..77fe95b4d
--- /dev/null
+++ b/rma/migrations/12.0.2.0.0/post-migration.py
@@ -0,0 +1,10 @@
+# Copyright 2020 Tecnativa - David Vidal
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    # Convert Text description field to Html
+    openupgrade.convert_field_to_html(
+        env.cr, "rma", "description", "description")
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 191bc9651..ee40d0609 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -176,7 +176,7 @@ def _domain_location_id(self):
         copy=False,
         track_visibility="onchange",
     )
-    description = fields.Text(
+    description = fields.Html(
         states={
             'locked': [('readonly', True)],
             'cancelled': [('readonly', True)],
@@ -965,8 +965,9 @@ def create_return(self, scheduled_date, qty=None, uom=None):
                     picking_id=picking.id,
                     rma_id=rma.id,
                     move_orig_ids=[(4, rma.reception_move_id.id)],
+                    company_id=picking.company_id.id,
                 )
-                self.env['stock.move'].create(move_vals)
+                self.env['stock.move'].sudo().create(move_vals)
                 rma.message_post(
                     body=_(
                         'Return: <a href="#" data-oe-model="stock.picking" '
@@ -1070,7 +1071,7 @@ def _prepare_procurement_values(
     ):
         self.ensure_one()
         return {
-            'company_id': self.company_id.id,
+            'company_id': self.company_id,
             'group_id': group_id,
             'date_planned': scheduled_date,
             'warehouse_id': warehouse,
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index 295561467..217d4c6ce 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -57,7 +57,7 @@ def _action_done(self):
         """
         for move in self.filtered(
                 lambda r: r.state not in ('done', 'cancel')):
-            rma_receiver = move.rma_receiver_ids.sudo()
+            rma_receiver = move.sudo().rma_receiver_ids
             if (rma_receiver
                     and move.quantity_done != rma_receiver.product_uom_qty):
                 raise ValidationError(
diff --git a/rma/views/report_rma.xml b/rma/views/report_rma.xml
index c6320d0d7..2225bab3c 100644
--- a/rma/views/report_rma.xml
+++ b/rma/views/report_rma.xml
@@ -81,7 +81,7 @@
                 </div>
                 <div t-if="doc.description">
                     <strong>RMA Note:</strong>
-                    <p t-field="doc.description" />
+                    <p t-raw="doc.description" />
                 </div>
             </div>
         </t>
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index 9219c0449..33b6e98ec 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -16,7 +16,7 @@
 
     <template id="portal_my_home_rma" name="Portal My Home : RMA entries" inherit_id="portal.portal_my_home" priority="30">
         <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
-            <t t-call="portal.portal_docs_entry">
+            <t t-call="portal.portal_docs_entry" t-if="rma_count">
                 <t t-set="title">RMA Orders</t>
                 <t t-set="url" t-value="'/my/rmas'"/>
                 <t t-set="count" t-value="rma_count"/>
@@ -256,7 +256,7 @@
                     <section id="description" class="mt-5" t-if="rma.description">
                         <h3 class="">Description</h3>
                         <hr class="mt-0 mb-1"/>
-                        <em t-field="rma.description"/>
+                        <t t-raw="rma.description"/>
                     </section>
                 </t>
             </t>
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index f77660a67..6885d52b9 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -19,6 +19,17 @@
                         string="Received"
                         domain="[('state','=', 'received')]" />
                 <separator />
+                <filter string="Unresolved RMAs"
+                        name="undone_rma"
+                        domain="[('state', 'not in', ['refunded', 'returned', 'replaced', 'locked', 'cancelled'])]"
+                        help="RMAs yet to be fully processed"/>
+                <filter string="Late RMAs"
+                        name="late_rma"
+                        domain="[('deadline', '&lt;', context_today().strftime('%Y-%m-%d')), ('state', 'not in', ['refunded', 'returned', 'replaced', 'locked', 'cancelled'])]"
+                        help="RMAs which deadline has passed"/>
+                <separator />
+                <filter string="RMA Date" name="filter_rma_date" date="date"/>
+                <filter string="RMA Deadline" name="filter_rma_deadline" date="deadline"/>
                 <filter name="no_user_id_filter"
                         string="Unassigned RMAs"
                         domain="[('user_id','=', False)]" />
@@ -48,7 +59,8 @@
         <field name="model">rma</field>
         <field name="arch" type="xml">
             <tree decoration-muted="state in ['cancelled', 'locked']"
-                  decoration-bf="state == 'draft' and product_id == False">
+                  decoration-bf="state == 'draft' and product_id == False"
+                  decoration-danger="deadline and (deadline &lt; current_date)">
                 <field name="name"/>
                 <field name="origin"/>
                 <field name="user_id"/>
@@ -208,8 +220,7 @@
                                 </group>
                             </group>
                             <group>
-                                <label for="description" class="oe_edit_only"/>
-                                <field name="description" colspan="4" nolabel="1"/>
+                                <field name="description" widget="html" colspan="4" />
                             </group>
                         </page>
                     </notebook>

From bbc1c95e8e0d8ec4cb4b774546da9d867c5de3da Mon Sep 17 00:00:00 2001
From: Ernesto Tejeda <ernesto.tejeda@tecnativa.com>
Date: Fri, 23 Oct 2020 15:28:05 -0400
Subject: [PATCH 012/108] [IMP] rma: black, isort, prettier

---
 rma/__init__.py                             |   2 +-
 rma/__manifest__.py                         |   7 +-
 rma/controllers/main.py                     | 128 ++--
 rma/data/mail_data.xml                      |  24 +-
 rma/data/rma_operation_data.xml             |   2 +-
 rma/hooks.py                                |  63 +-
 rma/migrations/12.0.2.0.0/post-migration.py |   3 +-
 rma/models/account_invoice.py               |  39 +-
 rma/models/res_company.py                   |  22 +-
 rma/models/res_partner.py                   |  30 +-
 rma/models/res_users.py                     |   6 +-
 rma/models/rma.py                           | 793 ++++++++++----------
 rma/models/rma_operation.py                 |   2 +-
 rma/models/rma_team.py                      |  29 +-
 rma/models/stock_move.py                    | 101 ++-
 rma/models/stock_picking.py                 |  31 +-
 rma/models/stock_warehouse.py               | 157 ++--
 rma/security/rma_security.xml               |  73 +-
 rma/tests/test_rma.py                       | 453 +++++------
 rma/views/menus.xml                         |  19 +-
 rma/views/report_rma.xml                    |  65 +-
 rma/views/res_partner_views.xml             |  22 +-
 rma/views/rma_portal_templates.xml          | 414 +++++++---
 rma/views/rma_team_views.xml                | 107 ++-
 rma/views/rma_views.xml                     | 457 ++++++-----
 rma/views/stock_picking_views.xml           |  22 +-
 rma/views/stock_warehouse_views.xml         |  12 +-
 rma/wizard/rma_delivery.py                  |  66 +-
 rma/wizard/rma_delivery_views.xml           |  75 +-
 rma/wizard/rma_split.py                     |  55 +-
 rma/wizard/rma_split_views.xml              |  15 +-
 rma/wizard/stock_picking_return.py          |  47 +-
 rma/wizard/stock_picking_return_views.xml   |  17 +-
 33 files changed, 1872 insertions(+), 1486 deletions(-)

diff --git a/rma/__init__.py b/rma/__init__.py
index 336227cc4..25d6cd09d 100644
--- a/rma/__init__.py
+++ b/rma/__init__.py
@@ -3,4 +3,4 @@
 from . import controllers
 from . import models
 from . import wizard
-from .hooks import  post_init_hook
+from .hooks import post_init_hook
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index fe9c9af8a..5ecc5d933 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -10,10 +10,7 @@
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "maintainers": ["ernestotejeda"],
     "license": "AGPL-3",
-    "depends": [
-        "account",
-        "stock",
-    ],
+    "depends": ["account", "stock",],
     "data": [
         "views/report_rma.xml",
         "report/report.xml",
@@ -32,6 +29,6 @@
         "views/stock_picking_views.xml",
         "views/stock_warehouse_views.xml",
     ],
-    'post_init_hook': 'post_init_hook',
+    "post_init_hook": "post_init_hook",
     "application": True,
 }
diff --git a/rma/controllers/main.py b/rma/controllers/main.py
index d590b0f0e..a262f83aa 100644
--- a/rma/controllers/main.py
+++ b/rma/controllers/main.py
@@ -4,54 +4,53 @@
 from odoo import _, exceptions, http
 from odoo.exceptions import AccessError, MissingError
 from odoo.http import request
-from odoo.addons.portal.controllers.portal import CustomerPortal,\
-    pager as portal_pager
 from odoo.tools import consteq
 
+from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager
 
-class PortalRma(CustomerPortal):
 
+class PortalRma(CustomerPortal):
     def _prepare_portal_layout_values(self):
         values = super()._prepare_portal_layout_values()
-        if request.env['rma'].check_access_rights(
-                'read', raise_exception=False):
-            values['rma_count'] = request.env['rma'].search_count([])
+        if request.env["rma"].check_access_rights("read", raise_exception=False):
+            values["rma_count"] = request.env["rma"].search_count([])
         else:
-            values['rma_count'] = 0
+            values["rma_count"] = 0
         return values
 
     def _rma_get_page_view_values(self, rma, access_token, **kwargs):
         values = {
-            'page_name': 'RMA',
-            'rma': rma,
+            "page_name": "RMA",
+            "rma": rma,
         }
         return self._get_page_view_values(
-            rma, access_token, values, 'my_rmas_history', False, **kwargs)
+            rma, access_token, values, "my_rmas_history", False, **kwargs
+        )
 
     def _get_filter_domain(self, kw):
         return []
 
-    @http.route(['/my/rmas', '/my/rmas/page/<int:page>'],
-                type='http', auth="user", website=True)
-    def portal_my_rmas(self, page=1, date_begin=None, date_end=None,
-                       sortby=None, **kw):
+    @http.route(
+        ["/my/rmas", "/my/rmas/page/<int:page>"], type="http", auth="user", website=True
+    )
+    def portal_my_rmas(self, page=1, date_begin=None, date_end=None, sortby=None, **kw):
         values = self._prepare_portal_layout_values()
-        rma_obj = request.env['rma']
+        rma_obj = request.env["rma"]
         domain = self._get_filter_domain(kw)
         searchbar_sortings = {
-            'date': {'label': _('Date'), 'order': 'date desc'},
-            'name': {'label': _('Name'), 'order': 'name desc'},
-            'state': {'label': _('Status'), 'order': 'state'},
+            "date": {"label": _("Date"), "order": "date desc"},
+            "name": {"label": _("Name"), "order": "name desc"},
+            "state": {"label": _("Status"), "order": "state"},
         }
         # default sort by order
         if not sortby:
-            sortby = 'date'
-        order = searchbar_sortings[sortby]['order']
-        archive_groups = self._get_archive_groups('rma', domain)
+            sortby = "date"
+        order = searchbar_sortings[sortby]["order"]
+        archive_groups = self._get_archive_groups("rma", domain)
         if date_begin and date_end:
             domain += [
-                ('create_date', '>', date_begin),
-                ('create_date', '<=', date_end),
+                ("create_date", ">", date_begin),
+                ("create_date", "<=", date_end),
             ]
         # count for pager
         rma_count = rma_obj.search_count(domain)
@@ -59,77 +58,80 @@ def portal_my_rmas(self, page=1, date_begin=None, date_end=None,
         pager = portal_pager(
             url="/my/rmas",
             url_args={
-                'date_begin': date_begin,
-                'date_end': date_end,
-                'sortby': sortby,
+                "date_begin": date_begin,
+                "date_end": date_end,
+                "sortby": sortby,
             },
             total=rma_count,
             page=page,
-            step=self._items_per_page
+            step=self._items_per_page,
         )
         # content according to pager and archive selected
         rmas = rma_obj.search(
-            domain,
-            order=order,
-            limit=self._items_per_page,
-            offset=pager['offset']
+            domain, order=order, limit=self._items_per_page, offset=pager["offset"]
+        )
+        request.session["my_rmas_history"] = rmas.ids[:100]
+        values.update(
+            {
+                "date": date_begin,
+                "rmas": rmas,
+                "page_name": "RMA",
+                "pager": pager,
+                "archive_groups": archive_groups,
+                "default_url": "/my/rmas",
+                "searchbar_sortings": searchbar_sortings,
+                "sortby": sortby,
+            }
         )
-        request.session['my_rmas_history'] = rmas.ids[:100]
-        values.update({
-            'date': date_begin,
-            'rmas': rmas,
-            'page_name': 'RMA',
-            'pager': pager,
-            'archive_groups': archive_groups,
-            'default_url': '/my/rmas',
-            'searchbar_sortings': searchbar_sortings,
-            'sortby': sortby,
-        })
         return request.render("rma.portal_my_rmas", values)
 
-    @http.route(['/my/rmas/<int:rma_id>'],
-                type='http', auth="public", website=True)
-    def portal_my_rma_detail(self, rma_id, access_token=None,
-                             report_type=None, download=False, **kw):
+    @http.route(["/my/rmas/<int:rma_id>"], type="http", auth="public", website=True)
+    def portal_my_rma_detail(
+        self, rma_id, access_token=None, report_type=None, download=False, **kw
+    ):
         try:
-            rma_sudo = self._document_check_access('rma', rma_id, access_token)
+            rma_sudo = self._document_check_access("rma", rma_id, access_token)
         except (AccessError, MissingError):
-            return request.redirect('/my')
-        if report_type in ('html', 'pdf', 'text'):
+            return request.redirect("/my")
+        if report_type in ("html", "pdf", "text"):
             return self._show_report(
                 model=rma_sudo,
                 report_type=report_type,
-                report_ref='rma.report_rma_action',
+                report_ref="rma.report_rma_action",
                 download=download,
             )
 
         values = self._rma_get_page_view_values(rma_sudo, access_token, **kw)
         return request.render("rma.portal_rma_page", values)
 
-    @http.route(['/my/rma/picking/pdf/<int:rma_id>/<int:picking_id>'],
-                type='http', auth="public", website=True)
-    def portal_my_rma_picking_report(self, rma_id, picking_id,
-                                     access_token=None, **kw):
+    @http.route(
+        ["/my/rma/picking/pdf/<int:rma_id>/<int:picking_id>"],
+        type="http",
+        auth="public",
+        website=True,
+    )
+    def portal_my_rma_picking_report(self, rma_id, picking_id, access_token=None, **kw):
         try:
             picking_sudo = self._picking_check_access(
-                rma_id, picking_id, access_token=access_token)
+                rma_id, picking_id, access_token=access_token
+            )
         except exceptions.AccessError:
-            return request.redirect('/my')
-        report_sudo = request.env.ref('stock.action_report_delivery').sudo()
+            return request.redirect("/my")
+        report_sudo = request.env.ref("stock.action_report_delivery").sudo()
         pdf = report_sudo.render_qweb_pdf([picking_sudo.id])[0]
         pdfhttpheaders = [
-            ('Content-Type', 'application/pdf'),
-            ('Content-Length', len(pdf)),
+            ("Content-Type", "application/pdf"),
+            ("Content-Length", len(pdf)),
         ]
         return request.make_response(pdf, headers=pdfhttpheaders)
 
     def _picking_check_access(self, rma_id, picking_id, access_token=None):
-        rma = request.env['rma'].browse([rma_id])
-        picking = request.env['stock.picking'].browse([picking_id])
+        rma = request.env["rma"].browse([rma_id])
+        picking = request.env["stock.picking"].browse([picking_id])
         picking_sudo = picking.sudo()
         try:
-            picking.check_access_rights('read')
-            picking.check_access_rule('read')
+            picking.check_access_rights("read")
+            picking.check_access_rule("read")
         except exceptions.AccessError:
             if not access_token or not consteq(rma.access_token, access_token):
                 raise
diff --git a/rma/data/mail_data.xml b/rma/data/mail_data.xml
index 7c1187269..3a0c32c28 100644
--- a/rma/data/mail_data.xml
+++ b/rma/data/mail_data.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <data noupdate="1">
     <!-- rma-related subtypes for messaging / Chatter -->
     <record id="mt_rma_draft" model="mail.message.subtype">
         <field name="name">Draft RMA</field>
         <field name="res_model">rma</field>
-        <field name="default" eval="False"/>
+        <field name="default" eval="False" />
         <field name="description">RMA in draft state</field>
     </record>
     <!-- rma_team-related subtypes for messaging / Chatter -->
@@ -12,25 +12,27 @@
         <field name="name">Draft RMA</field>
         <field name="sequence">10</field>
         <field name="res_model">rma.team</field>
-        <field name="default" eval="True"/>
-        <field name="parent_id" eval="ref('rma.mt_rma_draft')"/>
+        <field name="default" eval="True" />
+        <field name="parent_id" eval="ref('rma.mt_rma_draft')" />
         <field name="relation_field">team_id</field>
     </record>
     <!--RMA email template -->
     <record id="mail_template_rma_notification" model="mail.template">
         <field name="name">RMA Notification</field>
-        <field name="model_id" ref="model_rma"/>
+        <field name="model_id" ref="model_rma" />
         <field name="email_from">${object.user_id.email_formatted |safe}</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="subject"
+        >${object.company_id.name} RMA (Ref ${object.name or 'n/a' })</field>
         <field name="report_template" ref="report_rma_action" />
         <field name="report_name">${(object.name or '')}</field>
         <field name="lang">${object.partner_id.lang}</field>
-        <field name="user_signature" eval="True"/>
-        <field name="auto_delete" eval="True"/>
+        <field name="user_signature" eval="True" />
+        <field name="auto_delete" eval="True" />
         <field name="body_html" type="html">
-<div style="margin: 0px; padding: 0px;">
-<p style="margin: 0px; padding: 0px; font-size: 13px;">
+            <div style="margin: 0px; padding: 0px;">
+                <p style="margin: 0px; padding: 0px; font-size: 13px;">
     Dear ${object.partner_id.name}
     % if object.partner_id.parent_id:
         (${object.partner_id.parent_id.name})
@@ -40,7 +42,7 @@
     <br /><br />
     Do not hesitate to contact us if you have any question.
 </p>
-</div>
+            </div>
         </field>
     </record>
 </data>
diff --git a/rma/data/rma_operation_data.xml b/rma/data/rma_operation_data.xml
index 60ea6e044..a194b87d4 100644
--- a/rma/data/rma_operation_data.xml
+++ b/rma/data/rma_operation_data.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <data noupdate="1">
     <record id="rma_operation_replace" model="rma.operation">
         <field name="name">Replace</field>
diff --git a/rma/hooks.py b/rma/hooks.py
index f5e24d848..1c2791c8f 100644
--- a/rma/hooks.py
+++ b/rma/hooks.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import api, SUPERUSER_ID
+from odoo import SUPERUSER_ID, api
 
 
 def post_init_hook(cr, registry):
@@ -9,62 +9,65 @@ def post_init_hook(cr, registry):
 
     def _get_next_picking_type_color():
         """ Choose the next available color for the operation types."""
-        stock_picking_type = env['stock.picking.type']
+        stock_picking_type = env["stock.picking.type"]
         picking_type = stock_picking_type.search_read(
-            [('warehouse_id', '!=', False), ('color', '!=', False)],
-            ['color'],
-            order='color',
+            [("warehouse_id", "!=", False), ("color", "!=", False)],
+            ["color"],
+            order="color",
         )
-        all_used_colors = [res['color'] for res in picking_type]
-        available_colors = [color for color in range(0, 12)
-                            if color not in all_used_colors]
+        all_used_colors = [res["color"] for res in picking_type]
+        available_colors = [
+            color for color in range(0, 12) if color not in all_used_colors
+        ]
         return available_colors[0] if available_colors else 0
 
     def create_rma_locations(warehouse):
-        stock_location = env['stock.location']
+        stock_location = env["stock.location"]
         location_vals = warehouse._get_locations_values({})
         for field_name, values in location_vals.items():
-            if field_name == 'rma_loc_id' and not warehouse.rma_loc_id:
-                warehouse.rma_loc_id = stock_location.with_context(
-                    active_test=False).create(values).id
+            if field_name == "rma_loc_id" and not warehouse.rma_loc_id:
+                warehouse.rma_loc_id = (
+                    stock_location.with_context(active_test=False).create(values).id
+                )
 
     def create_rma_picking_types(whs):
-        ir_sequence_sudo = env['ir.sequence'].sudo()
-        stock_picking_type = env['stock.picking.type']
+        ir_sequence_sudo = env["ir.sequence"].sudo()
+        stock_picking_type = env["stock.picking.type"]
         color = _get_next_picking_type_color()
         stock_picking = stock_picking_type.search(
-            [('sequence', '!=', False)], limit=1, order='sequence desc')
+            [("sequence", "!=", False)], limit=1, order="sequence desc"
+        )
         max_sequence = stock_picking.sequence or 0
         create_data = whs._get_picking_type_create_values(max_sequence)[0]
         sequence_data = whs._get_sequence_values()
         data = {}
         for picking_type, values in create_data.items():
-            if (picking_type in ['rma_in_type_id', 'rma_out_type_id']
-                    and not whs[picking_type]):
+            if (
+                picking_type in ["rma_in_type_id", "rma_out_type_id"]
+                and not whs[picking_type]
+            ):
                 picking_sequence = sequence_data[picking_type]
                 sequence = ir_sequence_sudo.create(picking_sequence)
                 values.update(
-                    warehouse_id=whs.id,
-                    color=color,
-                    sequence_id=sequence.id,
+                    warehouse_id=whs.id, color=color, sequence_id=sequence.id,
                 )
                 data[picking_type] = stock_picking_type.create(values).id
 
-        rma_out_type = stock_picking_type.browse(data['rma_out_type_id'])
-        rma_out_type.write({
-            'return_picking_type_id': data.get('rma_in_type_id', False)
-        })
-        rma_in_type = stock_picking_type.browse(data['rma_in_type_id'])
-        rma_in_type.write({
-            'return_picking_type_id': data.get('rma_out_type_id', False)
-        })
+        rma_out_type = stock_picking_type.browse(data["rma_out_type_id"])
+        rma_out_type.write(
+            {"return_picking_type_id": data.get("rma_in_type_id", False)}
+        )
+        rma_in_type = stock_picking_type.browse(data["rma_in_type_id"])
+        rma_in_type.write(
+            {"return_picking_type_id": data.get("rma_out_type_id", False)}
+        )
         whs.write(data)
 
     # Create rma locations and picking types
-    warehouses = env['stock.warehouse'].search([])
+    warehouses = env["stock.warehouse"].search([])
     for warehouse in warehouses:
         create_rma_locations(warehouse)
         create_rma_picking_types(warehouse)
     # Create rma sequence per company
-    for company in env['res.company'].search([]):
+    for company in env["res.company"].search([]):
         company.create_rma_index()
diff --git a/rma/migrations/12.0.2.0.0/post-migration.py b/rma/migrations/12.0.2.0.0/post-migration.py
index 77fe95b4d..6056dcabe 100644
--- a/rma/migrations/12.0.2.0.0/post-migration.py
+++ b/rma/migrations/12.0.2.0.0/post-migration.py
@@ -6,5 +6,4 @@
 @openupgrade.migrate()
 def migrate(env, version):
     # Convert Text description field to Html
-    openupgrade.convert_field_to_html(
-        env.cr, "rma", "description", "description")
+    openupgrade.convert_field_to_html(env.cr, "rma", "description", "description")
diff --git a/rma/models/account_invoice.py b/rma/models/account_invoice.py
index b3e86196f..823a49899 100644
--- a/rma/models/account_invoice.py
+++ b/rma/models/account_invoice.py
@@ -7,32 +7,41 @@
 
 
 class AccountInvoice(models.Model):
-    _inherit = 'account.invoice'
+    _inherit = "account.invoice"
 
     def action_invoice_open(self):
         """ Avoids to validate a refund with less quantity of product than
         quantity in the linked RMA.
         """
-        precision = self.env['decimal.precision'].precision_get(
-            'Product Unit of Measure')
-        if self.sudo().mapped('invoice_line_ids').filtered(
-                lambda r: (r.rma_id and float_compare(
-                    r.quantity, r.rma_id.product_uom_qty, precision) < 0)):
+        precision = self.env["decimal.precision"].precision_get(
+            "Product Unit of Measure"
+        )
+        if (
+            self.sudo()
+            .mapped("invoice_line_ids")
+            .filtered(
+                lambda r: (
+                    r.rma_id
+                    and float_compare(r.quantity, r.rma_id.product_uom_qty, precision)
+                    < 0
+                )
+            )
+        ):
             raise ValidationError(
-                _("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."
+                )
+            )
         return super().action_invoice_open()
 
     def unlink(self):
-        rma = self.mapped('invoice_line_ids.rma_id')
-        rma.write({'state': 'received'})
+        rma = self.mapped("invoice_line_ids.rma_id")
+        rma.write({"state": "received"})
         return super().unlink()
 
 
 class AccountInvoiceLine(models.Model):
-    _inherit = 'account.invoice.line'
+    _inherit = "account.invoice.line"
 
-    rma_id = fields.Many2one(
-        comodel_name='rma',
-        string='RMA',
-    )
+    rma_id = fields.Many2one(comodel_name="rma", string="RMA",)
diff --git a/rma/models/res_company.py b/rma/models/res_company.py
index cb65960c5..a71293911 100644
--- a/rma/models/res_company.py
+++ b/rma/models/res_company.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import api, models, _
+from odoo import _, api, models
 
 
 class Company(models.Model):
@@ -14,10 +14,16 @@ def create(self, vals):
         return company
 
     def create_rma_index(self):
-        return self.env['ir.sequence'].sudo().create({
-            'name': _('RMA Code'),
-            'prefix': 'RMA',
-            'code': 'rma',
-            'padding': 4,
-            'company_id': self.id,
-        })
+        return (
+            self.env["ir.sequence"]
+            .sudo()
+            .create(
+                {
+                    "name": _("RMA Code"),
+                    "prefix": "RMA",
+                    "code": "rma",
+                    "padding": 4,
+                    "company_id": self.id,
+                }
+            )
+        )
diff --git a/rma/models/res_partner.py b/rma/models/res_partner.py
index 494c267a3..d26f3845e 100644
--- a/rma/models/res_partner.py
+++ b/rma/models/res_partner.py
@@ -5,37 +5,31 @@
 
 
 class ResPartner(models.Model):
-    _inherit = 'res.partner'
+    _inherit = "res.partner"
 
     rma_ids = fields.One2many(
-        comodel_name='rma',
-        inverse_name='partner_id',
-        string='RMAs',
-    )
-    rma_count = fields.Integer(
-        string='RMA count',
-        compute='_compute_rma_count',
+        comodel_name="rma", inverse_name="partner_id", string="RMAs",
     )
+    rma_count = fields.Integer(string="RMA count", compute="_compute_rma_count",)
 
     def _compute_rma_count(self):
-        rma_data = self.env['rma'].read_group(
-            [('partner_id', 'in', self.ids)], ['partner_id'], ['partner_id'])
-        mapped_data = dict(
-            [(r['partner_id'][0], r['partner_id_count']) for r in rma_data])
+        rma_data = self.env["rma"].read_group(
+            [("partner_id", "in", self.ids)], ["partner_id"], ["partner_id"]
+        )
+        mapped_data = {
+            r["partner_id"][0]: r["partner_id_count"] for r in rma_data
+        }
         for record in self:
             record.rma_count = mapped_data.get(record.id, 0)
 
     def action_view_rma(self):
         self.ensure_one()
-        action = self.env.ref('rma.rma_action').read()[0]
+        action = self.env.ref("rma.rma_action").read()[0]
         rma = self.rma_ids
         if len(rma) == 1:
             action.update(
-                res_id=rma.id,
-                view_mode="form",
-                view_id=False,
-                views=False,
+                res_id=rma.id, view_mode="form", view_id=False, views=False,
             )
         else:
-            action['domain'] = [('partner_id', 'in', self.ids)]
+            action["domain"] = [("partner_id", "in", self.ids)]
         return action
diff --git a/rma/models/res_users.py b/rma/models/res_users.py
index 4cce3c9a1..47ebd2135 100644
--- a/rma/models/res_users.py
+++ b/rma/models/res_users.py
@@ -5,10 +5,10 @@
 
 
 class ResUsers(models.Model):
-    _inherit = 'res.users'
+    _inherit = "res.users"
 
     rma_team_id = fields.Many2one(
-        comodel_name='rma.team',
+        comodel_name="rma.team",
         string="RMA Team",
-        help='RMA Team the user is member of.',
+        help="RMA Team the user is member of.",
     )
diff --git a/rma/models/rma.py b/rma/models/rma.py
index ee40d0609..4c6251a13 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1,13 +1,15 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+from collections import Counter
+
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tests import Form
 from odoo.tools import html2plaintext
+
 import odoo.addons.decimal_precision as dp
 from odoo.addons.stock.models.stock_move import PROCUREMENT_PRIORITIES
-from collections import Counter
 
 
 class Rma(models.Model):
@@ -17,25 +19,22 @@ class Rma(models.Model):
     _inherit = ["mail.thread", "portal.mixin", "mail.activity.mixin"]
 
     def _domain_location_id(self):
-        rma_loc = self.env['stock.warehouse'].search([]).mapped('rma_loc_id')
-        return [('id', 'child_of', rma_loc.ids)]
+        rma_loc = self.env["stock.warehouse"].search([]).mapped("rma_loc_id")
+        return [("id", "child_of", rma_loc.ids)]
 
     # General fields
     sent = fields.Boolean()
     name = fields.Char(
-        string='Name',
+        string="Name",
         index=True,
         readonly=True,
-        states={'draft': [('readonly', False)]},
+        states={"draft": [("readonly", False)]},
         copy=False,
-        default=lambda self: _('New'),
+        default=lambda self: _("New"),
     )
     origin = fields.Char(
-        string='Source Document',
-        states={
-            'locked': [('readonly', True)],
-            'cancelled': [('readonly', True)],
-        },
+        string="Source Document",
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
         help="Reference of the document that generated this RMA.",
     )
     date = fields.Datetime(
@@ -43,109 +42,95 @@ def _domain_location_id(self):
         index=True,
         required=True,
         readonly=True,
-        states={'draft': [('readonly', False)]},
+        states={"draft": [("readonly", False)]},
     )
     deadline = fields.Date(
-        states={
-            'locked': [('readonly', True)],
-            'cancelled': [('readonly', True)],
-        },
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
     )
     user_id = fields.Many2one(
         comodel_name="res.users",
         string="Responsible",
         track_visibility="always",
-        states={
-            'locked': [('readonly', True)],
-            'cancelled': [('readonly', True)],
-        },
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
     )
     team_id = fields.Many2one(
         comodel_name="rma.team",
         string="RMA team",
         index=True,
-        states={
-            'locked': [('readonly', True)],
-            'cancelled': [('readonly', True)],
-        },
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
     )
     company_id = fields.Many2one(
         comodel_name="res.company",
         default=lambda self: self.env.user.company_id,
-        states={
-            'locked': [('readonly', True)],
-            'cancelled': [('readonly', True)],
-        },
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
     )
     partner_id = fields.Many2one(
         string="Customer",
         comodel_name="res.partner",
         readonly=True,
-        states={'draft': [('readonly', False)]},
+        states={"draft": [("readonly", False)]},
         index=True,
-        track_visibility='always'
+        track_visibility="always",
     )
     partner_invoice_id = fields.Many2one(
         string="Invoice Address",
         comodel_name="res.partner",
         readonly=True,
-        states={'draft': [('readonly', False)]},
-        domain=[('customer', '=', True)],
-        help="Refund address for current RMA."
+        states={"draft": [("readonly", False)]},
+        domain=[("customer", "=", True)],
+        help="Refund address for current RMA.",
     )
     commercial_partner_id = fields.Many2one(
-        comodel_name="res.partner",
-        related="partner_id.commercial_partner_id",
+        comodel_name="res.partner", related="partner_id.commercial_partner_id",
     )
     picking_id = fields.Many2one(
         comodel_name="stock.picking",
         string="Origin Delivery",
         domain="["
-               "    ('state', '=', 'done'),"
-               "    ('picking_type_id.code', '=', 'outgoing'),"
-               "    ('partner_id', 'child_of', commercial_partner_id),"
-               "]",
+        "    ('state', '=', 'done'),"
+        "    ('picking_type_id.code', '=', 'outgoing'),"
+        "    ('partner_id', 'child_of', commercial_partner_id),"
+        "]",
         readonly=True,
-        states={'draft': [('readonly', False)]},
+        states={"draft": [("readonly", False)]},
     )
     move_id = fields.Many2one(
-        comodel_name='stock.move',
-        string='Origin move',
+        comodel_name="stock.move",
+        string="Origin move",
         domain="["
-               "    ('picking_id', '=', picking_id),"
-               "    ('picking_id', '!=', False)"
-               "]",
+        "    ('picking_id', '=', picking_id),"
+        "    ('picking_id', '!=', False)"
+        "]",
         readonly=True,
-        states={'draft': [('readonly', False)]},
+        states={"draft": [("readonly", False)]},
     )
     product_id = fields.Many2one(
-        comodel_name="product.product",
-        domain=[('type', 'in', ['consu', 'product'])],
+        comodel_name="product.product", domain=[("type", "in", ["consu", "product"])],
     )
     product_uom_qty = fields.Float(
         string="Quantity",
         required=True,
         default=1.0,
-        digits=dp.get_precision('Product Unit of Measure'),
+        digits=dp.get_precision("Product Unit of Measure"),
         readonly=True,
-        states={'draft': [('readonly', False)]},
+        states={"draft": [("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,
+        states={"draft": [("readonly", False)]},
+        default=lambda self: self.env.ref("uom.product_uom_unit").id,
     )
     procurement_group_id = fields.Many2one(
-        comodel_name='procurement.group',
-        string='Procurement group',
+        comodel_name="procurement.group",
+        string="Procurement group",
         readonly=True,
         states={
-            'draft': [('readonly', False)],
-            'confirmed': [('readonly', False)],
-            'received': [('readonly', False)],
+            "draft": [("readonly", False)],
+            "confirmed": [("readonly", False)],
+            "received": [("readonly", False)],
         },
     )
     priority = fields.Selection(
@@ -153,11 +138,10 @@ def _domain_location_id(self):
         selection=PROCUREMENT_PRIORITIES,
         default="1",
         readonly=True,
-        states={'draft': [('readonly', False)]},
+        states={"draft": [("readonly", False)]},
     )
     operation_id = fields.Many2one(
-        comodel_name='rma.operation',
-        string='Requested operation',
+        comodel_name="rma.operation", string="Requested operation",
     )
     state = fields.Selection(
         [
@@ -177,120 +161,96 @@ def _domain_location_id(self):
         track_visibility="onchange",
     )
     description = fields.Html(
-        states={
-            'locked': [('readonly', True)],
-            'cancelled': [('readonly', True)],
-        },
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
     )
     # Reception fields
     location_id = fields.Many2one(
-        comodel_name='stock.location',
+        comodel_name="stock.location",
         domain=_domain_location_id,
         readonly=True,
-        states={'draft': [('readonly', False)]},
+        states={"draft": [("readonly", False)]},
     )
     warehouse_id = fields.Many2one(
-        comodel_name='stock.warehouse',
-        compute="_compute_warehouse_id",
-        store=True,
+        comodel_name="stock.warehouse", compute="_compute_warehouse_id", store=True,
     )
     reception_move_id = fields.Many2one(
-        comodel_name='stock.move',
-        string='Reception move',
-        copy=False,
+        comodel_name="stock.move", string="Reception move", copy=False,
     )
     # Refund fields
     refund_id = fields.Many2one(
-        comodel_name='account.invoice',
-        string='Refund',
-        readonly=True,
-        copy=False,
+        comodel_name="account.invoice", string="Refund", readonly=True, copy=False,
     )
     refund_line_id = fields.Many2one(
-        comodel_name='account.invoice.line',
-        string='Refund line',
+        comodel_name="account.invoice.line",
+        string="Refund line",
         readonly=True,
         copy=False,
     )
-    can_be_refunded = fields.Boolean(
-        compute="_compute_can_be_refunded"
-    )
+    can_be_refunded = fields.Boolean(compute="_compute_can_be_refunded")
     # Delivery fields
     delivery_move_ids = fields.One2many(
-        comodel_name='stock.move',
-        inverse_name='rma_id',
-        string='Delivery reservation',
+        comodel_name="stock.move",
+        inverse_name="rma_id",
+        string="Delivery reservation",
         readonly=True,
         copy=False,
     )
     delivery_picking_count = fields.Integer(
-        string='Delivery count',
-        compute='_compute_delivery_picking_count',
+        string="Delivery count", compute="_compute_delivery_picking_count",
     )
     delivered_qty = fields.Float(
         string="Delivered qty",
-        digits=dp.get_precision('Product Unit of Measure'),
-        compute='_compute_delivered_qty',
+        digits=dp.get_precision("Product Unit of Measure"),
+        compute="_compute_delivered_qty",
         store=True,
     )
     delivered_qty_done = fields.Float(
         string="Delivered qty done",
-        digits=dp.get_precision('Product Unit of Measure'),
-        compute='_compute_delivered_qty',
-    )
-    can_be_returned = fields.Boolean(
-        compute="_compute_can_be_returned",
-    )
-    can_be_replaced = fields.Boolean(
-        compute="_compute_can_be_replaced",
-    )
-    can_be_locked = fields.Boolean(
-        compute="_compute_can_be_locked",
+        digits=dp.get_precision("Product Unit of Measure"),
+        compute="_compute_delivered_qty",
     )
+    can_be_returned = fields.Boolean(compute="_compute_can_be_returned",)
+    can_be_replaced = fields.Boolean(compute="_compute_can_be_replaced",)
+    can_be_locked = fields.Boolean(compute="_compute_can_be_locked",)
     remaining_qty = fields.Float(
         string="Remaining delivered qty",
-        digits=dp.get_precision('Product Unit of Measure'),
-        compute='_compute_remaining_qty',
+        digits=dp.get_precision("Product Unit of Measure"),
+        compute="_compute_remaining_qty",
     )
     remaining_qty_to_done = fields.Float(
         string="Remaining delivered qty to done",
-        digits=dp.get_precision('Product Unit of Measure'),
-        compute='_compute_remaining_qty',
+        digits=dp.get_precision("Product Unit of Measure"),
+        compute="_compute_remaining_qty",
     )
     # Split fields
-    can_be_split = fields.Boolean(
-        compute="_compute_can_be_split",
-    )
+    can_be_split = fields.Boolean(compute="_compute_can_be_split",)
     origin_split_rma_id = fields.Many2one(
-        comodel_name='rma',
-        string='Extracted from',
-        readonly=True,
-        copy=False,
+        comodel_name="rma", string="Extracted from", readonly=True, copy=False,
     )
 
     def _compute_delivery_picking_count(self):
         # It is enough to count the moves to know how many pickings
         # there are because there will be a unique move linked to the
         # same picking and the same rma.
-        rma_data = self.env['stock.move'].read_group(
-            [('rma_id', 'in', self.ids)],
-            ['rma_id', 'picking_id'],
-            ['rma_id', 'picking_id'],
+        rma_data = self.env["stock.move"].read_group(
+            [("rma_id", "in", self.ids)],
+            ["rma_id", "picking_id"],
+            ["rma_id", "picking_id"],
             lazy=False,
         )
-        mapped_data = Counter(map(lambda r: r['rma_id'][0], rma_data))
+        mapped_data = Counter(map(lambda r: r["rma_id"][0], rma_data))
         for record in self:
             record.delivery_picking_count = mapped_data.get(record.id, 0)
 
     @api.depends(
-        'delivery_move_ids',
-        'delivery_move_ids.state',
-        'delivery_move_ids.scrapped',
-        'delivery_move_ids.product_uom_qty',
-        'delivery_move_ids.reserved_availability',
-        'delivery_move_ids.quantity_done',
-        'delivery_move_ids.product_uom',
-        'product_uom',
+        "delivery_move_ids",
+        "delivery_move_ids.state",
+        "delivery_move_ids.scrapped",
+        "delivery_move_ids.product_uom_qty",
+        "delivery_move_ids.reserved_availability",
+        "delivery_move_ids.quantity_done",
+        "delivery_move_ids.product_uom",
+        "product_uom",
     )
     def _compute_delivered_qty(self):
         """ Compute 'delivered_qty' and 'delivered_qty_done' fields.
@@ -309,23 +269,27 @@ def _compute_delivered_qty(self):
             delivered_qty = 0.0
             delivered_qty_done = 0.0
             for move in record.delivery_move_ids.filtered(
-                    lambda r: r.state != 'cancel' and not r.scrapped):
+                lambda r: r.state != "cancel" and not r.scrapped
+            ):
                 if move.quantity_done:
                     quantity_done = move.product_uom._compute_quantity(
-                        move.quantity_done, record.product_uom)
-                    if move.state == 'done':
+                        move.quantity_done, record.product_uom
+                    )
+                    if move.state == "done":
                         delivered_qty_done += quantity_done
                     delivered_qty += quantity_done
                 elif move.reserved_availability:
                     delivered_qty += move.product_uom._compute_quantity(
-                        move.reserved_availability, record.product_uom)
+                        move.reserved_availability, record.product_uom
+                    )
                 elif move.product_uom_qty:
                     delivered_qty += move.product_uom._compute_quantity(
-                        move.product_uom_qty, record.product_uom)
+                        move.product_uom_qty, record.product_uom
+                    )
             record.delivered_qty = delivered_qty
             record.delivered_qty_done = delivered_qty_done
 
-    @api.depends('product_uom_qty', 'delivered_qty', 'delivered_qty_done')
+    @api.depends("product_uom_qty", "delivered_qty", "delivered_qty_done")
     def _compute_remaining_qty(self):
         """ Compute 'remaining_qty' and 'remaining_qty_to_done' fields.
 
@@ -342,18 +306,16 @@ def _compute_remaining_qty(self):
             r.remaining_qty = r.product_uom_qty - r.delivered_qty
             r.remaining_qty_to_done = r.product_uom_qty - r.delivered_qty_done
 
-    @api.depends(
-        'state',
-    )
+    @api.depends("state",)
     def _compute_can_be_refunded(self):
         """ Compute 'can_be_refunded'. This field controls the visibility
         of 'Refund' button in the rma form view and determinates if
         an rma can be refunded. It is used in rma.action_refund method.
         """
         for record in self:
-            record.can_be_refunded = record.state == 'received'
+            record.can_be_refunded = record.state == "received"
 
-    @api.depends('remaining_qty', 'state')
+    @api.depends("remaining_qty", "state")
     def _compute_can_be_returned(self):
         """ Compute 'can_be_returned'. This field controls the visibility
         of the 'Return to customer' button in the rma form
@@ -363,10 +325,11 @@ def _compute_can_be_returned(self):
         rma._ensure_can_be_returned.
         """
         for r in self:
-            r.can_be_returned = (r.state in ['received', 'waiting_return']
-                                 and r.remaining_qty > 0)
+            r.can_be_returned = (
+                r.state in ["received", "waiting_return"] and r.remaining_qty > 0
+            )
 
-    @api.depends('state')
+    @api.depends("state")
     def _compute_can_be_replaced(self):
         """ Compute 'can_be_replaced'. This field controls the visibility
         of 'Replace' button in the rma form
@@ -376,11 +339,13 @@ def _compute_can_be_replaced(self):
         rma._ensure_can_be_replaced.
         """
         for r in self:
-            r.can_be_replaced = r.state in ['received', 'waiting_replacement',
-                                            'replaced']
+            r.can_be_replaced = r.state in [
+                "received",
+                "waiting_replacement",
+                "replaced",
+            ]
 
-    @api.depends('product_uom_qty', 'state', 'remaining_qty',
-                 'remaining_qty_to_done')
+    @api.depends("product_uom_qty", "state", "remaining_qty", "remaining_qty_to_done")
     def _compute_can_be_split(self):
         """ Compute 'can_be_split'. This field controls the
         visibility of 'Split' button in the rma form view and
@@ -389,54 +354,63 @@ def _compute_can_be_split(self):
         rma._ensure_can_be_split
         """
         for r in self:
-            if (r.product_uom_qty > 1
-                and ((r.state == 'waiting_return' and r.remaining_qty > 0)
-                     or (r.state == 'waiting_replacement'
-                         and r.remaining_qty_to_done > 0))):
+            if r.product_uom_qty > 1 and (
+                (r.state == "waiting_return" and r.remaining_qty > 0)
+                or (r.state == "waiting_replacement" and r.remaining_qty_to_done > 0)
+            ):
                 r.can_be_split = True
             else:
                 r.can_be_split = False
 
-    @api.depends('remaining_qty_to_done', 'state')
+    @api.depends("remaining_qty_to_done", "state")
     def _compute_can_be_locked(self):
         for r in self:
-            r.can_be_locked = (r.remaining_qty_to_done > 0
-                               and r.state in ['received',
-                                               'waiting_return',
-                                               'waiting_replacement'])
+            r.can_be_locked = r.remaining_qty_to_done > 0 and r.state in [
+                "received",
+                "waiting_return",
+                "waiting_replacement",
+            ]
 
-    @api.depends('location_id')
+    @api.depends("location_id")
     def _compute_warehouse_id(self):
-        for record in self.filtered('location_id'):
-            record.warehouse_id = self.env['stock.warehouse'].search(
-                [('rma_loc_id', 'parent_of', record.location_id.id)], limit=1)
+        for record in self.filtered("location_id"):
+            record.warehouse_id = self.env["stock.warehouse"].search(
+                [("rma_loc_id", "parent_of", record.location_id.id)], limit=1
+            )
 
     def _compute_access_url(self):
         for record in self:
-            record.access_url = '/my/rmas/{}'.format(record.id)
+            record.access_url = "/my/rmas/{}".format(record.id)
 
     # Constrains methods (@api.constrains)
-    @api.constrains('state', 'partner_id', 'partner_invoice_id', 'product_id')
+    @api.constrains("state", "partner_id", "partner_invoice_id", "product_id")
     def _check_required_after_draft(self):
         """ Check that RMAs are being created or edited with the
         necessary fields filled out. Only applies to 'Draft' and
         'Cancelled' states.
         """
-        rma = self.filtered(lambda r: r.state not in ['draft', 'cancelled'])
+        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)
+            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
 
@@ -445,8 +419,8 @@ def _onchange_partner_id(self):
         self.picking_id = False
         partner_invoice_id = False
         if self.partner_id:
-            address = self.partner_id.address_get(['invoice'])
-            partner_invoice_id = address.get('invoice', False)
+            address = self.partner_id.address_get(["invoice"])
+            partner_invoice_id = address.get("invoice", False)
         self.partner_invoice_id = partner_invoice_id
 
     @api.onchange("picking_id")
@@ -472,31 +446,32 @@ def _onchange_product_id(self):
         if self.product_id:
             # Set UoM and UoM domain (product_uom)
             domain_product_uom = [
-                ('category_id', '=', self.product_id.uom_id.category_id.id)
+                ("category_id", "=", self.product_id.uom_id.category_id.id)
             ]
-            if (not self.product_uom
-                    or self.product_id.uom_id.id != self.product_uom.id):
+            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 (
+                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.user.company_id
-                warehouse = self.env['stock.warehouse'].search(
-                    [('company_id', '=', company.id)], limit=1)
+                warehouse = self.env["stock.warehouse"].search(
+                    [("company_id", "=", company.id)], limit=1
+                )
                 self.location_id = warehouse.rma_loc_id.id
-        return {'domain': {'product_uom': domain_product_uom}}
+        return {"domain": {"product_uom": domain_product_uom}}
 
     # CRUD methods (ORM overrides)
     @api.model
     def create(self, vals):
-        if vals.get('name', _('New')) == _('New'):
-            ir_sequence = self.env['ir.sequence']
-            if 'company_id' in vals:
-                ir_sequence = ir_sequence.with_context(
-                    force_company=vals['company_id'])
-            vals['name'] = ir_sequence.next_by_code('rma')
+        if vals.get("name", _("New")) == _("New"):
+            ir_sequence = self.env["ir.sequence"]
+            if "company_id" in vals:
+                ir_sequence = ir_sequence.with_context(force_company=vals["company_id"])
+            vals["name"] = ir_sequence.next_by_code("rma")
         # Assign a default team_id which will be the first in the sequence
         if "team_id" not in vals:
             vals["team_id"] = self.env["rma.team"].search([], limit=1).id
@@ -506,55 +481,57 @@ def create(self, vals):
     def copy(self, default=None):
         team = super().copy(default)
         for follower in self.message_follower_ids:
-            team.message_subscribe(partner_ids=follower.partner_id.ids,
-                                   subtype_ids=follower.subtype_ids.ids)
+            team.message_subscribe(
+                partner_ids=follower.partner_id.ids,
+                subtype_ids=follower.subtype_ids.ids,
+            )
         return team
 
     def unlink(self):
-        if self.filtered(lambda r: r.state != 'draft'):
+        if self.filtered(lambda r: r.state != "draft"):
             raise ValidationError(
-                _("You cannot delete RMAs that are not in draft state"))
+                _("You cannot delete RMAs that are not in draft state")
+            )
         return super().unlink()
 
     # Action methods
     def action_rma_send(self):
         self.ensure_one()
-        template = self.env.ref('rma.mail_template_rma_notification', False)
-        form = self.env.ref('mail.email_compose_message_wizard_form', False)
+        template = self.env.ref("rma.mail_template_rma_notification", False)
+        form = self.env.ref("mail.email_compose_message_wizard_form", False)
         ctx = {
-            'default_model': 'rma',
-            'default_res_id': self.ids[0],
-            'default_use_template': bool(template),
-            'default_template_id': template and template.id or False,
-            'default_composition_mode': 'comment',
-            'mark_rma_as_sent': True,
-            'model_description': 'RMA',
-            'force_email': True
+            "default_model": "rma",
+            "default_res_id": self.ids[0],
+            "default_use_template": bool(template),
+            "default_template_id": template and template.id or False,
+            "default_composition_mode": "comment",
+            "mark_rma_as_sent": True,
+            "model_description": "RMA",
+            "force_email": True,
         }
         return {
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'mail.compose.message',
-            'views': [(form.id, 'form')],
-            'view_id': form.id,
-            'target': 'new',
-            'context': ctx,
+            "type": "ir.actions.act_window",
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "mail.compose.message",
+            "views": [(form.id, "form")],
+            "view_id": form.id,
+            "target": "new",
+            "context": ctx,
         }
 
     def action_confirm(self):
         """Invoked when 'Confirm' button in rma form view is clicked."""
         self.ensure_one()
         self._ensure_required_fields()
-        if self.state == 'draft':
+        if self.state == "draft":
             if self.picking_id:
                 reception_move = self._create_receptions_from_picking()
             else:
                 reception_move = self._create_receptions_from_product()
-            self.write({
-                'reception_move_id': reception_move.id,
-                'state': 'confirmed',
-            })
+            self.write(
+                {"reception_move_id": reception_move.id, "state": "confirmed",}
+            )
             if self.partner_id not in self.message_partner_ids:
                 self.message_subscribe([self.partner_id.id])
 
@@ -565,14 +542,16 @@ def action_refund(self):
         group_dict = {}
         for record in self.filtered("can_be_refunded"):
             key = (record.partner_invoice_id.id, record.company_id.id)
-            group_dict.setdefault(key, self.env['rma'])
+            group_dict.setdefault(key, self.env["rma"])
             group_dict[key] |= record
         for rmas in group_dict.values():
-            origin = ', '.join(rmas.mapped('name'))
-            invoice_form = Form(self.env['account.invoice'].with_context(
-                default_type='out_refund',
-                company_id=rmas[0].company_id.id,
-            ), "account.invoice_form")
+            origin = ", ".join(rmas.mapped("name"))
+            invoice_form = Form(
+                self.env["account.invoice"].with_context(
+                    default_type="out_refund", company_id=rmas[0].company_id.id,
+                ),
+                "account.invoice_form",
+            )
             rmas[0]._prepare_refund(invoice_form, origin)
             refund = invoice_form.save()
             for rma in rmas:
@@ -583,18 +562,20 @@ def action_refund(self):
                 # create method instead of save the form. We also need
                 # the new refund line id to be linked to the rma.
                 refund_vals = invoice_form._values_to_save(all_fields=True)
-                line_vals = refund_vals['invoice_line_ids'][-1][2]
+                line_vals = refund_vals["invoice_line_ids"][-1][2]
                 line_vals.update(invoice_id=refund.id, rma_id=rma.id)
-                line = self.env['account.invoice.line'].create(line_vals)
-                rma.write({
-                    'refund_line_id': line.id,
-                    'refund_id': refund.id,
-                    'state': 'refunded',
-                })
+                line = self.env["account.invoice.line"].create(line_vals)
+                rma.write(
+                    {
+                        "refund_line_id": line.id,
+                        "refund_id": refund.id,
+                        "state": "refunded",
+                    }
+                )
             refund.message_post_with_view(
-                'mail.message_origin_link',
-                values={'self': refund, 'origin': rmas},
-                subtype_id=self.env.ref('mail.mt_note').id,
+                "mail.message_origin_link",
+                values={"self": refund, "origin": rmas},
+                subtype_id=self.env.ref("mail.mt_note").id,
             )
 
     def action_replace(self):
@@ -603,14 +584,15 @@ def action_replace(self):
         self._ensure_can_be_replaced()
         # Force active_id to avoid issues when coming from smart buttons
         # in other models
-        action = self.env.ref("rma.rma_delivery_wizard_action").with_context(
-            active_id=self.id).read()[0]
-        action['name'] = 'Replace product(s)'
-        action['context'] = dict(self.env.context)
-        action['context'].update(
-            active_id=self.id,
-            active_ids=self.ids,
-            rma_delivery_type='replace',
+        action = (
+            self.env.ref("rma.rma_delivery_wizard_action")
+            .with_context(active_id=self.id)
+            .read()[0]
+        )
+        action["name"] = "Replace product(s)"
+        action["context"] = dict(self.env.context)
+        action["context"].update(
+            active_id=self.id, active_ids=self.ids, rma_delivery_type="replace",
         )
         return action
 
@@ -622,13 +604,14 @@ def action_return(self):
         self._ensure_can_be_returned()
         # Force active_id to avoid issues when coming from smart buttons
         # in other models
-        action = self.env.ref("rma.rma_delivery_wizard_action").with_context(
-            active_id=self.id).read()[0]
-        action['context'] = dict(self.env.context)
-        action['context'].update(
-            active_id=self.id,
-            active_ids=self.ids,
-            rma_delivery_type='return',
+        action = (
+            self.env.ref("rma.rma_delivery_wizard_action")
+            .with_context(active_id=self.id)
+            .read()[0]
+        )
+        action["context"] = dict(self.env.context)
+        action["context"].update(
+            active_id=self.id, active_ids=self.ids, rma_delivery_type="return",
         )
         return action
 
@@ -638,37 +621,40 @@ def action_split(self):
         self._ensure_can_be_split()
         # Force active_id to avoid issues when coming from smart buttons
         # in other models
-        action = self.env.ref("rma.rma_split_wizard_action").with_context(
-            active_id=self.id).read()[0]
-        action['context'] = dict(self.env.context)
-        action['context'].update(active_id=self.id, active_ids=self.ids)
+        action = (
+            self.env.ref("rma.rma_split_wizard_action")
+            .with_context(active_id=self.id)
+            .read()[0]
+        )
+        action["context"] = dict(self.env.context)
+        action["context"].update(active_id=self.id, active_ids=self.ids)
         return action
 
     def action_cancel(self):
         """Invoked when 'Cancel' button in rma form view is clicked."""
-        self.mapped('reception_move_id')._action_cancel()
-        self.write({'state': 'cancelled'})
+        self.mapped("reception_move_id")._action_cancel()
+        self.write({"state": "cancelled"})
 
     def action_draft(self):
-        cancelled_rma = self.filtered(lambda r: r.state == 'cancelled')
-        cancelled_rma.write({'state': 'draft'})
+        cancelled_rma = self.filtered(lambda r: r.state == "cancelled")
+        cancelled_rma.write({"state": "draft"})
 
     def action_lock(self):
         """Invoked when 'Lock' button in rma form view is clicked."""
-        self.filtered("can_be_locked").write({'state': 'locked'})
+        self.filtered("can_be_locked").write({"state": "locked"})
 
     def action_unlock(self):
         """Invoked when 'Unlock' button in rma form view is clicked."""
-        locked_rma = self.filtered(lambda r: r.state == 'locked')
-        locked_rma.write({'state': 'received'})
+        locked_rma = self.filtered(lambda r: r.state == "locked")
+        locked_rma.write({"state": "received"})
 
     def action_preview(self):
         """Invoked when 'Preview' button in rma form view is clicked."""
         self.ensure_one()
         return {
-            'type': 'ir.actions.act_url',
-            'target': 'self',
-            'url': self.get_portal_url(),
+            "type": "ir.actions.act_url",
+            "target": "self",
+            "url": self.get_portal_url(),
         }
 
     def action_view_receipt(self):
@@ -676,8 +662,11 @@ def action_view_receipt(self):
         self.ensure_one()
         # Force active_id to avoid issues when coming from smart buttons
         # in other models
-        action = self.env.ref('stock.action_picking_tree_all').with_context(
-            active_id=self.id).read()[0]
+        action = (
+            self.env.ref("stock.action_picking_tree_all")
+            .with_context(active_id=self.id)
+            .read()[0]
+        )
         action.update(
             res_id=self.reception_move_id.picking_id.id,
             view_mode="form",
@@ -690,28 +679,28 @@ def action_view_refund(self):
         """Invoked when 'Refund' smart button in rma form view is clicked."""
         self.ensure_one()
         return {
-            'name': _('Refund'),
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'account.invoice',
-            'views': [(self.env.ref('account.invoice_form').id, 'form')],
-            'res_id': self.refund_id.id,
+            "name": _("Refund"),
+            "type": "ir.actions.act_window",
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "account.invoice",
+            "views": [(self.env.ref("account.invoice_form").id, "form")],
+            "res_id": self.refund_id.id,
         }
 
     def action_view_delivery(self):
         """Invoked when 'Delivery' smart button in rma form view is clicked."""
-        action = self.env.ref('stock.action_picking_tree_all').with_context(
-            active_id=self.id).read()[0]
-        picking = self.delivery_move_ids.mapped('picking_id')
+        action = (
+            self.env.ref("stock.action_picking_tree_all")
+            .with_context(active_id=self.id)
+            .read()[0]
+        )
+        picking = self.delivery_move_ids.mapped("picking_id")
         if len(picking) > 1:
-            action['domain'] = [('id', 'in', picking.ids)]
+            action["domain"] = [("id", "in", picking.ids)]
         elif picking:
             action.update(
-                res_id=picking.id,
-                view_mode="form",
-                view_id=False,
-                views=False,
+                res_id=picking.id, view_mode="form", view_id=False, views=False,
             )
         return action
 
@@ -725,15 +714,14 @@ def _ensure_required_fields(self):
         rma._check_required_after_draft
         rma.action_confirm
         """
-        ir_translation = self.env['ir.translation']
-        required = ['partner_id', 'partner_invoice_id', 'product_id',
-                    'location_id']
+        ir_translation = self.env["ir.translation"]
+        required = ["partner_id", "partner_invoice_id", "product_id", "location_id"]
         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]
             if desc:
-                raise ValidationError(_('Required field(s):%s') % desc)
+                raise ValidationError(_("Required field(s):%s") % desc)
 
     def _ensure_can_be_returned(self):
         """ This method is intended to be invoked after user click on
@@ -748,11 +736,9 @@ def _ensure_can_be_returned(self):
         """
         if len(self) == 1:
             if not self.can_be_returned:
-                raise ValidationError(
-                    _("This RMA cannot perform a return."))
+                raise ValidationError(_("This RMA cannot perform a return."))
         elif not self.filtered("can_be_returned"):
-            raise ValidationError(
-                _("None of the selected RMAs can perform a return."))
+            raise ValidationError(_("None of the selected RMAs can perform a return."))
 
     def _ensure_can_be_replaced(self):
         """ This method is intended to be invoked after user click on
@@ -765,11 +751,11 @@ def _ensure_can_be_replaced(self):
         """
         if len(self) == 1:
             if not self.can_be_replaced:
-                raise ValidationError(
-                    _("This RMA cannot perform a replacement."))
+                raise ValidationError(_("This RMA cannot perform a replacement."))
         elif not self.filtered("can_be_replaced"):
             raise ValidationError(
-                _("None of the selected RMAs can perform a replacement."))
+                _("None of the selected RMAs can perform a replacement.")
+            )
 
     def _ensure_can_be_split(self):
         """intended to be called before launch and after save the split wizard.
@@ -790,8 +776,8 @@ def _ensure_qty_to_return(self, qty=None, uom=None):
                 qty = uom._compute_quantity(qty, self.product_uom)
             if qty > self.remaining_qty:
                 raise ValidationError(
-                    _("The quantity to return is greater than "
-                      "remaining quantity."))
+                    _("The quantity to return is greater than " "remaining quantity.")
+                )
 
     def _ensure_qty_to_extract(self, qty, uom):
         """ This method is intended to be invoked after confirm the wizard.
@@ -802,8 +788,10 @@ def _ensure_qty_to_extract(self, qty, uom):
             to_split_uom_qty = uom._compute_quantity(qty, self.product_uom)
         if to_split_uom_qty > self.remaining_qty:
             raise ValidationError(
-                _("Quantity to extract cannot be greater than remaining "
-                  "delivery quantity (%s %s)")
+                _(
+                    "Quantity to extract cannot be greater than remaining "
+                    "delivery quantity (%s %s)"
+                )
                 % (self.remaining_qty, self.product_uom.name)
             )
 
@@ -812,11 +800,12 @@ def _create_receptions_from_picking(self):
         self.ensure_one()
         create_vals = {}
         if self.location_id:
-            create_vals['location_id'] = self.location_id.id
-        return_wizard = self.env['stock.return.picking'].with_context(
-            active_id=self.picking_id.id,
-            active_ids=self.picking_id.ids,
-        ).create(create_vals)
+            create_vals["location_id"] = self.location_id.id
+        return_wizard = (
+            self.env["stock.return.picking"]
+            .with_context(active_id=self.picking_id.id, active_ids=self.picking_id.ids,)
+            .create(create_vals)
+        )
         return_wizard.product_return_moves.filtered(
             lambda r: r.move_id != self.move_id
         ).unlink()
@@ -825,10 +814,11 @@ def _create_receptions_from_picking(self):
         # set_rma_picking_type is to override the copy() method of stock
         # picking and change the default picking type to rma picking type.
         picking_action = return_wizard.with_context(
-            set_rma_picking_type=True).create_returns()
-        picking_id = picking_action['res_id']
-        picking = self.env['stock.picking'].browse(picking_id)
-        picking.origin = "%s (%s)" % (self.name, picking.origin)
+            set_rma_picking_type=True
+        ).create_returns()
+        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.priority = self.priority
         return move
@@ -836,8 +826,9 @@ def _create_receptions_from_picking(self):
     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),
+            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)
@@ -845,9 +836,9 @@ def _create_receptions_from_product(self):
         picking.action_confirm()
         picking.action_assign()
         picking.message_post_with_view(
-            'mail.message_origin_link',
-            values={'self': picking, 'origin': self},
-            subtype_id=self.env.ref('mail.mt_note').id,
+            "mail.message_origin_link",
+            values={"self": picking, "origin": self},
+            subtype_id=self.env.ref("mail.mt_note").id,
         )
         return picking.move_lines
 
@@ -868,31 +859,31 @@ def extract_quantity(self, qty, uom):
         self._ensure_qty_to_extract(qty, uom)
         self.product_uom_qty -= uom._compute_quantity(qty, self.product_uom)
         if self.remaining_qty_to_done <= 0:
-            if self.state == 'waiting_return':
-                self.state = 'returned'
-            elif self.state == 'waiting_replacement':
-                self.state = 'replaced'
-        extracted_rma = self.copy({
-            'origin': self.name,
-            'product_uom_qty': qty,
-            'product_uom': uom.id,
-            'state': 'received',
-            'reception_move_id': self.reception_move_id.id,
-            'origin_split_rma_id': self.id,
-        })
+            if self.state == "waiting_return":
+                self.state = "returned"
+            elif self.state == "waiting_replacement":
+                self.state = "replaced"
+        extracted_rma = self.copy(
+            {
+                "origin": self.name,
+                "product_uom_qty": qty,
+                "product_uom": uom.id,
+                "state": "received",
+                "reception_move_id": self.reception_move_id.id,
+                "origin_split_rma_id": self.id,
+            }
+        )
         extracted_rma.message_post_with_view(
-            'mail.message_origin_link',
-            values={'self': extracted_rma, 'origin': self},
-            subtype_id=self.env.ref('mail.mt_note').id,
+            "mail.message_origin_link",
+            values={"self": extracted_rma, "origin": self},
+            subtype_id=self.env.ref("mail.mt_note").id,
         )
         self.message_post(
             body=_(
                 'Split: <a href="#" data-oe-model="rma" '
                 'data-oe-id="%d">%s</a> has been created.'
-            ) % (
-                extracted_rma.id,
-                extracted_rma.name,
             )
+            % (extracted_rma.id, extracted_rma.name,)
         )
         return extracted_rma
 
@@ -937,51 +928,51 @@ def create_return(self, scheduled_date, qty=None, uom=None):
         self._ensure_can_be_returned()
         self._ensure_qty_to_return(qty, uom)
         group_dict = {}
-        for record in self.filtered('can_be_returned'):
-            key = (record.partner_id.id, record.company_id.id,
-                   record.warehouse_id)
-            group_dict.setdefault(key, self.env['rma'])
+        for record in self.filtered("can_be_returned"):
+            key = (record.partner_id.id, record.company_id.id, record.warehouse_id)
+            group_dict.setdefault(key, self.env["rma"])
             group_dict[key] |= record
         for rmas in group_dict.values():
-            origin = ', '.join(rmas.mapped('name'))
+            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),
+                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()
             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._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 = 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,
                 )
-                self.env['stock.move'].sudo().create(move_vals)
+                self.env["stock.move"].sudo().create(move_vals)
                 rma.message_post(
                     body=_(
                         'Return: <a href="#" data-oe-model="stock.picking" '
                         'data-oe-id="%d">%s</a> has been created.'
-                    ) % (picking.id, picking.name)
+                    )
+                    % (picking.id, picking.name)
                 )
             picking.action_confirm()
             picking.action_assign()
             picking.message_post_with_view(
-                'mail.message_origin_link',
-                values={'self': picking, 'origin': rmas},
-                subtype_id=self.env.ref('mail.mt_note').id,
+                "mail.message_origin_link",
+                values={"self": picking, "origin": rmas},
+                subtype_id=self.env.ref("mail.mt_note").id,
             )
-        self.write({'state': 'waiting_return'})
+        self.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
@@ -989,8 +980,9 @@ def _prepare_returning_picking(self, picking_form, origin=None):
         picking_form.origin = origin or self.name
         picking_form.partner_id = self.partner_id
 
-    def _prepare_returning_move(self, move_form, scheduled_date,
-                                quantity=None, uom=None):
+    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
@@ -1002,58 +994,65 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
         self.ensure_one()
         self._ensure_can_be_replaced()
         moves_before = self.delivery_move_ids
-        self._action_launch_stock_rule(scheduled_date, warehouse, product,
-                                       qty, uom)
+        self._action_launch_stock_rule(scheduled_date, warehouse, product, qty, uom)
         new_move = self.delivery_move_ids - moves_before
         if new_move:
             self.reception_move_id.move_dest_ids = [(4, new_move.id)]
             self.message_post(
                 body=_(
-                    'Replacement: '
+                    "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.'
-                ) % (new_move.id, new_move.name_get()[0][1],
-                     new_move.picking_id.id, new_move.picking_id.name)
+                    "has been created."
+                )
+                % (
+                    new_move.id,
+                    new_move.name_get()[0][1],
+                    new_move.picking_id.id,
+                    new_move.picking_id.name,
+                )
             )
         else:
             self.message_post(
                 body=_(
-                    'Replacement:<br/>'
+                    "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.'
-                ) % (product.id, product.display_name, qty, uom.name)
+                    "Quantity %f %s<br/>"
+                    "This replacement did not create a new move, but one of "
+                    "the previously created moves was updated with this data."
+                )
+                % (product.id, product.display_name, qty, uom.name)
             )
-        if self.state != 'waiting_replacement':
-            self.state = 'waiting_replacement'
+        if self.state != "waiting_replacement":
+            self.state = "waiting_replacement"
 
     def _action_launch_stock_rule(
-        self,
-        scheduled_date,
-        warehouse,
-        product,
-        qty,
-        uom,
+        self, scheduled_date, warehouse, product, qty, uom,
     ):
         """ Creates a delivery picking and launch stock rule. It is invoked by:
         rma.create_replace
         """
         self.ensure_one()
-        if self.product_id.type not in ('consu', 'product'):
+        if self.product_id.type not in ("consu", "product"):
             return
         if not self.procurement_group_id:
-            self.procurement_group_id = self.env['procurement.group'].create({
-                'name': self.name,
-                'move_type': 'direct',
-                'partner_id': self.partner_id.id,
-            }).id
+            self.procurement_group_id = (
+                self.env["procurement.group"]
+                .create(
+                    {
+                        "name": self.name,
+                        "move_type": "direct",
+                        "partner_id": self.partner_id.id,
+                    }
+                )
+                .id
+            )
         values = self._prepare_procurement_values(
-            self.procurement_group_id, scheduled_date, warehouse)
-        self.env['procurement.group'].run(
+            self.procurement_group_id, scheduled_date, warehouse
+        )
+        self.env["procurement.group"].run(
             product,
             qty,
             uom,
@@ -1064,27 +1063,24 @@ def _action_launch_stock_rule(
         )
 
     def _prepare_procurement_values(
-        self,
-        group_id,
-        scheduled_date,
-        warehouse,
+        self, group_id, scheduled_date, warehouse,
     ):
         self.ensure_one()
         return {
-            'company_id': self.company_id,
-            'group_id': group_id,
-            'date_planned': scheduled_date,
-            'warehouse_id': warehouse,
-            'partner_id': self.partner_id.id,
-            'rma_id': self.id,
-            'priority': self.priority,
+            "company_id": self.company_id,
+            "group_id": group_id,
+            "date_planned": scheduled_date,
+            "warehouse_id": warehouse,
+            "partner_id": self.partner_id.id,
+            "rma_id": self.id,
+            "priority": self.priority,
         }
 
     # Mail business methods
     def _track_subtype(self, init_values):
         self.ensure_one()
-        if 'state' in init_values and self.state == 'draft':
-            return 'rma.mt_rma_draft'
+        if "state" in init_values and self.state == "draft":
+            return "rma.mt_rma_draft"
         return super()._track_subtype(init_values)
 
     def message_new(self, msg_dict, custom_values=None):
@@ -1093,38 +1089,38 @@ def message_new(self, msg_dict, custom_values=None):
         """
         if custom_values is None:
             custom_values = {}
-        subject = msg_dict.get('subject', '')
-        body = html2plaintext(msg_dict.get('body', ''))
+        subject = msg_dict.get("subject", "")
+        body = html2plaintext(msg_dict.get("body", ""))
         desc = _("E-mail subject: %s\n\nE-mail body:\n%s") % (subject, body)
         defaults = {
-            'description': desc,
-            'name': _('New'),
-            'origin': _('Incoming e-mail'),
+            "description": desc,
+            "name": _("New"),
+            "origin": _("Incoming e-mail"),
         }
-        if msg_dict.get('author_id'):
-            partner = self.env['res.partner'].browse(msg_dict.get('author_id'))
+        if msg_dict.get("author_id"):
+            partner = self.env["res.partner"].browse(msg_dict.get("author_id"))
             defaults.update(
                 partner_id=partner.id,
-                partner_invoice_id=partner.address_get(
-                    ['invoice']).get('invoice', False),
+                partner_invoice_id=partner.address_get(["invoice"]).get(
+                    "invoice", False
+                ),
             )
         if msg_dict.get("priority"):
             defaults["priority"] = msg_dict.get("priority")
         defaults.update(custom_values)
         rma = super().message_new(msg_dict, custom_values=defaults)
-        if (rma.user_id
-                and rma.user_id.partner_id not in rma.message_partner_ids):
+        if rma.user_id and rma.user_id.partner_id not in rma.message_partner_ids:
             rma.message_subscribe([rma.user_id.partner_id.id])
         return rma
 
-    @api.returns('mail.message', lambda value: value.id)
+    @api.returns("mail.message", lambda value: value.id)
     def message_post(self, **kwargs):
         """ Set 'sent' field to True when an email is sent from rma form
         view. This field (sent) is used to set the appropriate style to the
         'Send by Email' button in the rma form view.
         """
-        if self.env.context.get('mark_rma_as_sent'):
-            self.write({'sent': True})
+        if self.env.context.get("mark_rma_as_sent"):
+            self.write({"sent": True})
         # mail_post_autofollow=True to include email recipient contacts as
         # RMA followers
         self_with_context = self.with_context(mail_post_autofollow=True)
@@ -1133,7 +1129,7 @@ def message_post(self, **kwargs):
     # Reporting business methods
     def _get_report_base_filename(self):
         self.ensure_one()
-        return 'RMA Report - %s' % self.name
+        return "RMA Report - %s" % self.name
 
     # Other business methods
     def update_received_state(self):
@@ -1143,7 +1139,7 @@ def update_received_state(self):
          """
         rma = self.filtered(lambda r: r.delivered_qty == 0)
         if rma:
-            rma.write({'state': 'received'})
+            rma.write({"state": "received"})
 
     def update_replaced_state(self):
         """ Invoked by:
@@ -1152,15 +1148,18 @@ def update_replaced_state(self):
          [stock.move]._action_cancel
          """
         rma = self.filtered(
-            lambda r: (r.state == 'waiting_replacement'
-                       and 0 >= r.remaining_qty_to_done == r.remaining_qty))
+            lambda r: (
+                r.state == "waiting_replacement"
+                and 0 >= r.remaining_qty_to_done == r.remaining_qty
+            )
+        )
         if rma:
-            rma.write({'state': 'replaced'})
+            rma.write({"state": "replaced"})
 
     def update_returned_state(self):
         """ Invoked by [stock.move]._action_done"""
         rma = self.filtered(
-            lambda r: (r.state == 'waiting_return'
-                       and r.remaining_qty_to_done <= 0))
+            lambda r: (r.state == "waiting_return" and r.remaining_qty_to_done <= 0)
+        )
         if rma:
-            rma.write({'state': 'returned'})
+            rma.write({"state": "returned"})
diff --git a/rma/models/rma_operation.py b/rma/models/rma_operation.py
index 85271aebf..616dc55e0 100644
--- a/rma/models/rma_operation.py
+++ b/rma/models/rma_operation.py
@@ -11,5 +11,5 @@ class RmaOperation(models.Model):
     name = fields.Char(required=True, translate=True)
 
     _sql_constraints = [
-        ('name_uniq', 'unique (name)', "That operation name already exists !"),
+        ("name_uniq", "unique (name)", "That operation name already exists !"),
     ]
diff --git a/rma/models/rma_team.py b/rma/models/rma_team.py
index 9a771705f..11faca129 100644
--- a/rma/models/rma_team.py
+++ b/rma/models/rma_team.py
@@ -6,19 +6,16 @@
 
 class RmaTeam(models.Model):
     _name = "rma.team"
-    _inherit = ['mail.alias.mixin', 'mail.thread']
+    _inherit = ["mail.alias.mixin", "mail.thread"]
     _description = "RMA Team"
     _order = "sequence, name"
 
     sequence = fields.Integer()
-    name = fields.Char(
-        required=True,
-        translate=True,
-    )
+    name = fields.Char(required=True, translate=True,)
     active = fields.Boolean(
         default=True,
         help="If the active field is set to false, it will allow you "
-             "to hide the RMA Team without removing it.",
+        "to hide the RMA Team without removing it.",
     )
     company_id = fields.Many2one(
         comodel_name="res.company",
@@ -28,13 +25,11 @@ class RmaTeam(models.Model):
     user_id = fields.Many2one(
         comodel_name="res.users",
         string="Team Leader",
-        domain=[('share', '=', False)],
+        domain=[("share", "=", False)],
         default=lambda self: self.env.user,
     )
     member_ids = fields.One2many(
-        comodel_name='res.users',
-        inverse_name='rma_team_id',
-        string='Team Members',
+        comodel_name="res.users", inverse_name="rma_team_id", string="Team Members",
     )
 
     @api.multi
@@ -42,18 +37,20 @@ def copy(self, default=None):
         self.ensure_one()
         if default is None:
             default = {}
-        if not default.get('name'):
-            default['name'] = _("%s (copy)") % self.name
+        if not default.get("name"):
+            default["name"] = _("%s (copy)") % self.name
         team = super().copy(default)
         for follower in self.message_follower_ids:
-            team.message_subscribe(partner_ids=follower.partner_id.ids,
-                                   subtype_ids=follower.subtype_ids.ids)
+            team.message_subscribe(
+                partner_ids=follower.partner_id.ids,
+                subtype_ids=follower.subtype_ids.ids,
+            )
         return team
 
     def get_alias_model_name(self, vals):
-        return vals.get('alias_model', 'rma')
+        return vals.get("alias_model", "rma")
 
     def get_alias_values(self):
         values = super().get_alias_values()
-        values['alias_defaults'] = {'team_id': self.id}
+        values["alias_defaults"] = {"team_id": self.id}
         return values
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index 217d4c6ce..3912b122a 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -10,32 +10,25 @@ class StockMove(models.Model):
 
     # RMAs that were created from the delivery move
     rma_ids = fields.One2many(
-        comodel_name='rma',
-        inverse_name='move_id',
-        string='RMAs',
-        copy=False,
+        comodel_name="rma", inverse_name="move_id", string="RMAs", copy=False,
     )
     # RMAs linked to the incoming movement from client
     rma_receiver_ids = fields.One2many(
-        comodel_name='rma',
-        inverse_name='reception_move_id',
-        string='RMA receivers',
+        comodel_name="rma",
+        inverse_name="reception_move_id",
+        string="RMA receivers",
         copy=False,
     )
     # RMA that create the delivery movement to the customer
-    rma_id = fields.Many2one(
-        comodel_name='rma',
-        string='RMA return',
-        copy=False,
-    )
+    rma_id = fields.Many2one(comodel_name="rma", string="RMA return", copy=False,)
 
     def unlink(self):
         # A stock user could have no RMA permissions, so the ids wouldn't
         # be accessible due to record rules.
-        rma_receiver = self.sudo().mapped('rma_receiver_ids')
-        rma = self.sudo().mapped('rma_id')
+        rma_receiver = self.sudo().mapped("rma_receiver_ids")
+        rma = self.sudo().mapped("rma_id")
         res = super().unlink()
-        rma_receiver.write({'state': 'draft'})
+        rma_receiver.write({"state": "draft"})
         rma.update_received_state()
         rma.update_replaced_state()
         return res
@@ -44,10 +37,10 @@ def _action_cancel(self):
         res = super()._action_cancel()
         # A stock user could have no RMA permissions, so the ids wouldn't
         # be accessible due to record rules.
-        cancelled_moves = self.filtered(lambda r: r.state == 'cancel').sudo()
-        cancelled_moves.mapped('rma_receiver_ids').write({'state': 'draft'})
-        cancelled_moves.mapped('rma_id').update_received_state()
-        cancelled_moves.mapped('rma_id').update_replaced_state()
+        cancelled_moves = self.filtered(lambda r: r.state == "cancel").sudo()
+        cancelled_moves.mapped("rma_receiver_ids").write({"state": "draft"})
+        cancelled_moves.mapped("rma_id").update_received_state()
+        cancelled_moves.mapped("rma_id").update_replaced_state()
         return res
 
     def _action_done(self):
@@ -55,27 +48,30 @@ def _action_done(self):
         quantity in the linked receiver RMA. It also set the appropriated
         linked RMA to 'received' or 'delivered'.
         """
-        for move in self.filtered(
-                lambda r: r.state not in ('done', 'cancel')):
+        for move in self.filtered(lambda r: r.state not in ("done", "cancel")):
             rma_receiver = move.sudo().rma_receiver_ids
-            if (rma_receiver
-                    and move.quantity_done != rma_receiver.product_uom_qty):
+            if rma_receiver and move.quantity_done != rma_receiver.product_uom_qty:
                 raise ValidationError(
-                    _("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 '%s' must "
+                        "be equal to its initial demand because the "
+                        "stock move is linked to an RMA (%s)."
+                    )
                     % (move.product_id.name, move.rma_receiver_ids.name)
                 )
         res = super()._action_done()
-        move_done = self.filtered(lambda r: r.state == 'done').sudo()
+        move_done = self.filtered(lambda r: r.state == "done").sudo()
         # Set RMAs as received. We sudo so we can grant the operation even
         # if the stock user has no RMA permissions.
-        to_be_received = move_done.sudo().mapped('rma_receiver_ids').filtered(
-            lambda r: r.state == 'confirmed')
-        to_be_received.write({'state': 'received'})
+        to_be_received = (
+            move_done.sudo()
+            .mapped("rma_receiver_ids")
+            .filtered(lambda r: r.state == "confirmed")
+        )
+        to_be_received.write({"state": "received"})
         # Set RMAs as delivered
-        move_done.mapped('rma_id').update_replaced_state()
-        move_done.mapped('rma_id').update_returned_state()
+        move_done.mapped("rma_id").update_replaced_state()
+        move_done.mapped("rma_id").update_returned_state()
         return res
 
     @api.model
@@ -83,14 +79,14 @@ def _prepare_merge_moves_distinct_fields(self):
         """ The main use is that launched delivery RMAs doesn't merge
         two moves if they are linked to a different RMAs.
         """
-        return super()._prepare_merge_moves_distinct_fields() + ['rma_id']
+        return super()._prepare_merge_moves_distinct_fields() + ["rma_id"]
 
     def _prepare_move_split_vals(self, qty):
         """ Intended to the backport of picking linked to RMAs propagates the
         RMA link id.
         """
         res = super()._prepare_move_split_vals(qty)
-        res['rma_id'] = self.sudo().rma_id.id
+        res["rma_id"] = self.sudo().rma_id.id
         return res
 
     def _prepare_return_rma_vals(self, original_picking):
@@ -98,30 +94,31 @@ def _prepare_return_rma_vals(self, original_picking):
         """
         self.ensure_one()
         partner = original_picking.partner_id
-        if hasattr(original_picking, 'sale_id') and original_picking.sale_id:
+        if hasattr(original_picking, "sale_id") and original_picking.sale_id:
             partner_invoice_id = original_picking.sale_id.partner_invoice_id.id
         else:
-            partner_invoice_id = partner.address_get(
-                ['invoice']).get('invoice', False),
+            partner_invoice_id = (
+                partner.address_get(["invoice"]).get("invoice", False),
+            )
         return {
-            'user_id': self.env.user.id,
-            'partner_id': partner.id,
-            'partner_invoice_id': partner_invoice_id,
-            'origin': original_picking.name,
-            'picking_id': original_picking.id,
-            'move_id': self.origin_returned_move_id.id,
-            'product_id': self.origin_returned_move_id.product_id.id,
-            'product_uom_qty': self.product_uom_qty,
-            'product_uom': self.product_uom.id,
-            'reception_move_id': self.id,
-            'company_id': self.company_id.id,
-            'location_id': self.location_dest_id.id,
-            'state': 'confirmed',
+            "user_id": self.env.user.id,
+            "partner_id": partner.id,
+            "partner_invoice_id": partner_invoice_id,
+            "origin": original_picking.name,
+            "picking_id": original_picking.id,
+            "move_id": self.origin_returned_move_id.id,
+            "product_id": self.origin_returned_move_id.product_id.id,
+            "product_uom_qty": self.product_uom_qty,
+            "product_uom": self.product_uom.id,
+            "reception_move_id": self.id,
+            "company_id": self.company_id.id,
+            "location_id": self.location_dest_id.id,
+            "state": "confirmed",
         }
 
 
 class StockRule(models.Model):
-    _inherit = 'stock.rule'
+    _inherit = "stock.rule"
 
     def _get_custom_move_fields(self):
-        return super()._get_custom_move_fields() + ['rma_id']
+        return super()._get_custom_move_fields() + ["rma_id"]
diff --git a/rma/models/stock_picking.py b/rma/models/stock_picking.py
index bddb151db..449e1fe3f 100644
--- a/rma/models/stock_picking.py
+++ b/rma/models/stock_picking.py
@@ -5,39 +5,34 @@
 
 
 class StockPicking(models.Model):
-    _inherit = 'stock.picking'
+    _inherit = "stock.picking"
 
-    rma_count = fields.Integer(
-        string='RMA count',
-        compute='_compute_rma_count',
-    )
+    rma_count = fields.Integer(string="RMA count", compute="_compute_rma_count",)
 
     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_lines.mapped("rma_ids"))
 
     @api.multi
     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 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
+                default["picking_type_id"] = warehouse.rma_in_type_id.id
         return super().copy(default)
 
     def action_view_rma(self):
         self.ensure_one()
-        action = self.env.ref('rma.rma_action').read()[0]
-        rma = self.move_lines.mapped('rma_ids')
+        action = self.env.ref("rma.rma_action").read()[0]
+        rma = self.move_lines.mapped("rma_ids")
         if len(rma) == 1:
             action.update(
-                res_id=rma.id,
-                view_mode="form",
-                view_id=False,
-                views=False,
+                res_id=rma.id, view_mode="form", view_id=False, views=False,
             )
         else:
-            action['domain'] = [('id', 'in', rma.ids)]
+            action["domain"] = [("id", "in", rma.ids)]
         return action
diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py
index cf2281c18..86fc2cf0b 100644
--- a/rma/models/stock_warehouse.py
+++ b/rma/models/stock_warehouse.py
@@ -1,118 +1,119 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models, _
+from odoo import _, fields, models
 
 
 class StockWarehouse(models.Model):
-    _inherit = 'stock.warehouse'
+    _inherit = "stock.warehouse"
 
     # This is a strategic field used to create an rma location
     # and rma operation types in existing warehouses when
     # installing this module.
     rma = fields.Boolean(
-        'RMA',
+        "RMA",
         default=True,
-        help="RMA related products can be stored in this warehouse.")
+        help="RMA related products can be stored in this warehouse.",
+    )
     rma_in_type_id = fields.Many2one(
-        comodel_name='stock.picking.type',
-        string='RMA In Type',
+        comodel_name="stock.picking.type", string="RMA In Type",
     )
     rma_out_type_id = fields.Many2one(
-        comodel_name='stock.picking.type',
-        string='RMA Out Type',
-    )
-    rma_loc_id = fields.Many2one(
-        comodel_name='stock.location',
-        string='RMA Location',
+        comodel_name="stock.picking.type", string="RMA Out Type",
     )
+    rma_loc_id = fields.Many2one(comodel_name="stock.location", string="RMA Location",)
 
     def _get_locations_values(self, vals):
         values = super()._get_locations_values(vals)
-        values.update({
-            'rma_loc_id': {
-                'name': 'RMA',
-                'active': True,
-                'return_location': True,
-                'usage': 'internal',
-                'company_id': vals.get('company_id', self.company_id.id),
-                'location_id': self.view_location_id.id,
-            },
-        })
+        values.update(
+            {
+                "rma_loc_id": {
+                    "name": "RMA",
+                    "active": True,
+                    "return_location": True,
+                    "usage": "internal",
+                    "company_id": vals.get("company_id", self.company_id.id),
+                    "location_id": self.view_location_id.id,
+                },
+            }
+        )
         return values
 
     def _get_sequence_values(self):
         values = super()._get_sequence_values()
-        values.update({
-            'rma_in_type_id': {
-                'name': self.name + ' ' + _('Sequence RMA in'),
-                'prefix': self.code + '/RMA/IN/', 'padding': 5,
-                'company_id': self.company_id.id,
-            },
-            'rma_out_type_id': {
-                'name': self.name + ' ' + _('Sequence RMA out'),
-                'prefix': self.code + '/RMA/OUT/', 'padding': 5,
-                'company_id': self.company_id.id,
-            },
-        })
+        values.update(
+            {
+                "rma_in_type_id": {
+                    "name": self.name + " " + _("Sequence RMA in"),
+                    "prefix": self.code + "/RMA/IN/",
+                    "padding": 5,
+                    "company_id": self.company_id.id,
+                },
+                "rma_out_type_id": {
+                    "name": self.name + " " + _("Sequence RMA out"),
+                    "prefix": self.code + "/RMA/OUT/",
+                    "padding": 5,
+                    "company_id": self.company_id.id,
+                },
+            }
+        )
         return values
 
     def _update_name_and_code(self, new_name=False, new_code=False):
         for warehouse in self:
             sequence_data = warehouse._get_sequence_values()
-            warehouse.rma_in_type_id.sequence_id.write(
-                sequence_data['rma_in_type_id'])
+            warehouse.rma_in_type_id.sequence_id.write(sequence_data["rma_in_type_id"])
             warehouse.rma_out_type_id.sequence_id.write(
-                sequence_data['rma_out_type_id'])
+                sequence_data["rma_out_type_id"]
+            )
 
     def _get_picking_type_create_values(self, max_sequence):
-        data, next_sequence = super()._get_picking_type_create_values(
-            max_sequence)
-        data.update({
-            'rma_in_type_id': {
-                'name': _('RMA Receipts'),
-                'code': 'incoming',
-                'use_create_lots': False,
-                'use_existing_lots': True,
-                'default_location_src_id': False,
-                'default_location_dest_id': self.rma_loc_id.id,
-                'sequence': max_sequence + 1,
-            },
-            'rma_out_type_id': {
-                'name': _('RMA Delivery Orders'),
-                'code': 'outgoing',
-                'use_create_lots': False,
-                'use_existing_lots': True,
-                'default_location_src_id': self.rma_loc_id.id,
-                'default_location_dest_id': False,
-                'sequence': max_sequence + 2,
-            },
-        })
+        data, next_sequence = super()._get_picking_type_create_values(max_sequence)
+        data.update(
+            {
+                "rma_in_type_id": {
+                    "name": _("RMA Receipts"),
+                    "code": "incoming",
+                    "use_create_lots": False,
+                    "use_existing_lots": True,
+                    "default_location_src_id": False,
+                    "default_location_dest_id": self.rma_loc_id.id,
+                    "sequence": max_sequence + 1,
+                },
+                "rma_out_type_id": {
+                    "name": _("RMA Delivery Orders"),
+                    "code": "outgoing",
+                    "use_create_lots": False,
+                    "use_existing_lots": True,
+                    "default_location_src_id": self.rma_loc_id.id,
+                    "default_location_dest_id": False,
+                    "sequence": max_sequence + 2,
+                },
+            }
+        )
         return data, max_sequence + 3
 
     def _get_picking_type_update_values(self):
         data = super()._get_picking_type_update_values()
-        data.update({
-            'rma_in_type_id': {
-                'default_location_dest_id': self.rma_loc_id.id,
-            },
-            'rma_out_type_id': {
-                'default_location_src_id': self.rma_loc_id.id,
-            },
-        })
+        data.update(
+            {
+                "rma_in_type_id": {"default_location_dest_id": self.rma_loc_id.id,},
+                "rma_out_type_id": {"default_location_src_id": self.rma_loc_id.id,},
+            }
+        )
         return data
 
     def _create_or_update_sequences_and_picking_types(self):
         data = super()._create_or_update_sequences_and_picking_types()
-        stock_picking_type = self.env['stock.picking.type']
-        if 'out_type_id' in data:
-            rma_out_type = stock_picking_type.browse(data['rma_out_type_id'])
-            rma_out_type.write({
-                'return_picking_type_id': data.get('rma_in_type_id', False)
-            })
-        if 'rma_in_type_id' in data:
-            rma_in_type = stock_picking_type.browse(data['rma_in_type_id'])
-            rma_in_type.write({
-                'return_picking_type_id': data.get('rma_out_type_id', False)
-            })
+        stock_picking_type = self.env["stock.picking.type"]
+        if "out_type_id" in data:
+            rma_out_type = stock_picking_type.browse(data["rma_out_type_id"])
+            rma_out_type.write(
+                {"return_picking_type_id": data.get("rma_in_type_id", False)}
+            )
+        if "rma_in_type_id" in data:
+            rma_in_type = stock_picking_type.browse(data["rma_in_type_id"])
+            rma_in_type.write(
+                {"return_picking_type_id": data.get("rma_out_type_id", False)}
+            )
         return data
diff --git a/rma/security/rma_security.xml b/rma/security/rma_security.xml
index 6604005fd..81385aa12 100644
--- a/rma/security/rma_security.xml
+++ b/rma/security/rma_security.xml
@@ -1,67 +1,86 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
     <!-- Application -->
     <record id="rma_module_category" model="ir.module.category">
         <field name="name">RMA</field>
-        <field name="description">Manage Return Merchandise Authorizations (RMAs).</field>
+        <field
+            name="description"
+        >Manage Return Merchandise Authorizations (RMAs).</field>
     </record>
     <!-- Access Groups -->
     <record id="rma_group_user_own" model="res.groups">
         <field name="name">User: Own Documents Only</field>
-        <field name="category_id" ref="rma_module_category"/>
-        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
-        <field name="comment">the user will have access to his own data in the RMA application.</field>
+        <field name="category_id" ref="rma_module_category" />
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]" />
+        <field
+            name="comment"
+        >the user will have access to his own data in the RMA application.</field>
     </record>
     <record id="rma_group_user_all" model="res.groups">
         <field name="name">User: All Documents</field>
-        <field name="category_id" ref="rma_module_category"/>
-        <field name="implied_ids" eval="[(4, ref('rma_group_user_own'))]"/>
-        <field name="comment">the user will have access to all records of everyone in the RMA application.</field>
+        <field name="category_id" ref="rma_module_category" />
+        <field name="implied_ids" eval="[(4, ref('rma_group_user_own'))]" />
+        <field
+            name="comment"
+        >the user will have access to all records of everyone in the RMA application.</field>
     </record>
     <record id="rma_group_manager" model="res.groups">
         <field name="name">Manager</field>
-        <field name="comment">the user will have an access to the RMA configuration as well as statistic reports.</field>
-        <field name="category_id" ref="rma_module_category"/>
-        <field name="implied_ids" eval="[(4, ref('rma_group_user_all'))]"/>
-        <field name="users" eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"/>
+        <field
+            name="comment"
+        >the user will have an access to the RMA configuration as well as statistic reports.</field>
+        <field name="category_id" ref="rma_module_category" />
+        <field name="implied_ids" eval="[(4, ref('rma_group_user_all'))]" />
+        <field
+            name="users"
+            eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
+        />
     </record>
     <!-- Record Rules -->
     <record id="rma_rule_user_own" model="ir.rule">
         <field name="name">Personal RMAs</field>
-        <field name="model_id" ref="model_rma"/>
-        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
-        <field name="groups" eval="[(4, ref('rma_group_user_own'))]"/>
+        <field name="model_id" ref="model_rma" />
+        <field
+            name="domain_force"
+        >['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('rma_group_user_own'))]" />
     </record>
     <record id="rma_rule_user_all" model="ir.rule">
         <field name="name">All RMAs</field>
-        <field name="model_id" ref="model_rma"/>
+        <field name="model_id" ref="model_rma" />
         <field name="domain_force">[(1,'=',1)]</field>
-        <field name="groups" eval="[(4, ref('rma_group_user_all'))]"/>
+        <field name="groups" eval="[(4, ref('rma_group_user_all'))]" />
     </record>
     <!-- RMA model rules for portal users -->
     <record id="rma_rule_portal" model="ir.rule">
         <field name="name">RMA portal users</field>
-        <field name="model_id" ref="rma.model_rma"/>
-        <field name="domain_force">[('message_partner_ids', 'child_of', [user.partner_id.commercial_partner_id.id])]</field>
-        <field name="groups" eval="[(4, ref('base.group_portal'))]"/>
+        <field name="model_id" ref="rma.model_rma" />
+        <field
+            name="domain_force"
+        >[('message_partner_ids', 'child_of', [user.partner_id.commercial_partner_id.id])]</field>
+        <field name="groups" eval="[(4, ref('base.group_portal'))]" />
     </record>
     <!-- Multi-Company Rules -->
     <record id="rma_rule_multi_company" model="ir.rule">
         <field name="name">RMA multi-company</field>
-        <field name="model_id" ref="model_rma"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="model_id" ref="model_rma" />
+        <field name="global" eval="True" />
+        <field
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
     <record id="rma_team_rule_multi_company" model="ir.rule">
         <field name="name">RMA team multi-company</field>
-        <field name="model_id" ref="model_rma_team"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="model_id" ref="model_rma_team" />
+        <field name="global" eval="True" />
+        <field
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
     <!-- New users will belong to rma_group_user_own  -->
     <record id="base.default_user" model="res.users">
-        <field name="groups_id" eval="[(4, ref('rma_group_user_own'))]"/>
+        <field name="groups_id" eval="[(4, ref('rma_group_user_own'))]" />
     </record>
 </odoo>
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index b6310ecec..db80078b3 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -1,60 +1,67 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo.tests import Form, SavepointCase
 from odoo.exceptions import UserError, ValidationError
+from odoo.tests import Form, SavepointCase
 
 
 class TestRma(SavepointCase):
-
     @classmethod
     def setUpClass(cls):
         super(TestRma, cls).setUpClass()
-        cls.res_partner = cls.env['res.partner']
-        cls.product_product = cls.env['product.product']
+        cls.res_partner = cls.env["res.partner"]
+        cls.product_product = cls.env["product.product"]
         cls.company = cls.env.user.company_id
-        cls.warehouse_company = cls.env['stock.warehouse'].search(
-            [('company_id', '=', cls.company.id)], limit=1)
+        cls.warehouse_company = cls.env["stock.warehouse"].search(
+            [("company_id", "=", cls.company.id)], limit=1
+        )
         cls.rma_loc = cls.warehouse_company.rma_loc_id
-        account_pay = cls.env['account.account'].create({
-            'code': 'X1111',
-            'name': 'Creditors - (test)',
-            'user_type_id': cls.env.ref(
-                'account.data_account_type_payable').id,
-            'reconcile': True,
-        })
-        cls.journal = cls.env['account.journal'].create({
-            'name': 'sale_0',
-            'code': 'SALE0',
-            'type': 'sale',
-            'default_debit_account_id': account_pay.id,
-        })
-        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',
-        })
-        cls.account_receiv = cls.env['account.account'].create({
-            'name': 'Receivable',
-            'code': 'RCV00',
-            'user_type_id': account_type.id,
-            'reconcile': True,
-        })
-        cls.partner = cls.res_partner.create({
-            'name': 'Partner test',
-            'property_account_receivable_id': cls.account_receiv.id,
-        })
-        cls.partner_invoice = cls.res_partner.create({
-            'name': 'Partner invoice test',
-            'parent_id': cls.partner.id,
-            'type': 'invoice',
-        })
+        account_pay = cls.env["account.account"].create(
+            {
+                "code": "X1111",
+                "name": "Creditors - (test)",
+                "user_type_id": cls.env.ref("account.data_account_type_payable").id,
+                "reconcile": True,
+            }
+        )
+        cls.journal = cls.env["account.journal"].create(
+            {
+                "name": "sale_0",
+                "code": "SALE0",
+                "type": "sale",
+                "default_debit_account_id": account_pay.id,
+            }
+        )
+        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",}
+        )
+        cls.account_receiv = cls.env["account.account"].create(
+            {
+                "name": "Receivable",
+                "code": "RCV00",
+                "user_type_id": account_type.id,
+                "reconcile": True,
+            }
+        )
+        cls.partner = cls.res_partner.create(
+            {
+                "name": "Partner test",
+                "property_account_receivable_id": cls.account_receiv.id,
+            }
+        )
+        cls.partner_invoice = cls.res_partner.create(
+            {
+                "name": "Partner invoice test",
+                "parent_id": cls.partner.id,
+                "type": "invoice",
+            }
+        )
 
     def _create_rma(self, partner=None, product=None, qty=None, location=None):
-        rma_form = Form(self.env['rma'])
+        rma_form = Form(self.env["rma"])
         if partner:
             rma_form.partner_id = partner
         if product:
@@ -65,8 +72,9 @@ def _create_rma(self, partner=None, product=None, qty=None, location=None):
             rma_form.location_id = location
         return rma_form.save()
 
-    def _create_confirm_receive(self, partner=None, product=None, qty=None,
-                                location=None):
+    def _create_confirm_receive(
+        self, partner=None, product=None, qty=None, location=None
+    ):
         rma = self._create_rma(partner, product, qty, location)
         rma.action_confirm()
         rma.reception_move_id.quantity_done = rma.product_uom_qty
@@ -76,35 +84,36 @@ def _create_confirm_receive(self, partner=None, product=None, qty=None,
     def _test_readonly_fields(self, rma):
         with Form(rma) as rma_form:
             with self.assertRaises(AssertionError):
-                rma_form.partner_id = self.env['res.partner']
+                rma_form.partner_id = self.env["res.partner"]
             with self.assertRaises(AssertionError):
-                rma_form.partner_invoice_id = self.env['res.partner']
+                rma_form.partner_invoice_id = self.env["res.partner"]
             with self.assertRaises(AssertionError):
-                rma_form.picking_id = self.env['stock.picking']
+                rma_form.picking_id = self.env["stock.picking"]
             with self.assertRaises(AssertionError):
-                rma_form.move_id = self.env['stock.move']
+                rma_form.move_id = self.env["stock.move"]
             with self.assertRaises(AssertionError):
-                rma_form.product_id = self.env['product.product']
+                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']
+                rma_form.product_uom = self.env["uom.uom"]
             with self.assertRaises(AssertionError):
-                rma_form.location_id = self.env['stock.location']
+                rma_form.location_id = self.env["stock.location"]
 
     def _create_delivery(self):
-        picking_type = self.env['stock.picking.type'].search(
+        picking_type = self.env["stock.picking.type"].search(
             [
-                ('code', '=', 'outgoing'),
-                '|',
-                ('warehouse_id.company_id', '=', self.company.id),
-                ('warehouse_id', '=', False)
+                ("code", "=", "outgoing"),
+                "|",
+                ("warehouse_id.company_id", "=", self.company.id),
+                ("warehouse_id", "=", False),
             ],
             limit=1,
         )
         picking_form = Form(
-            recordp=self.env['stock.picking'].with_context(
-                default_picking_type_id=picking_type.id),
+            recordp=self.env["stock.picking"].with_context(
+                default_picking_type_id=picking_type.id
+            ),
             view="stock.view_picking_form",
         )
         picking_form.company_id = self.company
@@ -114,7 +123,8 @@ def _create_delivery(self):
             move.product_uom_qty = 10
         with picking_form.move_ids_without_package.new() as move:
             move.product_id = self.product_product.create(
-                {'name': 'Product 2 test', 'type': 'product'})
+                {"name": "Product 2 test", "type": "product"}
+            )
             move.product_uom_qty = 20
         picking = picking_form.save()
         picking.action_confirm()
@@ -124,34 +134,35 @@ def _create_delivery(self):
         return picking
 
     def test_onchange(self):
-        rma_form = Form(self.env['rma'])
+        rma_form = Form(self.env["rma"])
         # If partner changes, the invoice address is set
         rma_form.partner_id = self.partner
         self.assertEqual(rma_form.partner_invoice_id, self.partner_invoice)
         # If origin move changes, the product is set
-        uom_ten = self.env['uom.uom'].create({
-            'name': "Ten",
-            'category_id': self.env.ref('uom.product_uom_unit').id,
-            'factor_inv': 10,
-            'uom_type': 'bigger',
-        })
-        product_2 = self.product_product.create({
-            'name': 'Product test 2',
-            'type': 'product',
-            'uom_id': uom_ten.id,
-        })
-        outgoing_picking_type = self.env['stock.picking.type'].search(
+        uom_ten = self.env["uom.uom"].create(
+            {
+                "name": "Ten",
+                "category_id": self.env.ref("uom.product_uom_unit").id,
+                "factor_inv": 10,
+                "uom_type": "bigger",
+            }
+        )
+        product_2 = self.product_product.create(
+            {"name": "Product test 2", "type": "product", "uom_id": uom_ten.id,}
+        )
+        outgoing_picking_type = self.env["stock.picking.type"].search(
             [
-                ('code', '=', 'outgoing'),
-                '|',
-                ('warehouse_id.company_id', '=', self.company.id),
-                ('warehouse_id', '=', False)
+                ("code", "=", "outgoing"),
+                "|",
+                ("warehouse_id.company_id", "=", self.company.id),
+                ("warehouse_id", "=", False),
             ],
             limit=1,
         )
         picking_form = Form(
-            recordp=self.env['stock.picking'].with_context(
-                default_picking_type_id=outgoing_picking_type.id),
+            recordp=self.env["stock.picking"].with_context(
+                default_picking_type_id=outgoing_picking_type.id
+            ),
             view="stock.view_picking_form",
         )
         picking_form.company_id = self.company
@@ -169,7 +180,7 @@ def test_onchange(self):
         self.assertEqual(rma_form.product_uom_qty, 15)
         self.assertEqual(rma_form.product_uom, uom_ten)
         # If product changes, unit of measure changes
-        rma_form.picking_id = self.env['stock.picking']
+        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)
@@ -177,9 +188,10 @@ def test_onchange(self):
         self.assertEqual(rma_form.product_uom, self.product.uom_id)
         rma = rma_form.save()
         # If product changes, unit of measure domain should also change
-        domain = rma._onchange_product_id()['domain']['product_uom']
+        domain = rma._onchange_product_id()["domain"]["product_uom"]
         self.assertListEqual(
-            domain, [('category_id', '=', self.product.uom_id.category_id.id)])
+            domain, [("category_id", "=", self.product.uom_id.category_id.id)]
+        )
 
     def test_ensure_required_fields_on_confirm(self):
         rma = self._create_rma()
@@ -187,86 +199,84 @@ def test_ensure_required_fields_on_confirm(self):
             rma.action_confirm()
         self.assertEqual(
             e.exception.name,
-            "Required field(s):\nCustomer\nInvoice Address\nProduct\nLocation"
+            "Required field(s):\nCustomer\nInvoice Address\nProduct\nLocation",
         )
         with Form(rma) as rma_form:
             rma_form.partner_id = self.partner
         with self.assertRaises(ValidationError) as e:
             rma.action_confirm()
-        self.assertEqual(
-            e.exception.name, "Required field(s):\nProduct\nLocation")
+        self.assertEqual(e.exception.name, "Required field(s):\nProduct\nLocation")
         with Form(rma) as rma_form:
             rma_form.product_id = self.product
             rma_form.location_id = self.rma_loc
         rma.action_confirm()
-        self.assertEqual(rma.state, 'confirmed')
+        self.assertEqual(rma.state, "confirmed")
 
     def test_confirm_and_receive(self):
         rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
         rma.action_confirm()
-        self.assertEqual(rma.reception_move_id.picking_id.state, 'assigned')
+        self.assertEqual(rma.reception_move_id.picking_id.state, "assigned")
         self.assertEqual(rma.reception_move_id.product_id, rma.product_id)
         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.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()
         rma.reception_move_id.quantity_done = 10
         rma.reception_move_id.picking_id.action_done()
-        self.assertEqual(rma.reception_move_id.picking_id.state, 'done')
+        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.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.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()
         rma.action_cancel()
-        self.assertEqual(rma.state, 'cancelled')
+        self.assertEqual(rma.state, "cancelled")
         # A RMA is only cancelled from draft and confirmed states
-        rma = self._create_confirm_receive(self.partner, self.product, 10,
-                                           self.rma_loc)
+        rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         with self.assertRaises(UserError):
             rma.action_cancel()
 
     def test_lock_unlock(self):
         # A RMA is only locked from 'received' state
         rma_1 = self._create_rma(self.partner, self.product, 10, self.rma_loc)
-        rma_2 = self._create_confirm_receive(self.partner, self.product, 10,
-                                             self.rma_loc)
-        self.assertEqual(rma_1.state, 'draft')
-        self.assertEqual(rma_2.state, 'received')
+        rma_2 = self._create_confirm_receive(
+            self.partner, self.product, 10, self.rma_loc
+        )
+        self.assertEqual(rma_1.state, "draft")
+        self.assertEqual(rma_2.state, "received")
         (rma_1 | rma_2).action_lock()
-        self.assertEqual(rma_1.state, 'draft')
-        self.assertEqual(rma_2.state, 'locked')
+        self.assertEqual(rma_1.state, "draft")
+        self.assertEqual(rma_2.state, "locked")
         # A RMA is only unlocked from 'lock' state and it will be set
         # to 'received' state
         (rma_1 | rma_2).action_unlock()
-        self.assertEqual(rma_1.state, 'draft')
-        self.assertEqual(rma_2.state, 'received')
+        self.assertEqual(rma_1.state, "draft")
+        self.assertEqual(rma_2.state, "received")
 
     def test_action_refund(self):
-        rma = self._create_confirm_receive(self.partner, self.product, 10,
-                                           self.rma_loc)
-        self.assertEqual(rma.state, 'received')
+        rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
+        self.assertEqual(rma.state, "received")
         self.assertTrue(rma.can_be_refunded)
         self.assertTrue(rma.can_be_returned)
         self.assertTrue(rma.can_be_replaced)
         rma.action_refund()
-        self.assertEqual(rma.refund_id.type, 'out_refund')
-        self.assertEqual(rma.refund_id.state, 'draft')
+        self.assertEqual(rma.refund_id.type, "out_refund")
+        self.assertEqual(rma.refund_id.state, "draft")
         self.assertEqual(rma.refund_line_id.product_id, rma.product_id)
         self.assertEqual(rma.refund_line_id.quantity, 10)
         self.assertEqual(rma.refund_line_id.uom_id, rma.product_uom)
-        self.assertEqual(rma.state, 'refunded')
+        self.assertEqual(rma.state, "refunded")
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
@@ -282,59 +292,59 @@ def test_action_refund(self):
 
     def test_mass_refund(self):
         # Create, confirm and receive rma_1
-        rma_1 = self._create_confirm_receive(self.partner, self.product, 10,
-                                             self.rma_loc)
+        rma_1 = self._create_confirm_receive(
+            self.partner, self.product, 10, self.rma_loc
+        )
         # create, confirm and receive 3 more RMAs
         # rma_2: Same partner and same product as rma_1
-        rma_2 = self._create_confirm_receive(self.partner, self.product, 15,
-                                             self.rma_loc)
+        rma_2 = self._create_confirm_receive(
+            self.partner, self.product, 15, self.rma_loc
+        )
         # rma_3: Same partner and different product than rma_1
         product = self.product_product.create(
-            {'name': 'Product 2 test', 'type': 'product'})
-        rma_3 = self._create_confirm_receive(self.partner, product, 20,
-                                             self.rma_loc)
+            {"name": "Product 2 test", "type": "product"}
+        )
+        rma_3 = self._create_confirm_receive(self.partner, product, 20, self.rma_loc)
         # rma_4: Different partner and same product as rma_1
-        partner = self.res_partner.create({
-            'name': 'Partner 2 test',
-            'property_account_receivable_id': self.account_receiv.id,
-            'company_id': self.company.id,
-        })
-        rma_4 = self._create_confirm_receive(partner, product, 25,
-                                             self.rma_loc)
+        partner = self.res_partner.create(
+            {
+                "name": "Partner 2 test",
+                "property_account_receivable_id": self.account_receiv.id,
+                "company_id": self.company.id,
+            }
+        )
+        rma_4 = self._create_confirm_receive(partner, product, 25, self.rma_loc)
         # all rmas are ready to refund
-        all_rmas = (rma_1 | rma_2 | rma_3 | rma_4)
-        self.assertEqual(all_rmas.mapped('state'), ['received']*4)
-        self.assertEqual(all_rmas.mapped('can_be_refunded'), [True]*4)
+        all_rmas = rma_1 | rma_2 | rma_3 | rma_4
+        self.assertEqual(all_rmas.mapped("state"), ["received"] * 4)
+        self.assertEqual(all_rmas.mapped("can_be_refunded"), [True] * 4)
         # Mass refund of those four RMAs
-        action = self.env.ref('rma.rma_refund_action_server')
+        action = self.env.ref("rma.rma_refund_action_server")
         ctx = dict(self.env.context)
-        ctx.update(active_ids=all_rmas.ids, active_model='rma')
+        ctx.update(active_ids=all_rmas.ids, active_model="rma")
         action.with_context(ctx).run()
         # After that all RMAs are in 'refunded' state
-        self.assertEqual(all_rmas.mapped('state'), ['refunded'] * 4)
+        self.assertEqual(all_rmas.mapped("state"), ["refunded"] * 4)
         # Two refunds were created
-        refund_1 = (rma_1 | rma_2 | rma_3).mapped('refund_id')
+        refund_1 = (rma_1 | rma_2 | rma_3).mapped("refund_id")
         refund_2 = rma_4.refund_id
         self.assertEqual(len(refund_1), 1)
         self.assertEqual(len(refund_2), 1)
-        self.assertEqual((refund_1 | refund_2).mapped('state'), ['draft']*2)
+        self.assertEqual((refund_1 | refund_2).mapped("state"), ["draft"] * 2)
         # One refund per partner
         self.assertNotEqual(refund_1.partner_id, refund_2.partner_id)
         self.assertEqual(
-            refund_1.partner_id,
-            (rma_1 | rma_2 | rma_3).mapped('partner_invoice_id'),
+            refund_1.partner_id, (rma_1 | rma_2 | rma_3).mapped("partner_invoice_id"),
         )
         self.assertEqual(refund_2.partner_id, rma_4.partner_invoice_id)
         # Each RMA (rma_1, rma_2 and rma_3) is linked with a different
         # line of refund_1
         self.assertEqual(len(refund_1.invoice_line_ids), 3)
         self.assertEqual(
-            refund_1.invoice_line_ids.mapped('rma_id'),
-            (rma_1 | rma_2 | rma_3),
+            refund_1.invoice_line_ids.mapped("rma_id"), (rma_1 | rma_2 | rma_3),
         )
         self.assertEqual(
-            (rma_1 | rma_2 | rma_3).mapped('refund_line_id'),
-            refund_1.invoice_line_ids,
+            (rma_1 | rma_2 | rma_3).mapped("refund_line_id"), refund_1.invoice_line_ids,
         )
         # rma_4 is linked with the unique line of refund_2
         self.assertEqual(len(refund_2.invoice_line_ids), 1)
@@ -355,15 +365,14 @@ def test_mass_refund(self):
 
     def test_replace(self):
         # Create, confirm and receive an RMA
-        rma = self._create_confirm_receive(self.partner, self.product, 10,
-                                           self.rma_loc)
+        rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         # Replace with another product with quantity 2.
         product_2 = self.product_product.create(
-            {'name': 'Product 2 test', 'type': 'product'})
+            {"name": "Product 2 test", "type": "product"}
+        )
         delivery_form = Form(
-            self.env['rma.delivery.wizard'].with_context(
-                active_ids=rma.ids,
-                rma_delivery_type='replace',
+            self.env["rma.delivery.wizard"].with_context(
+                active_ids=rma.ids, rma_delivery_type="replace",
             )
         )
         delivery_form.product_id = product_2
@@ -373,8 +382,8 @@ def test_replace(self):
         self.assertEqual(len(rma.delivery_move_ids.picking_id.move_lines), 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')
-        self.assertEqual(rma.state, 'waiting_replacement')
+        self.assertTrue(rma.delivery_move_ids.picking_id.state, "waiting")
+        self.assertEqual(rma.state, "waiting_replacement")
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertTrue(rma.can_be_replaced)
@@ -386,11 +395,11 @@ def test_replace(self):
         picking = first_move.picking_id
         # Replace again with another product with the remaining quantity
         product_3 = self.product_product.create(
-            {'name': 'Product 3 test', 'type': 'product'})
+            {"name": "Product 3 test", "type": "product"}
+        )
         delivery_form = Form(
-            self.env['rma.delivery.wizard'].with_context(
-                active_ids=rma.ids,
-                rma_delivery_type='replace',
+            self.env["rma.delivery.wizard"].with_context(
+                active_ids=rma.ids, rma_delivery_type="replace",
             )
         )
         delivery_form.product_id = product_3
@@ -398,12 +407,12 @@ def test_replace(self):
         delivery_wizard.action_deliver()
         second_move = rma.delivery_move_ids - first_move
         self.assertEqual(len(rma.delivery_move_ids), 2)
-        self.assertEqual(rma.delivery_move_ids.mapped('picking_id'), picking)
+        self.assertEqual(rma.delivery_move_ids.mapped("picking_id"), picking)
         self.assertEqual(first_move.product_id, product_2)
         self.assertEqual(first_move.product_uom_qty, 2)
         self.assertEqual(second_move.product_id, product_3)
         self.assertEqual(second_move.product_uom_qty, 8)
-        self.assertTrue(picking.state, 'waiting')
+        self.assertTrue(picking.state, "waiting")
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
         self.assertEqual(rma.delivered_qty_done, 0)
@@ -413,13 +422,13 @@ def test_replace(self):
         first_move.quantity_done = 2
         second_move.quantity_done = 8
         picking.button_validate()
-        self.assertEqual(picking.state, 'done')
+        self.assertEqual(picking.state, "done")
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
         self.assertEqual(rma.delivered_qty_done, 10)
         self.assertEqual(rma.remaining_qty_to_done, 0)
         # The RMA is now in 'replaced' state
-        self.assertEqual(rma.state, 'replaced')
+        self.assertEqual(rma.state, "replaced")
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         # Despite being in 'replaced' state,
@@ -429,13 +438,11 @@ def test_replace(self):
 
     def test_return_to_customer(self):
         # Create, confirm and receive an RMA
-        rma = self._create_confirm_receive(self.partner, self.product, 10,
-                                           self.rma_loc)
+        rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         # Return the same product with quantity 2 to the customer.
         delivery_form = Form(
-            self.env['rma.delivery.wizard'].with_context(
-                active_ids=rma.ids,
-                rma_delivery_type='return',
+            self.env["rma.delivery.wizard"].with_context(
+                active_ids=rma.ids, rma_delivery_type="return",
             )
         )
         delivery_form.product_uom_qty = 2
@@ -445,8 +452,8 @@ def test_return_to_customer(self):
         self.assertEqual(len(picking.move_lines), 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')
-        self.assertEqual(rma.state, 'waiting_return')
+        self.assertTrue(picking.state, "waiting")
+        self.assertEqual(rma.state, "waiting_return")
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_replaced)
         self.assertTrue(rma.can_be_returned)
@@ -459,16 +466,15 @@ def test_return_to_customer(self):
         # Validate the picking
         first_move.quantity_done = 2
         picking.button_validate()
-        self.assertEqual(picking.state, 'done')
+        self.assertEqual(picking.state, "done")
         self.assertEqual(rma.delivered_qty, 2)
         self.assertEqual(rma.remaining_qty, 8)
         self.assertEqual(rma.delivered_qty_done, 2)
         self.assertEqual(rma.remaining_qty_to_done, 8)
         # Return the remaining quantity to the customer
         delivery_form = Form(
-            self.env['rma.delivery.wizard'].with_context(
-                active_ids=rma.ids,
-                rma_delivery_type='return',
+            self.env["rma.delivery.wizard"].with_context(
+                active_ids=rma.ids, rma_delivery_type="return",
             )
         )
         delivery_wizard = delivery_form.save()
@@ -479,18 +485,18 @@ def test_return_to_customer(self):
         self.assertEqual(rma.remaining_qty, 0)
         self.assertEqual(rma.delivered_qty_done, 2)
         self.assertEqual(rma.remaining_qty_to_done, 8)
-        self.assertEqual(rma.state, 'waiting_return')
+        self.assertEqual(rma.state, "waiting_return")
         # remaining_qty is 0 but rma is not set to 'returned' until
         # remaining_qty_to_done is less than or equal to 0
         picking_2 = second_move.picking_id
         picking_2.button_validate()
-        self.assertEqual(picking_2.state, 'done')
+        self.assertEqual(picking_2.state, "done")
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
         self.assertEqual(rma.delivered_qty_done, 10)
         self.assertEqual(rma.remaining_qty_to_done, 0)
         # The RMA is now in 'returned' state
-        self.assertEqual(rma.state, 'returned')
+        self.assertEqual(rma.state, "returned")
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
@@ -498,53 +504,54 @@ def test_return_to_customer(self):
 
     def test_mass_return_to_customer(self):
         # Create, confirm and receive rma_1
-        rma_1 = self._create_confirm_receive(self.partner, self.product, 10,
-                                             self.rma_loc)
+        rma_1 = self._create_confirm_receive(
+            self.partner, self.product, 10, self.rma_loc
+        )
         # create, confirm and receive 3 more RMAs
         # rma_2: Same partner and same product as rma_1
-        rma_2 = self._create_confirm_receive(self.partner, self.product, 15,
-                                             self.rma_loc)
+        rma_2 = self._create_confirm_receive(
+            self.partner, self.product, 15, self.rma_loc
+        )
         # rma_3: Same partner and different product than rma_1
         product = self.product_product.create(
-            {'name': 'Product 2 test', 'type': 'product'})
-        rma_3 = self._create_confirm_receive(self.partner, product, 20,
-                                             self.rma_loc)
+            {"name": "Product 2 test", "type": "product"}
+        )
+        rma_3 = self._create_confirm_receive(self.partner, product, 20, self.rma_loc)
         # rma_4: Different partner and same product as rma_1
-        partner = self.res_partner.create({'name': 'Partner 2 test'})
-        rma_4 = self._create_confirm_receive(partner, product, 25,
-                                             self.rma_loc)
+        partner = self.res_partner.create({"name": "Partner 2 test"})
+        rma_4 = self._create_confirm_receive(partner, product, 25, self.rma_loc)
         # all rmas are ready to be returned to the customer
-        all_rmas = (rma_1 | rma_2 | rma_3 | rma_4)
-        self.assertEqual(all_rmas.mapped('state'), ['received'] * 4)
-        self.assertEqual(all_rmas.mapped('can_be_returned'), [True] * 4)
+        all_rmas = rma_1 | rma_2 | rma_3 | rma_4
+        self.assertEqual(all_rmas.mapped("state"), ["received"] * 4)
+        self.assertEqual(all_rmas.mapped("can_be_returned"), [True] * 4)
         # Mass return of those four RMAs
-        delivery_wizard = self.env['rma.delivery.wizard'].with_context(
-            active_ids=all_rmas.ids, rma_delivery_type='return').create({})
+        delivery_wizard = (
+            self.env["rma.delivery.wizard"]
+            .with_context(active_ids=all_rmas.ids, rma_delivery_type="return")
+            .create({})
+        )
         delivery_wizard.action_deliver()
         # Two pickings were created
-        pick_1 = (rma_1 | rma_2 | rma_3).mapped('delivery_move_ids.picking_id')
+        pick_1 = (rma_1 | rma_2 | rma_3).mapped("delivery_move_ids.picking_id")
         pick_2 = rma_4.delivery_move_ids.picking_id
         self.assertEqual(len(pick_1), 1)
         self.assertEqual(len(pick_2), 1)
         self.assertNotEqual(pick_1, pick_2)
-        self.assertEqual((pick_1 | pick_2).mapped('state'), ['assigned'] * 2)
+        self.assertEqual((pick_1 | pick_2).mapped("state"), ["assigned"] * 2)
         # One picking per partner
         self.assertNotEqual(pick_1.partner_id, pick_2.partner_id)
         self.assertEqual(
-            pick_1.partner_id,
-            (rma_1 | rma_2 | rma_3).mapped('partner_id'),
+            pick_1.partner_id, (rma_1 | rma_2 | rma_3).mapped("partner_id"),
         )
         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(
-            pick_1.move_lines.mapped('rma_id'),
-            (rma_1 | rma_2 | rma_3),
+            pick_1.move_lines.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,
+            (rma_1 | rma_2 | rma_3).mapped("delivery_move_ids"), pick_1.move_lines,
         )
         # rma_4 is linked with the unique move of pick_2
         self.assertEqual(len(pick_2.move_lines), 1)
@@ -553,57 +560,56 @@ def test_mass_return_to_customer(self):
         # Assert product and quantities are propagated correctly
         for rma in all_rmas:
             self.assertEqual(rma.product_id, rma.delivery_move_ids.product_id)
-            self.assertEqual(rma.product_uom_qty,
-                             rma.delivery_move_ids.product_uom_qty)
-            self.assertEqual(rma.product_uom,
-                             rma.delivery_move_ids.product_uom)
+            self.assertEqual(rma.product_uom_qty, rma.delivery_move_ids.product_uom_qty)
+            self.assertEqual(rma.product_uom, rma.delivery_move_ids.product_uom)
             rma.delivery_move_ids.quantity_done = rma.product_uom_qty
         pick_1.button_validate()
         pick_2.button_validate()
-        self.assertEqual(all_rmas.mapped('state'), ['returned'] * 4)
+        self.assertEqual(all_rmas.mapped("state"), ["returned"] * 4)
 
     def test_rma_from_picking_return(self):
         # Create a return from a delivery picking
         origin_delivery = self._create_delivery()
-        return_wizard = self.env['stock.return.picking'].with_context(
-            active_id=origin_delivery.id,
-            active_ids=origin_delivery.ids,
-        ).create({'create_rma': True})
+        return_wizard = (
+            self.env["stock.return.picking"]
+            .with_context(active_id=origin_delivery.id, active_ids=origin_delivery.ids,)
+            .create({"create_rma": True})
+        )
         picking_action = return_wizard.create_returns()
         # Each origin move is linked to a different RMA
         origin_moves = origin_delivery.move_lines
         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)
+        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 = self.env["stock.picking"].browse(picking_action["res_id"])
         reception_moves = reception.move_lines
         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)
+        self.assertEqual(reception_moves.mapped("rma_receiver_ids"), rmas)
         # Validate the reception picking to set rmas to 'received' state
         reception_moves[0].quantity_done = reception_moves[0].product_uom_qty
         reception_moves[1].quantity_done = reception_moves[1].product_uom_qty
         reception.button_validate()
-        self.assertEqual(rmas.mapped('state'), ['received'] * 2)
+        self.assertEqual(rmas.mapped("state"), ["received"] * 2)
 
     def test_split(self):
         origin_delivery = self._create_delivery()
-        rma_form = Form(self.env['rma'])
+        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(
-            lambda r: r.product_id == self.product)
+            lambda r: r.product_id == self.product
+        )
         rma = rma_form.save()
         rma.action_confirm()
         rma.reception_move_id.quantity_done = 10
         rma.reception_move_id.picking_id.action_done()
         # Return quantity 4 of the same product to the customer
         delivery_form = Form(
-            self.env['rma.delivery.wizard'].with_context(
-                active_ids=rma.ids,
-                rma_delivery_type='return',
+            self.env["rma.delivery.wizard"].with_context(
+                active_ids=rma.ids, rma_delivery_type="return",
             )
         )
         delivery_form.product_uom_qty = 4
@@ -611,23 +617,24 @@ def test_split(self):
         delivery_wizard.action_deliver()
         rma.delivery_move_ids.quantity_done = 4
         rma.delivery_move_ids.picking_id.button_validate()
-        self.assertEqual(rma.state, 'waiting_return')
+        self.assertEqual(rma.state, "waiting_return")
         # Extract the remaining quantity to another RMA
         self.assertTrue(rma.can_be_split)
-        split_wizard = self.env['rma.split.wizard'].with_context(
-            active_id=rma.id,
-            active_ids=rma.ids,
-        ).create({})
+        split_wizard = (
+            self.env["rma.split.wizard"]
+            .with_context(active_id=rma.id, active_ids=rma.ids,)
+            .create({})
+        )
         action = split_wizard.action_split()
         # Check rma is set to 'returned' after split. Check new_rma values
-        self.assertEqual(rma.state, 'returned')
-        new_rma = self.env['rma'].browse(action['res_id'])
+        self.assertEqual(rma.state, "returned")
+        new_rma = self.env["rma"].browse(action["res_id"])
         self.assertEqual(new_rma.origin_split_rma_id, rma)
         self.assertEqual(new_rma.delivered_qty, 0)
         self.assertEqual(new_rma.remaining_qty, 6)
         self.assertEqual(new_rma.delivered_qty_done, 0)
         self.assertEqual(new_rma.remaining_qty_to_done, 6)
-        self.assertEqual(new_rma.state, 'received')
+        self.assertEqual(new_rma.state, "received")
         self.assertTrue(new_rma.can_be_refunded)
         self.assertTrue(new_rma.can_be_returned)
         self.assertTrue(new_rma.can_be_replaced)
@@ -638,21 +645,19 @@ def test_split(self):
         self.assertEqual(new_rma.reception_move_id.quantity_done, 10)
 
     def test_rma_to_receive_on_delete_invoice(self):
-        rma = self._create_confirm_receive(self.partner, self.product, 10,
-                                           self.rma_loc)
+        rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         rma.action_refund()
-        self.assertEqual(rma.state, 'refunded')
+        self.assertEqual(rma.state, "refunded")
         rma.refund_id.unlink()
         self.assertFalse(rma.refund_id)
-        self.assertEqual(rma.state, 'received')
+        self.assertEqual(rma.state, "received")
         self.assertTrue(rma.can_be_refunded)
         self.assertTrue(rma.can_be_returned)
         self.assertTrue(rma.can_be_replaced)
 
     def test_rma_picking_type_default_values(self):
-        warehouse = self.env['stock.warehouse'].create({
-            'name': 'Stock - RMA Test',
-            'code': 'SRT',
-        })
+        warehouse = self.env["stock.warehouse"].create(
+            {"name": "Stock - RMA Test", "code": "SRT",}
+        )
         self.assertFalse(warehouse.rma_in_type_id.use_create_lots)
         self.assertTrue(warehouse.rma_in_type_id.use_existing_lots)
diff --git a/rma/views/menus.xml b/rma/views/menus.xml
index 568c906d4..e5119894c 100644
--- a/rma/views/menus.xml
+++ b/rma/views/menus.xml
@@ -1,24 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-    <menuitem
-        id="rma_menu"
-        name="RMA"
-        web_icon="rma,static/description/icon.png"/>
-    <menuitem
-        id="rma_orders_menu"
-        parent="rma_menu"
-        name="Orders"
-        sequence="10"/>
+    <menuitem id="rma_menu" name="RMA" web_icon="rma,static/description/icon.png" />
+    <menuitem id="rma_orders_menu" parent="rma_menu" name="Orders" sequence="10" />
     <menuitem
         id="rma_reporting_menu"
         parent="rma_menu"
         name="Reporting"
-        sequence="20"/>
+        sequence="20"
+    />
     <menuitem
         id="rma_configuration_menu"
         parent="rma_menu"
         name="Configuration"
-        sequence="30"/>
+        sequence="30"
+    />
 </odoo>
diff --git a/rma/views/report_rma.xml b/rma/views/report_rma.xml
index 2225bab3c..2442589d8 100644
--- a/rma/views/report_rma.xml
+++ b/rma/views/report_rma.xml
@@ -5,51 +5,76 @@
             <t t-set="doc" t-value="doc.with_context(lang=doc.partner_id.lang)" />
             <t t-if="doc.partner_id">
                 <t t-set="address">
-                    <div t-field="doc.partner_id"
-                        t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}' />
-                    <p t-if="doc.partner_id.vat"><t t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"/>: <span t-field="doc.partner_id.vat"/></p>
+                    <div
+                        t-field="doc.partner_id"
+                        t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'
+                    />
+                    <p t-if="doc.partner_id.vat"><t
+                            t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"
+                        />: <span t-field="doc.partner_id.vat" /></p>
                 </t>
             </t>
-            <t t-if="(doc.partner_id or doc.partner_invoice_id) and doc.partner_id != doc.partner_invoice_id">
+            <t
+                t-if="(doc.partner_id or doc.partner_invoice_id) and doc.partner_id != doc.partner_invoice_id"
+            >
                 <t t-set="information_block">
                     <strong>Invoicing address:</strong>
-                    <div t-field="doc.partner_invoice_id"
-                    t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>
+                    <div
+                        t-field="doc.partner_invoice_id"
+                        t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
+                    />
                 </t>
             </t>
             <div class="page">
                 <h2 class="mt16">
                     <span t-if="doc.state not in ['draft', 'cancelled']">RMA # </span>
-                    <span t-field="doc.name"/>
+                    <span t-field="doc.name" />
                 </h2>
                 <div class="row mt32 mb32" id="general_information">
                     <div t-if="doc.origin" class="col-auto mw-100 mb-2">
                         <strong>Origin:</strong>
-                        <p class="m-0" t-field="doc.origin"/>
+                        <p class="m-0" t-field="doc.origin" />
                     </div>
                     <div class="col-auto mw-100 mb-2">
                         <strong>Date:</strong>
-                        <p class="m-0" t-field="doc.date"/>
+                        <p class="m-0" t-field="doc.date" />
                     </div>
                     <div t-if="doc.deadline" class="col-auto mw-100 mb-2">
                         <strong>Deadline:</strong>
-                        <p class="m-0" t-field="doc.deadline"/>
+                        <p class="m-0" t-field="doc.deadline" />
                     </div>
                     <div t-if="doc.user_id" class="col-auto mw-100 mb-2">
                         <strong>Responsible:</strong>
-                        <p class="m-0" t-field="doc.user_id"/>
+                        <p class="m-0" t-field="doc.user_id" />
                     </div>
                     <div class="col-auto mw-100 mb-2">
                         <strong>State:</strong>
                         <p class="m-0">
                             <t t-if="doc.state in ['refunded', 'replaced', 'returned']">
-                                <span class="small text-success orders_label_text_align"><i class="fa fa-fw fa-check"/> <b><span t-field="doc.state"/></b></span>
+                                <span
+                                    class="small text-success orders_label_text_align"
+                                >
+                                    <i class="fa fa-fw fa-check" />
+                                    <b>
+                                        <span t-field="doc.state" />
+                                    </b>
+                                </span>
                             </t>
                             <t t-elif="doc.state in ['cancelled', 'locked']">
-                                <span class="small text-danger orders_label_text_align"><i class="fa fa-fw fa-times"/> <b><span t-field="doc.state"/></b></span>
+                                <span class="small text-danger orders_label_text_align">
+                                    <i class="fa fa-fw fa-times" />
+                                    <b>
+                                        <span t-field="doc.state" />
+                                    </b>
+                                </span>
                             </t>
                             <t t-else="">
-                                <span class="small text-info orders_label_text_align"><i class="fa fa-fw fa-clock-o"/> <b><span t-field="doc.state"/></b></span>
+                                <span class="small text-info orders_label_text_align">
+                                    <i class="fa fa-fw fa-clock-o" />
+                                    <b>
+                                        <span t-field="doc.state" />
+                                    </b>
+                                </span>
                             </t>
                         </p>
                     </div>
@@ -57,26 +82,26 @@
                 <div class="row mt32 mb32" id="product_information">
                     <div t-if="doc.picking_id" class="col-auto mw-100 mb-2">
                         <strong>Origin delivery:</strong>
-                        <p class="m-0" t-field="doc.picking_id"/>
+                        <p class="m-0" t-field="doc.picking_id" />
                     </div>
                     <div t-if="doc.move_id" class="col-auto mw-100 mb-2">
                         <strong>Move:</strong>
-                        <p class="m-0" t-field="doc.move_id"/>
+                        <p class="m-0" t-field="doc.move_id" />
                     </div>
                     <div t-if="doc.product_id" class="col-auto mw-100 mb-2">
                         <strong>Product:</strong>
-                        <p class="m-0" t-field="doc.product_id"/>
+                        <p class="m-0" t-field="doc.product_id" />
                     </div>
                     <div t-if="doc.product_id" class="col-auto mw-100 mb-2">
                         <strong>Quantity:</strong>
                         <p class="m-0" t-field="doc.product_uom_qty">
-                            <span t-field="doc.product_uom_qty"/>
-                            <span t-field="doc.uom_id"  groups="uom.group_uom"/>
+                            <span t-field="doc.product_uom_qty" />
+                            <span t-field="doc.uom_id" groups="uom.group_uom" />
                         </p>
                     </div>
                     <div t-if="doc.delivered_qty" class="col-auto mw-100 mb-2">
                         <strong>Delivered qty:</strong>
-                        <p class="m-0" t-field="doc.delivered_qty"/>
+                        <p class="m-0" t-field="doc.delivered_qty" />
                     </div>
                 </div>
                 <div t-if="doc.description">
diff --git a/rma/views/res_partner_views.xml b/rma/views/res_partner_views.xml
index bdf58616d..45d9474c4 100644
--- a/rma/views/res_partner_views.xml
+++ b/rma/views/res_partner_views.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      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="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 name="action_view_rma"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-reply"
-                        attrs="{'invisible': [('rma_count', '=', 0)]}">
-                    <field name="rma_count"
-                           widget="statinfo"
-                           string="RMA"/>
+                <button
+                    name="action_view_rma"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-reply"
+                    attrs="{'invisible': [('rma_count', '=', 0)]}"
+                >
+                    <field name="rma_count" widget="statinfo" string="RMA" />
                 </button>
             </div>
         </field>
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index 33b6e98ec..30b404fa8 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -1,96 +1,145 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
-    <template id="portal_my_home_menu_rma" name="Portal layout : RMA menu entries" inherit_id="portal.portal_breadcrumbs" priority="35">
+    <template
+        id="portal_my_home_menu_rma"
+        name="Portal layout : RMA menu entries"
+        inherit_id="portal.portal_breadcrumbs"
+        priority="35"
+    >
         <xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
-            <li t-if="page_name == 'RMA'" t-attf-class="breadcrumb-item #{'active ' if not rma else ''}">
+            <li
+                t-if="page_name == 'RMA'"
+                t-attf-class="breadcrumb-item #{'active ' if not rma else ''}"
+            >
                 <a t-if="rma" t-attf-href="/my/rmas?{{ keep_query() }}">RMA Orders</a>
                 <t t-else="">RMA Orders</t>
             </li>
             <li t-if="rma" class="breadcrumb-item active">
-                <t t-esc="rma.name"/>
+                <t t-esc="rma.name" />
             </li>
         </xpath>
     </template>
-
-    <template id="portal_my_home_rma" name="Portal My Home : RMA entries" inherit_id="portal.portal_my_home" priority="30">
+    <template
+        id="portal_my_home_rma"
+        name="Portal My Home : RMA entries"
+        inherit_id="portal.portal_my_home"
+        priority="30"
+    >
         <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
             <t t-call="portal.portal_docs_entry" t-if="rma_count">
                 <t t-set="title">RMA Orders</t>
-                <t t-set="url" t-value="'/my/rmas'"/>
-                <t t-set="count" t-value="rma_count"/>
+                <t t-set="url" t-value="'/my/rmas'" />
+                <t t-set="count" t-value="rma_count" />
             </t>
         </xpath>
     </template>
-
     <template id="portal_my_rmas" name="My RMA Orders">
-      <t t-call="portal.portal_layout">
-        <t t-set="breadcrumbs_searchbar" t-value="True"/>
-
-        <t t-call="portal.portal_searchbar">
-            <t t-set="title">RMA Orders</t>
-        </t>
-        <t t-if="rmas" t-call="portal.portal_table">
-            <thead>
-                <tr class="active">
-                    <th>RMA #</th>
-                    <th class='d-none d-md-table-cell'>Date</th>
-                    <th>Product</th>
-                    <th class='text-right'>Quantity</th>
-                    <th class='d-none d-md-table-cell'>Status</th>
-                </tr>
-            </thead>
-            <tbody>
-                <t t-foreach="rmas" t-as="rma">
-                    <tr>
-                        <td>
-                            <a t-att-href="rma.get_portal_url()" t-att-title="rma.name">
-                                <t t-esc="rma.name"/>
-                            </a>
-                        </td>
-                        <td class="d-none d-md-table-cell"><span t-field="rma.date"/></td>
-                        <!-- Portal users don't have access to unpublished products -->
-                        <td><span t-esc="rma.sudo().product_id.display_name"/></td>
-                        <td class='text-right'><span t-field="rma.product_uom_qty"/></td>
-                        <td class="d-none d-md-table-cell tx_status">
-                            <span class="badge badge-pill badge-secondary"><span t-field="rma.state"/></span>
-                        </td>
+        <t t-call="portal.portal_layout">
+            <t t-set="breadcrumbs_searchbar" t-value="True" />
+            <t t-call="portal.portal_searchbar">
+                <t t-set="title">RMA Orders</t>
+            </t>
+            <t t-if="rmas" t-call="portal.portal_table">
+                <thead>
+                    <tr class="active">
+                        <th>RMA #</th>
+                        <th class='d-none d-md-table-cell'>Date</th>
+                        <th>Product</th>
+                        <th class='text-right'>Quantity</th>
+                        <th class='d-none d-md-table-cell'>Status</th>
                     </tr>
-                </t>
-            </tbody>
+                </thead>
+                <tbody>
+                    <t t-foreach="rmas" t-as="rma">
+                        <tr>
+                            <td>
+                                <a
+                                    t-att-href="rma.get_portal_url()"
+                                    t-att-title="rma.name"
+                                >
+                                    <t t-esc="rma.name" />
+                                </a>
+                            </td>
+                            <td class="d-none d-md-table-cell">
+                                <span t-field="rma.date" />
+                            </td>
+                            <!-- Portal users don't have access to unpublished products -->
+                            <td>
+                                <span t-esc="rma.sudo().product_id.display_name" />
+                            </td>
+                            <td class='text-right'>
+                                <span t-field="rma.product_uom_qty" />
+                            </td>
+                            <td class="d-none d-md-table-cell tx_status">
+                                <span class="badge badge-pill badge-secondary">
+                                    <span t-field="rma.state" />
+                                </span>
+                            </td>
+                        </tr>
+                    </t>
+                </tbody>
+            </t>
         </t>
-      </t>
     </template>
-
     <template id="portal_rma_page" name="My RMA">
         <t t-call="portal.portal_layout">
             <t t-set="o_portal_fullwidth_alert" groups="rma.rma_group_user_own">
                 <t t-call="portal.portal_back_in_edit_mode">
-                    <t t-set="backend_url" t-value="'/web#return_label=Website&amp;model=rma&amp;id=%s&amp;view_type=form' % (rma.id)"/>
+                    <t
+                        t-set="backend_url"
+                        t-value="'/web#return_label=Website&amp;model=rma&amp;id=%s&amp;view_type=form' % (rma.id)"
+                    />
                 </t>
             </t>
-
             <t t-call="portal.portal_record_layout">
                 <t t-set="card_header">
                     <h5 class="mb-0">
                         <span>
-                            RMA Order - <span t-field="rma.name"/>
+                            RMA Order - <span t-field="rma.name" />
                         </span>
-                        <span style="position: absolute; left: 50%;" class="d-none d-sm-inline">
-                            <a t-att-href="rma.get_portal_url(report_type='pdf', download=True)">
-                                <i class="fa fa-download" role="img" aria-label="Download" title="Download"/>
+                        <span
+                            style="position: absolute; left: 50%;"
+                            class="d-none d-sm-inline"
+                        >
+                            <a
+                                t-att-href="rma.get_portal_url(report_type='pdf', download=True)"
+                            >
+                                <i
+                                    class="fa fa-download"
+                                    role="img"
+                                    aria-label="Download"
+                                    title="Download"
+                                />
                             </a>
                         </span>
                         <span class="float-right">
                             <t t-if="rma.state in ['refunded', 'returned', 'replaced']">
-                                <span class="small text-success orders_label_text_align"><i class="fa fa-fw fa-check"/> <b><span t-field="rma.state"/></b></span>
+                                <span
+                                    class="small text-success orders_label_text_align"
+                                >
+                                    <i class="fa fa-fw fa-check" />
+                                    <b>
+                                        <span t-field="rma.state" />
+                                    </b>
+                                </span>
                             </t>
                             <t t-elif="rma.state in ['cancelled', 'locked']">
-                                <span class="small text-danger orders_label_text_align"><i class="fa fa-fw fa-times"/> <b><span t-field="rma.state"/></b></span>
+                                <span class="small text-danger orders_label_text_align">
+                                    <i class="fa fa-fw fa-times" />
+                                    <b>
+                                        <span t-field="rma.state" />
+                                    </b>
+                                </span>
                             </t>
                             <t t-else="">
-                                <span class="small text-info orders_label_text_align"><i class="fa fa-fw fa-clock-o"/> <b><span t-field="rma.state"/></b></span>
+                                <span class="small text-info orders_label_text_align">
+                                    <i class="fa fa-fw fa-clock-o" />
+                                    <b>
+                                        <span t-field="rma.state" />
+                                    </b>
+                                </span>
                             </t>
                         </span>
                     </h5>
@@ -98,27 +147,60 @@
                 <t t-set="card_body">
                     <div id="general_information">
                         <div class="row mt4">
-                            <div t-if="rma.partner_id" class="col-12 col-md-6 mb-4 mb-md-0">
-                                <h6><strong>Customer:</strong></h6>
+                            <div
+                                t-if="rma.partner_id"
+                                class="col-12 col-md-6 mb-4 mb-md-0"
+                            >
+                                <h6>
+                                    <strong>Customer:</strong>
+                                </h6>
                                 <div class="row">
                                     <div class="col flex-grow-0 pr-3">
-                                        <img t-if="rma.partner_id.image" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(rma.partner_id.image)" alt="Contact"/>
-                                        <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                        <img
+                                            t-if="rma.partner_id.image"
+                                            class="rounded-circle mt-1 o_portal_contact_img"
+                                            t-att-src="image_data_uri(rma.partner_id.image)"
+                                            alt="Contact"
+                                        />
+                                        <img
+                                            t-else=""
+                                            class="rounded-circle mt-1 o_portal_contact_img"
+                                            src="/web/static/src/img/user_menu_avatar.png"
+                                            alt="Contact"
+                                        />
                                     </div>
                                     <div class="col pl-sm-0">
-                                        <address t-field="rma.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                        <address
+                                            t-field="rma.partner_id"
+                                            t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'
+                                        />
                                     </div>
                                 </div>
                             </div>
                             <div t-if="rma.user_id" class="col-12 col-md-6">
-                                <h6><strong>Responsible:</strong></h6>
+                                <h6>
+                                    <strong>Responsible:</strong>
+                                </h6>
                                 <div class="row">
                                     <div class="col flex-grow-0 pr-3">
-                                        <img t-if="rma.user_id.image" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(rma.user_id.image)" alt="Contact"/>
-                                        <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                        <img
+                                            t-if="rma.user_id.image"
+                                            class="rounded-circle mt-1 o_portal_contact_img"
+                                            t-att-src="image_data_uri(rma.user_id.image)"
+                                            alt="Contact"
+                                        />
+                                        <img
+                                            t-else=""
+                                            class="rounded-circle mt-1 o_portal_contact_img"
+                                            src="/web/static/src/img/user_menu_avatar.png"
+                                            alt="Contact"
+                                        />
                                     </div>
                                     <div class="col pl-sm-0">
-                                        <address t-field="rma.user_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
+                                        <address
+                                            t-field="rma.user_id"
+                                            t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'
+                                        />
                                     </div>
                                 </div>
                             </div>
@@ -130,25 +212,33 @@
                                         <strong>Origin delivery</strong>
                                     </div>
                                     <div class="col-12 col-sm-8">
-                                        <span t-field="rma.picking_id"/>
+                                        <span t-field="rma.picking_id" />
                                     </div>
                                 </div>
                                 <!-- We need to prevent access errors if the product is
                                      unpublished-->
-                                <div t-if="rma.sudo().product_id" class="row mb-2 mb-sm-1">
+                                <div
+                                    t-if="rma.sudo().product_id"
+                                    class="row mb-2 mb-sm-1"
+                                >
                                     <div class="col-12 col-sm-4">
                                         <strong>Product</strong>
                                     </div>
                                     <div class="col-12 col-sm-8">
-                                        <span t-esc="rma.sudo().product_id.display_name"/>
+                                        <span
+                                            t-esc="rma.sudo().product_id.display_name"
+                                        />
                                     </div>
                                 </div>
-                                <div t-if="rma.product_uom_qty" class="row mb-2 mb-sm-1">
+                                <div
+                                    t-if="rma.product_uom_qty"
+                                    class="row mb-2 mb-sm-1"
+                                >
                                     <div class="col-12 col-sm-4">
                                         <strong>Quantity</strong>
                                     </div>
                                     <div class="col-12 col-sm-8">
-                                        <span t-field="rma.product_uom_qty"/>
+                                        <span t-field="rma.product_uom_qty" />
                                     </div>
                                 </div>
                                 <div t-if="rma.delivered_qty" class="row">
@@ -156,7 +246,7 @@
                                         <strong>Delivered quantity</strong>
                                     </div>
                                     <div class="col-12 col-sm-8">
-                                        <span t-field="rma.delivered_qty"/>
+                                        <span t-field="rma.delivered_qty" />
                                     </div>
                                 </div>
                             </div>
@@ -166,7 +256,10 @@
                                         <strong>RMA Date</strong>
                                     </div>
                                     <div class="col-12 col-sm-8">
-                                        <span t-field="rma.date" t-options='{"widget": "date"}'/>
+                                        <span
+                                            t-field="rma.date"
+                                            t-options='{"widget": "date"}'
+                                        />
                                     </div>
                                 </div>
                                 <div t-if="rma.deadline" class="row mb-2 mb-sm-1">
@@ -174,7 +267,10 @@
                                         <strong>Deadline</strong>
                                     </div>
                                     <div class="col-12 col-sm-8">
-                                        <span t-field="rma.deadline" t-options='{"widget": "date"}'/>
+                                        <span
+                                            t-field="rma.deadline"
+                                            t-options='{"widget": "date"}'
+                                        />
                                     </div>
                                 </div>
                                 <div t-if="rma.origin" class="row">
@@ -182,72 +278,170 @@
                                         <strong>Origin</strong>
                                     </div>
                                     <div class="col-12 col-sm-8">
-                                        <span t-field="rma.origin"/>
+                                        <span t-field="rma.origin" />
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                    <section t-if="rma.reception_move_id" id="reception_section" style="page-break-inside: auto;" class="mt32">
+                    <section
+                        t-if="rma.reception_move_id"
+                        id="reception_section"
+                        style="page-break-inside: auto;"
+                        class="mt32"
+                    >
                         <strong class="d-block mb-1">Reception</strong>
-                        <t t-set="picking" t-value="rma.reception_move_id.picking_id"/>
-                        <t t-set="report_url" t-value="'/my/rma/picking/pdf/%s/%s?%s' % (rma.id, picking.id, keep_query())"/>
-                        <a class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3" t-att-href="report_url">
+                        <t t-set="picking" t-value="rma.reception_move_id.picking_id" />
+                        <t
+                            t-set="report_url"
+                            t-value="'/my/rma/picking/pdf/%s/%s?%s' % (rma.id, picking.id, keep_query())"
+                        />
+                        <a
+                            class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3"
+                            t-att-href="report_url"
+                        >
                             <div>
-                                <i class="fa fa-truck mr-1" role="img" aria-label="Download" title="Download"/>
-                                <span t-esc="picking.name" class="mr-lg-3"/>
-                                <div class="d-lg-inline-block">Date: <span class="text-muted" t-field="picking.date"/></div>
+                                <i
+                                    class="fa fa-truck mr-1"
+                                    role="img"
+                                    aria-label="Download"
+                                    title="Download"
+                                />
+                                <span t-esc="picking.name" class="mr-lg-3" />
+                                <div class="d-lg-inline-block">Date: <span
+                                        class="text-muted"
+                                        t-field="picking.date"
+                                    /></div>
                             </div>
                             <t t-if="picking.state == 'done'">
-                                <span class="badge badge-success label-text-align"><i class="fa fa-fw fa-truck"/> Shipped</span>
+                                <span class="badge badge-success label-text-align"><i
+                                        class="fa fa-fw fa-truck"
+                                    /> Shipped</span>
                             </t>
                             <t t-if="picking.state == 'partially_available'">
-                                <span class="badge badge-warning label-text-align"><i class="fa fa-fw fa-clock-o"/> Partially Available</span>
+                                <span class="badge badge-warning label-text-align"><i
+                                        class="fa fa-fw fa-clock-o"
+                                    /> Partially Available</span>
                             </t>
                             <t t-if="picking.state == 'cancel'">
-                                <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"><i
+                                        class="fa fa-fw fa-times"
+                                    /> Cancelled</span>
                             </t>
-                            <t t-if="picking.state in ['draft', 'waiting', 'confirmed', 'assigned']">
-                                <span class="badge badge-info label-text-align"><i class="fa fa-fw fa-clock-o"/> Preparation</span>
+                            <t
+                                t-if="picking.state in ['draft', 'waiting', 'confirmed', 'assigned']"
+                            >
+                                <span class="badge badge-info label-text-align"><i
+                                        class="fa fa-fw fa-clock-o"
+                                    /> Preparation</span>
                             </t>
                         </a>
                     </section>
-                    <section t-if="rma.refund_id" id="refund_section" style="page-break-inside: auto;" class="mt32">
+                    <section
+                        t-if="rma.refund_id"
+                        id="refund_section"
+                        style="page-break-inside: auto;"
+                        class="mt32"
+                    >
                         <strong class="d-block mb-1">Refund</strong>
-                        <t t-set="refund" t-value="rma.refund_id"/>
-                        <t t-set="report_url" t-value="refund.get_portal_url(report_type='pdf')"/>
-                        <a class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3" t-att-href="report_url">
+                        <t t-set="refund" t-value="rma.refund_id" />
+                        <t
+                            t-set="report_url"
+                            t-value="refund.get_portal_url(report_type='pdf')"
+                        />
+                        <a
+                            class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3"
+                            t-att-href="report_url"
+                        >
                             <div>
-                                <i class="fa fa-pencil-square-o mr-1" role="img" aria-label="Download" title="Download"/>
-                                <span t-esc="refund.number" class="mr-lg-3"/>
-                                <div class="d-lg-inline-block">Date: <span class="text-muted" t-field="refund.date_invoice"/></div>
+                                <i
+                                    class="fa fa-pencil-square-o mr-1"
+                                    role="img"
+                                    aria-label="Download"
+                                    title="Download"
+                                />
+                                <span t-esc="refund.number" class="mr-lg-3" />
+                                <div class="d-lg-inline-block">Date: <span
+                                        class="text-muted"
+                                        t-field="refund.date_invoice"
+                                    /></div>
                             </div>
-                            <span t-if="refund.state == 'paid'" class="small text-success orders_label_text_align"><i class="fa fa-fw fa-check"/> <b>Paid</b></span>
-                            <span t-else="" class="small text-info orders_label_text_align"><i class="fa fa-fw fa-clock-o"/> <b>Waiting Payment</b></span>
+                            <span
+                                t-if="refund.state == 'paid'"
+                                class="small text-success orders_label_text_align"
+                            >
+                                <i class="fa fa-fw fa-check" />
+                                <b>Paid</b>
+                            </span>
+                            <span
+                                t-else=""
+                                class="small text-info orders_label_text_align"
+                            >
+                                <i class="fa fa-fw fa-clock-o" />
+                                <b>Waiting Payment</b>
+                            </span>
                         </a>
                     </section>
-                    <section t-if="rma.delivery_move_ids" id="reception_section" style="page-break-inside: auto;" class="mt32">
+                    <section
+                        t-if="rma.delivery_move_ids"
+                        id="reception_section"
+                        style="page-break-inside: auto;"
+                        class="mt32"
+                    >
                         <strong class="d-block mb-1">Delivery</strong>
                         <ul class="list-group mb-4">
-                            <t t-foreach="rma.delivery_move_ids.mapped('picking_id')" t-as="picking">
-                                <t t-set="report_url" t-value="'/my/rma/picking/pdf/%s/%s?%s' % (rma.id, picking.id, keep_query())"/>
-                                <a class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3" t-att-href="report_url">
+                            <t
+                                t-foreach="rma.delivery_move_ids.mapped('picking_id')"
+                                t-as="picking"
+                            >
+                                <t
+                                    t-set="report_url"
+                                    t-value="'/my/rma/picking/pdf/%s/%s?%s' % (rma.id, picking.id, keep_query())"
+                                />
+                                <a
+                                    class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3"
+                                    t-att-href="report_url"
+                                >
                                     <div>
-                                        <i class="fa fa-truck mr-1" role="img" aria-label="Download" title="Download"/>
-                                        <span t-esc="picking.name" class="mr-lg-3"/>
-                                        <div class="d-lg-inline-block">Date: <span class="text-muted" t-field="picking.date"/></div>
+                                        <i
+                                            class="fa fa-truck mr-1"
+                                            role="img"
+                                            aria-label="Download"
+                                            title="Download"
+                                        />
+                                        <span t-esc="picking.name" class="mr-lg-3" />
+                                        <div class="d-lg-inline-block">Date: <span
+                                                class="text-muted"
+                                                t-field="picking.date"
+                                            /></div>
                                     </div>
                                     <t t-if="picking.state == 'done'">
-                                        <span class="badge badge-success label-text-align"><i class="fa fa-fw fa-truck"/> Shipped</span>
+                                        <span
+                                            class="badge badge-success label-text-align"
+                                        ><i class="fa fa-fw fa-truck" /> Shipped</span>
                                     </t>
                                     <t t-if="picking.state == 'partially_available'">
-                                        <span class="badge badge-warning label-text-align"><i class="fa fa-fw fa-clock-o"/> Partially Available</span>
+                                        <span
+                                            class="badge badge-warning label-text-align"
+                                        ><i
+                                                class="fa fa-fw fa-clock-o"
+                                            /> Partially Available</span>
                                     </t>
                                     <t t-if="picking.state == 'cancel'">
-                                        <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"
+                                        ><i
+                                                class="fa fa-fw fa-times"
+                                            /> Cancelled</span>
                                     </t>
-                                    <t t-if="picking.state in ['draft', 'waiting', 'confirmed', 'assigned']">
-                                        <span class="badge badge-info label-text-align"><i class="fa fa-fw fa-clock-o"/> Preparation</span>
+                                    <t
+                                        t-if="picking.state in ['draft', 'waiting', 'confirmed', 'assigned']"
+                                    >
+                                        <span
+                                            class="badge badge-info label-text-align"
+                                        ><i
+                                                class="fa fa-fw fa-clock-o"
+                                            /> Preparation</span>
                                     </t>
                                 </a>
                             </t>
@@ -255,8 +449,8 @@
                     </section>
                     <section id="description" class="mt-5" t-if="rma.description">
                         <h3 class="">Description</h3>
-                        <hr class="mt-0 mb-1"/>
-                        <t t-raw="rma.description"/>
+                        <hr class="mt-0 mb-1" />
+                        <t t-raw="rma.description" />
                     </section>
                 </t>
             </t>
@@ -264,10 +458,10 @@
             <div id="rma_communication" class="mt-4">
                 <h2>Communication</h2>
                 <t t-call="portal.message_thread">
-                    <t t-set="object" t-value="rma"/>
-                    <t t-set="token" t-value="rma.access_token"/>
-                    <t t-set="pid" t-value="pid"/>
-                    <t t-set="hash" t-value="hash"/>
+                    <t t-set="object" t-value="rma" />
+                    <t t-set="token" t-value="rma.access_token" />
+                    <t t-set="pid" t-value="pid" />
+                    <t t-set="hash" t-value="hash" />
                 </t>
             </div>
         </t>
diff --git a/rma/views/rma_team_views.xml b/rma/views/rma_team_views.xml
index 9202da2dd..55285afad 100644
--- a/rma/views/rma_team_views.xml
+++ b/rma/views/rma_team_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
@@ -20,8 +20,17 @@
             <form>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                        <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
-                            <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+                        <button
+                            name="toggle_active"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-archive"
+                        >
+                            <field
+                                name="active"
+                                widget="boolean_button"
+                                options='{"terminology": "archive"}'
+                            />
                         </button>
                     </div>
                     <div class="oe_title">
@@ -33,22 +42,49 @@
                     <group>
                         <group>
                             <field name="user_id" />
-                            <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company" />
+                            <field
+                                name="company_id"
+                                options="{'no_create': True}"
+                                groups="base.group_multi_company"
+                            />
                         </group>
                     </group>
                     <notebook>
                         <page name="members" string="Team Members">
-                            <field name="member_ids" widget="many2many" options="{'not_delete': True}">
-                                <kanban quick_create="false" create="true" delete="true">
-                                    <field name="id"/>
-                                    <field name="name"/>
+                            <field
+                                name="member_ids"
+                                widget="many2many"
+                                options="{'not_delete': True}"
+                            >
+                                <kanban
+                                    quick_create="false"
+                                    create="true"
+                                    delete="true"
+                                >
+                                    <field name="id" />
+                                    <field name="name" />
                                     <templates>
                                         <t t-name="kanban-box">
-                                            <div class="oe_kanban_global_click" style="max-width: 200px">
+                                            <div
+                                                class="oe_kanban_global_click"
+                                                style="max-width: 200px"
+                                            >
                                                 <div class="o_kanban_record_top">
-                                                    <img t-att-src="kanban_image('res.users', 'image_small', record.id.raw_value)" height="40" width="40" class="oe_avatar oe_kanban_avatar_smallbox mb0" alt="Avatar"/>
-                                                    <div class="o_kanban_record_headings ml8">
-                                                        <strong class="o_kanban_record_title"><field name="name"/></strong>
+                                                    <img
+                                                        t-att-src="kanban_image('res.users', 'image_small', record.id.raw_value)"
+                                                        height="40"
+                                                        width="40"
+                                                        class="oe_avatar oe_kanban_avatar_smallbox mb0"
+                                                        alt="Avatar"
+                                                    />
+                                                    <div
+                                                        class="o_kanban_record_headings ml8"
+                                                    >
+                                                        <strong
+                                                            class="o_kanban_record_title"
+                                                        >
+                                                            <field name="name" />
+                                                        </strong>
                                                     </div>
                                                 </div>
                                             </div>
@@ -57,30 +93,51 @@
                                 </kanban>
                             </field>
                         </page>
-                        <page name="emails" string="Email" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                        <page
+                            name="emails"
+                            string="Email"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}"
+                        >
                             <group name="group_alias">
-                                <label for="alias_name" string="Email Alias"/>
+                                <label for="alias_name" string="Email Alias" />
                                 <div name="alias_def">
-                                    <field name="alias_id" class="oe_read_only oe_inline"
-                                            string="Email Alias" required="0"/>
-                                    <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
-                                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                                    <field
+                                        name="alias_id"
+                                        class="oe_read_only oe_inline"
+                                        string="Email Alias"
+                                        required="0"
+                                    />
+                                    <div
+                                        class="oe_edit_only oe_inline"
+                                        name="edit_alias"
+                                        style="display: inline;"
+                                    >
+                                        <field
+                                            name="alias_name"
+                                            class="oe_inline"
+                                        />@<field
+                                            name="alias_domain"
+                                            class="oe_inline"
+                                            readonly="1"
+                                        />
                                     </div>
                                 </div>
-                                <field name="alias_contact" class="oe_inline oe_edit_only"
-                                        string="Accept Emails From"/>
+                                <field
+                                    name="alias_contact"
+                                    class="oe_inline oe_edit_only"
+                                    string="Accept Emails From"
+                                />
                             </group>
                         </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="message_ids" widget="mail_thread" />
                 </div>
             </form>
         </field>
     </record>
-
     <record id="rma_team_action" model="ir.actions.act_window">
         <field name="name">RMA team</field>
         <field name="res_model">rma.team</field>
@@ -92,10 +149,10 @@
             </p>
         </field>
     </record>
-
     <menuitem
         id="rma_configuration_rma_team_menu"
         name="RMA Team"
         parent="rma_configuration_menu"
-        action="rma_team_action"/>
+        action="rma_team_action"
+    />
 </odoo>
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 6885d52b9..a9434bc39 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
@@ -9,214 +9,290 @@
             <search>
                 <field name="name" />
                 <field name="user_id" />
-                <filter name="draft_filter"
-                        string="Draft"
-                        domain="[('state','=', 'draft')]" />
-                <filter name="confirmed_filter"
-                        string="Confirmed"
-                        domain="[('state','=', 'confirmed')]" />
-                <filter name="received_filter"
-                        string="Received"
-                        domain="[('state','=', 'received')]" />
+                <filter
+                    name="draft_filter"
+                    string="Draft"
+                    domain="[('state','=', 'draft')]"
+                />
+                <filter
+                    name="confirmed_filter"
+                    string="Confirmed"
+                    domain="[('state','=', 'confirmed')]"
+                />
+                <filter
+                    name="received_filter"
+                    string="Received"
+                    domain="[('state','=', 'received')]"
+                />
                 <separator />
-                <filter string="Unresolved RMAs"
-                        name="undone_rma"
-                        domain="[('state', 'not in', ['refunded', 'returned', 'replaced', 'locked', 'cancelled'])]"
-                        help="RMAs yet to be fully processed"/>
-                <filter string="Late RMAs"
-                        name="late_rma"
-                        domain="[('deadline', '&lt;', context_today().strftime('%Y-%m-%d')), ('state', 'not in', ['refunded', 'returned', 'replaced', 'locked', 'cancelled'])]"
-                        help="RMAs which deadline has passed"/>
+                <filter
+                    string="Unresolved RMAs"
+                    name="undone_rma"
+                    domain="[('state', 'not in', ['refunded', 'returned', 'replaced', 'locked', 'cancelled'])]"
+                    help="RMAs yet to be fully processed"
+                />
+                <filter
+                    string="Late RMAs"
+                    name="late_rma"
+                    domain="[('deadline', '&lt;', context_today().strftime('%Y-%m-%d')), ('state', 'not in', ['refunded', 'returned', 'replaced', 'locked', 'cancelled'])]"
+                    help="RMAs which deadline has passed"
+                />
                 <separator />
-                <filter string="RMA Date" name="filter_rma_date" date="date"/>
-                <filter string="RMA Deadline" name="filter_rma_deadline" date="deadline"/>
-                <filter name="no_user_id_filter"
-                        string="Unassigned RMAs"
-                        domain="[('user_id','=', False)]" />
+                <filter string="RMA Date" name="filter_rma_date" date="date" />
+                <filter
+                    string="RMA Deadline"
+                    name="filter_rma_deadline"
+                    date="deadline"
+                />
+                <filter
+                    name="no_user_id_filter"
+                    string="Unassigned RMAs"
+                    domain="[('user_id','=', False)]"
+                />
                 <group string="Group By" name="group_by">
-                    <filter string="Partner"
-                            name="partner_id_group_by"
-                            context="{'group_by':'partner_id'}" />
-                    <filter string="Responsible"
-                            name="user_id_group_by"
-                            context="{'group_by':'user_id'}" />
-                    <filter string="State"
-                            name="state_group_by"
-                            context="{'group_by':'state'}" />
-                    <filter string="Date"
-                            name="date_group_by"
-                            context="{'group_by':'date'}" />
-                    <filter string="Deadline"
-                            name="deadline_group_by"
-                            context="{'group_by':'deadline'}" />
+                    <filter
+                        string="Partner"
+                        name="partner_id_group_by"
+                        context="{'group_by':'partner_id'}"
+                    />
+                    <filter
+                        string="Responsible"
+                        name="user_id_group_by"
+                        context="{'group_by':'user_id'}"
+                    />
+                    <filter
+                        string="State"
+                        name="state_group_by"
+                        context="{'group_by':'state'}"
+                    />
+                    <filter
+                        string="Date"
+                        name="date_group_by"
+                        context="{'group_by':'date'}"
+                    />
+                    <filter
+                        string="Deadline"
+                        name="deadline_group_by"
+                        context="{'group_by':'deadline'}"
+                    />
                 </group>
             </search>
         </field>
     </record>
-
     <record id="rma_view_tree" model="ir.ui.view">
         <field name="name">rma.view.tree</field>
         <field name="model">rma</field>
         <field name="arch" type="xml">
-            <tree decoration-muted="state in ['cancelled', 'locked']"
-                  decoration-bf="state == 'draft' and product_id == False"
-                  decoration-danger="deadline and (deadline &lt; current_date)">
-                <field name="name"/>
-                <field name="origin"/>
-                <field name="user_id"/>
-                <field name="partner_id"/>
-                <field name="product_id"/>
-                <field name="product_uom_qty"/>
-                <field name="product_uom" groups="uom.group_uom"/>
-                <field name="date"/>
-                <field name="deadline"/>
-                <field name="state"/>
+            <tree
+                decoration-muted="state in ['cancelled', 'locked']"
+                decoration-bf="state == 'draft' and product_id == False"
+                decoration-danger="deadline and (deadline &lt; current_date)"
+            >
+                <field name="name" />
+                <field name="origin" />
+                <field name="user_id" />
+                <field name="partner_id" />
+                <field name="product_id" />
+                <field name="product_uom_qty" />
+                <field name="product_uom" groups="uom.group_uom" />
+                <field name="date" />
+                <field name="deadline" />
+                <field name="state" />
             </tree>
         </field>
     </record>
-
     <record id="rma_view_form" model="ir.ui.view">
         <field name="name">rma.view.form</field>
         <field name="model">rma</field>
         <field name="arch" type="xml">
             <form>
                 <header>
-                    <button name="%(portal.portal_share_action)d"
-                            string="Share"
-                            type="action"
-                            class="oe_highlight oe_read_only"/>
-                    <button type="object"
-                            string="Send by Email"
-                            name="action_rma_send"
-                            attrs="{'invisible':['|', ('sent','=',True), ('state', 'not in', ['draft', 'confirmed', 'received'])]}"
-                            class="btn-primary"/>
-                    <button type="object"
-                            string="Send by Mail"
-                            name="action_rma_send"
-                            attrs="{'invisible':['|', ('sent','=',False), ('state', 'not in', ['draft', 'confirmed', 'received'])]}" />
-                    <button type="object"
-                            string="Confirm"
-                            name="action_confirm"
-                            states="draft"
-                            class="btn-primary"/>
-                    <button type="object"
-                            string="To Refund"
-                            name="action_refund"
-                            attrs="{'invisible': [('can_be_refunded', '=', False)]}"
-                            class="btn-primary"/>
-                    <button type="object"
-                            string="Replace"
-                            name="action_replace"
-                            attrs="{'invisible': [('can_be_replaced', '=', False)]}"
-                            class="btn-primary"/>
-                    <button type="object"
-                            string="Return to customer"
-                            name="action_return"
-                            attrs="{'invisible': [('can_be_returned', '=', False)]}"
-                            class="btn-primary"/>
-                    <button type="object"
-                            string="Split"
-                            name="action_split"
-                            attrs="{'invisible': [('can_be_split', '=', False)]}"/>
-                    <button type="object"
-                            string="Cancel"
-                            name="action_cancel"
-                            confirm="Are you sure you want to cancel this RMA"
-                            states="draft,confirmed"/>
-                    <button type="object"
-                            string="Set to draft"
-                            name="action_draft"
-                            states="cancelled"/>
-                    <button type="object"
-                            string="Lock"
-                            name="action_lock"
-                            attrs="{'invisible': [('can_be_locked', '=', False)]}"/>
-                    <button type="object"
-                            string="Unlock"
-                            name="action_unlock"
-                            states="locked"/>
-                    <button type="object"
-                            string="Preview"
-                            name="action_preview"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,received"/>
+                    <button
+                        name="%(portal.portal_share_action)d"
+                        string="Share"
+                        type="action"
+                        class="oe_highlight oe_read_only"
+                    />
+                    <button
+                        type="object"
+                        string="Send by Email"
+                        name="action_rma_send"
+                        attrs="{'invisible':['|', ('sent','=',True), ('state', 'not in', ['draft', 'confirmed', 'received'])]}"
+                        class="btn-primary"
+                    />
+                    <button
+                        type="object"
+                        string="Send by Mail"
+                        name="action_rma_send"
+                        attrs="{'invisible':['|', ('sent','=',False), ('state', 'not in', ['draft', 'confirmed', 'received'])]}"
+                    />
+                    <button
+                        type="object"
+                        string="Confirm"
+                        name="action_confirm"
+                        states="draft"
+                        class="btn-primary"
+                    />
+                    <button
+                        type="object"
+                        string="To Refund"
+                        name="action_refund"
+                        attrs="{'invisible': [('can_be_refunded', '=', False)]}"
+                        class="btn-primary"
+                    />
+                    <button
+                        type="object"
+                        string="Replace"
+                        name="action_replace"
+                        attrs="{'invisible': [('can_be_replaced', '=', False)]}"
+                        class="btn-primary"
+                    />
+                    <button
+                        type="object"
+                        string="Return to customer"
+                        name="action_return"
+                        attrs="{'invisible': [('can_be_returned', '=', False)]}"
+                        class="btn-primary"
+                    />
+                    <button
+                        type="object"
+                        string="Split"
+                        name="action_split"
+                        attrs="{'invisible': [('can_be_split', '=', False)]}"
+                    />
+                    <button
+                        type="object"
+                        string="Cancel"
+                        name="action_cancel"
+                        confirm="Are you sure you want to cancel this RMA"
+                        states="draft,confirmed"
+                    />
+                    <button
+                        type="object"
+                        string="Set to draft"
+                        name="action_draft"
+                        states="cancelled"
+                    />
+                    <button
+                        type="object"
+                        string="Lock"
+                        name="action_lock"
+                        attrs="{'invisible': [('can_be_locked', '=', False)]}"
+                    />
+                    <button
+                        type="object"
+                        string="Unlock"
+                        name="action_unlock"
+                        states="locked"
+                    />
+                    <button type="object" string="Preview" name="action_preview" />
+                    <field
+                        name="state"
+                        widget="statusbar"
+                        statusbar_visible="draft,confirmed,received"
+                    />
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                        <button type="object"
-                                name="action_view_receipt"
-                                string="Receipt"
-                                class="oe_stat_button"
-                                icon="fa-truck"
-                                attrs="{'invisible': [('reception_move_id', '=', False)]}">
+                        <button
+                            type="object"
+                            name="action_view_receipt"
+                            string="Receipt"
+                            class="oe_stat_button"
+                            icon="fa-truck"
+                            attrs="{'invisible': [('reception_move_id', '=', False)]}"
+                        >
                         </button>
-                        <button type="object"
-                                name="action_view_delivery"
-                                class="oe_stat_button"
-                                icon="fa-truck"
-                                attrs="{'invisible': [('delivery_picking_count', '=', 0)]}">
-                            <field name="delivery_picking_count" widget="statinfo" string="Delivery"/>
+                        <button
+                            type="object"
+                            name="action_view_delivery"
+                            class="oe_stat_button"
+                            icon="fa-truck"
+                            attrs="{'invisible': [('delivery_picking_count', '=', 0)]}"
+                        >
+                            <field
+                                name="delivery_picking_count"
+                                widget="statinfo"
+                                string="Delivery"
+                            />
                         </button>
-                        <button type="object"
-                                string="Refund"
-                                name="action_view_refund"
-                                class="oe_stat_button"
-                                icon="fa-pencil-square-o"
-                                attrs="{'invisible': [('refund_id', '=', False)]}">
+                        <button
+                            type="object"
+                            string="Refund"
+                            name="action_view_refund"
+                            class="oe_stat_button"
+                            icon="fa-pencil-square-o"
+                            attrs="{'invisible': [('refund_id', '=', False)]}"
+                        >
                         </button>
                     </div>
                     <div class="oe_title">
                         <h1>
-                            <field name="name" readonly="1"/>
+                            <field name="name" readonly="1" />
                         </h1>
                     </div>
                     <group>
                         <group>
-                            <field name="partner_id" widget="res_partner_many2one" context="{'search_default_customer':1, 'show_address': 1, 'show_vat': True}" options="{'always_reload': True}"/>
-                            <field name="partner_invoice_id"/>
-                            <field name="picking_id"
-                                   options="{'no_create': True}"/>
-                            <field name="move_id"
-                                   attrs="{'required': [('picking_id', '!=', False)], 'readonly': ['|', ('picking_id', '=', False), ('state', '!=', 'draft')]}"
-                                   options="{'no_create': True}"
-                                   force_save="1"/>
-                            <field name="product_id"
-                                   force_save="1"
-                                   attrs="{'readonly': ['|', ('picking_id', '!=', False), ('state', '!=', 'draft')]}"/>
-                            <label for="product_uom_qty"/>
+                            <field
+                                name="partner_id"
+                                widget="res_partner_many2one"
+                                context="{'search_default_customer':1, 'show_address': 1, 'show_vat': True}"
+                                options="{'always_reload': True}"
+                            />
+                            <field name="partner_invoice_id" />
+                            <field name="picking_id" options="{'no_create': True}" />
+                            <field
+                                name="move_id"
+                                attrs="{'required': [('picking_id', '!=', False)], 'readonly': ['|', ('picking_id', '=', False), ('state', '!=', 'draft')]}"
+                                options="{'no_create': True}"
+                                force_save="1"
+                            />
+                            <field
+                                name="product_id"
+                                force_save="1"
+                                attrs="{'readonly': ['|', ('picking_id', '!=', False), ('state', '!=', 'draft')]}"
+                            />
+                            <label for="product_uom_qty" />
                             <div class="o_row">
-                                <field name="product_uom_qty"/>
-                                <field name="product_uom"
-                                       groups="uom.group_uom"/>
+                                <field name="product_uom_qty" />
+                                <field name="product_uom" groups="uom.group_uom" />
                             </div>
-                            <field name="delivered_qty"
-                                   attrs="{'invisible': [('delivered_qty', '=', 0.0)]}"/>
+                            <field
+                                name="delivered_qty"
+                                attrs="{'invisible': [('delivered_qty', '=', 0.0)]}"
+                            />
                         </group>
                         <group>
-                            <field name="date"/>
-                            <field name="user_id"/>
-                            <field name="team_id"/>
-                            <field name="origin"/>
-                            <field name="operation_id"/>
-                            <field name="company_id"
-                                   options="{'no_create': True}"
-                                   groups="base.group_multi_company"/>
+                            <field name="date" />
+                            <field name="user_id" />
+                            <field name="team_id" />
+                            <field name="origin" />
+                            <field name="operation_id" />
+                            <field
+                                name="company_id"
+                                options="{'no_create': True}"
+                                groups="base.group_multi_company"
+                            />
                         </group>
                     </group>
                     <notebook>
-                        <page name="page_other"
-                              string="Other Information">
+                        <page name="page_other" string="Other Information">
                             <group>
                                 <group>
-                                    <field name="procurement_group_id"/>
-                                    <field name="location_id"
-                                           options="{'no_create': True, 'no_open': True}"
-                                           groups="stock.group_stock_multi_locations" />
+                                    <field name="procurement_group_id" />
+                                    <field
+                                        name="location_id"
+                                        options="{'no_create': True, 'no_open': True}"
+                                        groups="stock.group_stock_multi_locations"
+                                    />
                                 </group>
                                 <group>
-                                    <field name="deadline"/>
-                                    <field name="priority" widget="priority"/>
-                                    <field name="origin_split_rma_id"
-                                           attrs="{'invisible': [('origin_split_rma_id', '=', False)]}"/>
+                                    <field name="deadline" />
+                                    <field name="priority" widget="priority" />
+                                    <field
+                                        name="origin_split_rma_id"
+                                        attrs="{'invisible': [('origin_split_rma_id', '=', False)]}"
+                                    />
                                 </group>
                             </group>
                             <group>
@@ -224,59 +300,55 @@
                             </group>
                         </page>
                     </notebook>
-                    <field name="sent" invisible="1"/>
-                    <field name="reception_move_id" invisible="1"/>
-                    <field name="refund_id" invisible="1"/>
-                    <field name="can_be_refunded" invisible="1"/>
-                    <field name="can_be_returned" invisible="1"/>
-                    <field name="can_be_replaced" invisible="1"/>
-                    <field name="can_be_split" invisible="1"/>
-                    <field name="can_be_locked" invisible="1"/>
-                    <field name="commercial_partner_id" invisible="1"/>
-                    <field name="remaining_qty" invisible="1"/>
+                    <field name="sent" invisible="1" />
+                    <field name="reception_move_id" invisible="1" />
+                    <field name="refund_id" invisible="1" />
+                    <field name="can_be_refunded" invisible="1" />
+                    <field name="can_be_returned" invisible="1" />
+                    <field name="can_be_replaced" invisible="1" />
+                    <field name="can_be_split" invisible="1" />
+                    <field name="can_be_locked" invisible="1" />
+                    <field name="commercial_partner_id" invisible="1" />
+                    <field name="remaining_qty" invisible="1" />
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="activity_ids" widget="mail_activity"/>
-                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_follower_ids" widget="mail_followers" />
+                    <field name="activity_ids" widget="mail_activity" />
+                    <field name="message_ids" widget="mail_thread" />
                 </div>
             </form>
         </field>
     </record>
-
     <record id="rma_view_pivot" model="ir.ui.view">
         <field name="name">rma.pivot</field>
         <field name="model">rma</field>
         <field name="arch" type="xml">
             <pivot>
-                <field name="date" type="row"/>
-                <field name="product_uom_qty" type="measure"/>
-                <field name="delivered_qty" type="measure"/>
+                <field name="date" type="row" />
+                <field name="product_uom_qty" type="measure" />
+                <field name="delivered_qty" type="measure" />
             </pivot>
         </field>
     </record>
-
     <record id="rma_view_calendar" model="ir.ui.view">
         <field name="name">rma.calendar</field>
         <field name="model">rma</field>
         <field name="arch" type="xml">
             <calendar date_start="date" mode="month" color="state" quick_add="False">
-                <field name="name"/>
-                <field name="partner_id"/>
-                <field name="product_id"/>
-                <field name="product_uom_qty" widget="monetary"/>
+                <field name="name" />
+                <field name="partner_id" />
+                <field name="product_id" />
+                <field name="product_uom_qty" widget="monetary" />
             </calendar>
         </field>
     </record>
-
     <record id="rma_refund_action_server" model="ir.actions.server">
         <field name="name">To Refund</field>
-        <field name="model_id" ref="model_rma"/>
-        <field name="binding_model_id" ref="model_rma"/>
+        <field name="model_id" ref="model_rma" />
+        <field name="binding_model_id" ref="model_rma" />
         <field name="state">code</field>
         <field name="code">records.action_refund()</field>
     </record>
-
     <record id="rma_action" model="ir.actions.act_window">
         <field name="name">RMA</field>
         <field name="res_model">rma</field>
@@ -289,8 +361,7 @@
             </p>
         </field>
     </record>
-
     <record id="rma_orders_menu" model="ir.ui.menu">
-        <field name="action" ref="rma_action"/>
+        <field name="action" ref="rma_action" />
     </record>
 </odoo>
diff --git a/rma/views/stock_picking_views.xml b/rma/views/stock_picking_views.xml
index 95734fb08..4f1e8aadf 100644
--- a/rma/views/stock_picking_views.xml
+++ b/rma/views/stock_picking_views.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
     <record id="view_picking_form" model="ir.ui.view">
         <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="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 name="action_view_rma"
-                        type="object"
-                        class="oe_stat_button"
-                        icon="fa-reply"
-                        attrs="{'invisible': [('rma_count', '=', 0)]}">
-                    <field name="rma_count"
-                           widget="statinfo"
-                           string="RMA"/>
+                <button
+                    name="action_view_rma"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-reply"
+                    attrs="{'invisible': [('rma_count', '=', 0)]}"
+                >
+                    <field name="rma_count" widget="statinfo" string="RMA" />
                 </button>
             </div>
         </field>
diff --git a/rma/views/stock_warehouse_views.xml b/rma/views/stock_warehouse_views.xml
index 5d25dd8d3..059efa05a 100644
--- a/rma/views/stock_warehouse_views.xml
+++ b/rma/views/stock_warehouse_views.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
     <record id="view_warehouse_inherit_mrp" model="ir.ui.view">
         <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="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" />
             </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" />
+                <field name="rma_out_type_id" />
             </xpath>
         </field>
     </record>
diff --git a/rma/wizard/rma_delivery.py b/rma/wizard/rma_delivery.py
index ef72053be..21ebaae02 100644
--- a/rma/wizard/rma_delivery.py
+++ b/rma/wizard/rma_delivery.py
@@ -3,61 +3,52 @@
 
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
+
 import odoo.addons.decimal_precision as dp
 
 
 class RmaReDeliveryWizard(models.TransientModel):
-    _name = 'rma.delivery.wizard'
-    _description = 'RMA Delivery Wizard'
+    _name = "rma.delivery.wizard"
+    _description = "RMA Delivery Wizard"
 
     rma_count = fields.Integer()
     type = fields.Selection(
-        selection=[
-            ('replace', 'Replace'),
-            ('return', 'Return to customer'),
-        ],
+        selection=[("replace", "Replace"), ("return", "Return to customer"),],
         string="Type",
         required=True,
     )
     product_id = fields.Many2one(
-        comodel_name="product.product",
-        string="Replace Product",
+        comodel_name="product.product", string="Replace Product",
     )
     product_uom_qty = fields.Float(
-        string='Product qty',
-        digits=dp.get_precision('Product Unit of Measure'),
-    )
-    product_uom = fields.Many2one(
-        comodel_name="uom.uom",
-        string="Unit of measure",
-    )
-    scheduled_date = fields.Datetime(
-        required=True,
-        default=fields.Datetime.now(),
+        string="Product qty", digits=dp.get_precision("Product Unit of Measure"),
     )
+    product_uom = fields.Many2one(comodel_name="uom.uom", string="Unit of measure",)
+    scheduled_date = fields.Datetime(required=True, default=fields.Datetime.now(),)
     warehouse_id = fields.Many2one(
-        comodel_name="stock.warehouse",
-        string='Warehouse',
-        required=True,
+        comodel_name="stock.warehouse", string="Warehouse", required=True,
     )
 
-    @api.constrains('product_uom_qty')
+    @api.constrains("product_uom_qty")
     def _check_product_uom_qty(self):
         self.ensure_one()
-        rma_ids = self.env.context.get('active_ids')
+        rma_ids = self.env.context.get("active_ids")
         if len(rma_ids) == 1 and self.product_uom_qty <= 0:
-            raise ValidationError(_('Quantity must be greater than 0.'))
+            raise ValidationError(_("Quantity must be greater than 0."))
 
     @api.model
     def default_get(self, fields_list):
         res = super().default_get(fields_list)
-        rma_ids = self.env.context.get('active_ids')
-        rma = self.env['rma'].browse(rma_ids)
-        warehouse_id = self.env['stock.warehouse'].search(
-            [('company_id', '=', rma[0].company_id.id)], limit=1).id
-        delivery_type = self.env.context.get('rma_delivery_type')
+        rma_ids = self.env.context.get("active_ids")
+        rma = self.env["rma"].browse(rma_ids)
+        warehouse_id = (
+            self.env["stock.warehouse"]
+            .search([("company_id", "=", rma[0].company_id.id)], limit=1)
+            .id
+        )
+        delivery_type = self.env.context.get("rma_delivery_type")
         product_id = False
-        if len(rma) == 1 and delivery_type == 'return':
+        if len(rma) == 1 and delivery_type == "return":
             product_id = rma.product_id.id
         product_uom_qty = 0.0
         if len(rma) == 1 and rma.remaining_qty > 0.0:
@@ -76,18 +67,17 @@ def _onchange_product_id(self):
         domain_product_uom = []
         if self.product_id:
             domain_product_uom = [
-                ('category_id', '=', self.product_id.uom_id.category_id.id)
+                ("category_id", "=", self.product_id.uom_id.category_id.id)
             ]
-            if (not self.product_uom
-                    or self.product_id.uom_id.id != self.product_uom.id):
+            if not self.product_uom or self.product_id.uom_id.id != self.product_uom.id:
                 self.product_uom = self.product_id.uom_id
-        return {'domain': {'product_uom': domain_product_uom}}
+        return {"domain": {"product_uom": domain_product_uom}}
 
     def action_deliver(self):
         self.ensure_one()
-        rma_ids = self.env.context.get('active_ids')
-        rma = self.env['rma'].browse(rma_ids)
-        if self.type == 'replace':
+        rma_ids = self.env.context.get("active_ids")
+        rma = self.env["rma"].browse(rma_ids)
+        if self.type == "replace":
             rma.create_replace(
                 self.scheduled_date,
                 self.warehouse_id,
@@ -95,7 +85,7 @@ def action_deliver(self):
                 self.product_uom_qty,
                 self.product_uom,
             )
-        elif self.type == 'return':
+        elif self.type == "return":
             qty = uom = None
             if self.rma_count == 1:
                 qty, uom = self.product_uom_qty, self.product_uom
diff --git a/rma/wizard/rma_delivery_views.xml b/rma/wizard/rma_delivery_views.xml
index 2efcbc05e..c8ae41538 100644
--- a/rma/wizard/rma_delivery_views.xml
+++ b/rma/wizard/rma_delivery_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
@@ -9,42 +9,61 @@
             <form>
                 <group>
                     <group>
-                        <field name="scheduled_date"/>
-                        <field name="warehouse_id"
-                               attrs="{'invisible': [('type', '!=', 'replace')]}"/>
+                        <field name="scheduled_date" />
+                        <field
+                            name="warehouse_id"
+                            attrs="{'invisible': [('type', '!=', 'replace')]}"
+                        />
                     </group>
                     <group>
-                        <field name="product_id"
-                               attrs="{'invisible': ['|', ('type', '!=', 'replace'), ('rma_count', '>', 1)], 'required': [('type', '=', 'replace'), ('rma_count', '=', 1)]}"/>
-                        <label for="product_uom_qty"
-                               attrs="{'invisible': [('rma_count', '>', 1)]}"/>
-                        <div class="o_row"
-                             attrs="{'invisible': [('rma_count', '>', 1)]}">
-                            <field name="product_uom_qty"
-                                   attrs="{'required': [('rma_count', '=', 1)]}"/>
-                            <field name="product_uom"
-                                   groups="uom.group_uom"
-                                   attrs="{'required': [('rma_count', '=', 1)]}"/>
+                        <field
+                            name="product_id"
+                            attrs="{'invisible': ['|', ('type', '!=', 'replace'), ('rma_count', '>', 1)], 'required': [('type', '=', 'replace'), ('rma_count', '=', 1)]}"
+                        />
+                        <label
+                            for="product_uom_qty"
+                            attrs="{'invisible': [('rma_count', '>', 1)]}"
+                        />
+                        <div
+                            class="o_row"
+                            attrs="{'invisible': [('rma_count', '>', 1)]}"
+                        >
+                            <field
+                                name="product_uom_qty"
+                                attrs="{'required': [('rma_count', '=', 1)]}"
+                            />
+                            <field
+                                name="product_uom"
+                                groups="uom.group_uom"
+                                attrs="{'required': [('rma_count', '=', 1)]}"
+                            />
                         </div>
                     </group>
                 </group>
-                <field name="rma_count" invisible="1"/>
-                <field name="type" invisible="1"/>
+                <field name="rma_count" invisible="1" />
+                <field name="type" invisible="1" />
                 <footer>
-                    <button name="action_deliver" string="Deliver" type="object" class="btn-primary"/>
+                    <button
+                        name="action_deliver"
+                        string="Deliver"
+                        type="object"
+                        class="btn-primary"
+                    />
                     <button string="Cancel" class="btn-secondary" special="cancel" />
                 </footer>
             </form>
         </field>
     </record>
-    <act_window id="rma_delivery_wizard_action"
-                name="Return to customer"
-                src_model="rma"
-                res_model="rma.delivery.wizard"
-                view_type="form"
-                view_mode="form"
-                key2="client_action_multi"
-                target="new"
-                multi="True"
-                context="{'rma_delivery_type': 'return'}"/>
+    <act_window
+        id="rma_delivery_wizard_action"
+        name="Return to customer"
+        src_model="rma"
+        res_model="rma.delivery.wizard"
+        view_type="form"
+        view_mode="form"
+        key2="client_action_multi"
+        target="new"
+        multi="True"
+        context="{'rma_delivery_type': 'return'}"
+    />
 </odoo>
diff --git a/rma/wizard/rma_split.py b/rma/wizard/rma_split.py
index fc8ea8500..f4fc5d9f9 100644
--- a/rma/wizard/rma_split.py
+++ b/rma/wizard/rma_split.py
@@ -2,52 +2,48 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, fields, models
+
 import odoo.addons.decimal_precision as dp
 
 
 class RmaReSplitWizard(models.TransientModel):
-    _name = 'rma.split.wizard'
-    _description = 'RMA Split Wizard'
+    _name = "rma.split.wizard"
+    _description = "RMA Split Wizard"
 
-    rma_id = fields.Many2one(
-        comodel_name='rma',
-        string='RMA',
-    )
+    rma_id = fields.Many2one(comodel_name="rma", string="RMA",)
     product_uom_qty = fields.Float(
-        string='Quantity to extract',
-        digits=dp.get_precision('Product Unit of Measure'),
+        string="Quantity to extract",
+        digits=dp.get_precision("Product Unit of Measure"),
         required=True,
-        help="Quantity to extract to a new RMA."
+        help="Quantity to extract to a new RMA.",
     )
     product_uom = fields.Many2one(
-        comodel_name='uom.uom',
-        string='Unit of measure',
-        required=True,
+        comodel_name="uom.uom", string="Unit of measure", required=True,
     )
 
     _sql_constraints = [
         (
-            'check_product_uom_qty_positive',
-            'CHECK(product_uom_qty > 0)',
-            'Quantity must be greater than 0.'
+            "check_product_uom_qty_positive",
+            "CHECK(product_uom_qty > 0)",
+            "Quantity must be greater than 0.",
         ),
     ]
 
     @api.model
     def fields_get(self, allfields=None, attributes=None):
         res = super().fields_get(allfields, attributes=attributes)
-        rma_id = self.env.context.get('active_id')
-        rma = self.env['rma'].browse(rma_id)
-        res['product_uom']['domain'] = [
-            ('category_id', '=', rma.product_uom.category_id.id)
+        rma_id = self.env.context.get("active_id")
+        rma = self.env["rma"].browse(rma_id)
+        res["product_uom"]["domain"] = [
+            ("category_id", "=", rma.product_uom.category_id.id)
         ]
         return res
 
     @api.model
     def default_get(self, fields_list):
         res = super().default_get(fields_list)
-        rma_id = self.env.context.get('active_id')
-        rma = self.env['rma'].browse(rma_id)
+        rma_id = self.env.context.get("active_id")
+        rma = self.env["rma"].browse(rma_id)
         res.update(
             rma_id=rma.id,
             product_uom_qty=rma.remaining_qty,
@@ -58,13 +54,14 @@ def default_get(self, fields_list):
     def action_split(self):
         self.ensure_one()
         extracted_rma = self.rma_id.extract_quantity(
-            self.product_uom_qty, self.product_uom)
+            self.product_uom_qty, self.product_uom
+        )
         return {
-            'name': _('Extracted RMA'),
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'rma',
-            'views': [(self.env.ref('rma.rma_view_form').id, 'form')],
-            'res_id': extracted_rma.id,
+            "name": _("Extracted RMA"),
+            "type": "ir.actions.act_window",
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "rma",
+            "views": [(self.env.ref("rma.rma_view_form").id, "form")],
+            "res_id": extracted_rma.id,
         }
diff --git a/rma/wizard/rma_split_views.xml b/rma/wizard/rma_split_views.xml
index d33ba877b..bf38f8f90 100644
--- a/rma/wizard/rma_split_views.xml
+++ b/rma/wizard/rma_split_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
@@ -9,15 +9,20 @@
             <form>
                 <group>
                     <group>
-                        <label for="product_uom_qty"/>
+                        <label for="product_uom_qty" />
                         <div class="o_row">
-                            <field name="product_uom_qty"/>
-                            <field name="product_uom" groups="uom.group_uom"/>
+                            <field name="product_uom_qty" />
+                            <field name="product_uom" groups="uom.group_uom" />
                         </div>
                     </group>
                 </group>
                 <footer>
-                    <button name="action_split" string="Split" type="object" class="btn-primary"/>
+                    <button
+                        name="action_split"
+                        string="Split"
+                        type="object"
+                        class="btn-primary"
+                    />
                     <button string="Cancel" class="btn-secondary" special="cancel" />
                 </footer>
             </form>
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
index a97913704..9d80b4720 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -6,18 +6,16 @@
 
 
 class ReturnPicking(models.TransientModel):
-    _inherit = 'stock.return.picking'
+    _inherit = "stock.return.picking"
 
-    create_rma = fields.Boolean(
-        string="Create RMAs"
-    )
+    create_rma = fields.Boolean(string="Create RMAs")
     picking_type_code = fields.Selection(
         selection=[
-            ('incoming', 'Vendors'),
-            ('outgoing', 'Customers'),
-            ('internal', 'Internal'),
+            ("incoming", "Vendors"),
+            ("outgoing", "Customers"),
+            ("internal", "Internal"),
         ],
-        related='picking_id.picking_type_id.code',
+        related="picking_id.picking_type_id.code",
         store=True,
         readonly=True,
     )
@@ -27,16 +25,16 @@ 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([]).mapped('rma_loc_id')
-            rma_loc_domain = [('id', 'child_of', rma_loc.ids)]
+            rma_loc = warehouse.search([]).mapped("rma_loc_id")
+            rma_loc_domain = [("id", "child_of", rma_loc.ids)]
         else:
-            self.location_id = self.default_get(['location_id'])['location_id']
+            self.location_id = self.default_get(["location_id"])["location_id"]
             rma_loc_domain = [
-                '|',
-                ('id', '=', self.picking_id.location_id.id),
-                ('return_location', '=', True),
+                "|",
+                ("id", "=", self.picking_id.location_id.id),
+                ("return_location", "=", True),
             ]
-        return {'domain': {'location_id': rma_loc_domain}}
+        return {"domain": {"location_id": rma_loc_domain}}
 
     def create_returns(self):
         """ Override create_returns method for creating one or more
@@ -52,13 +50,18 @@ def create_returns(self):
             self_with_context = self.with_context(set_rma_picking_type=True)
             res = super(ReturnPicking, self_with_context).create_returns()
             if not self.picking_id.partner_id:
-                raise ValidationError(_(
-                    "You must specify the 'Customer' in the "
-                    "'Stock Picking' from which RMAs will be created"))
-            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]
-            self.env['rma'].create(vals_list)
+                raise ValidationError(
+                    _(
+                        "You must specify the 'Customer' in the "
+                        "'Stock Picking' from which RMAs will be created"
+                    )
+                )
+            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
+            ]
+            self.env["rma"].create(vals_list)
             return res
         else:
             return super().create_returns()
diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
index 87b8f8ed2..d899ee3f7 100644
--- a/rma/wizard/stock_picking_return_views.xml
+++ b/rma/wizard/stock_picking_return_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2020 Tecnativa - Ernesto Tejeda
      License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
 <odoo>
@@ -7,12 +7,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">
+            <xpath
+                expr="//group[.//field[@name='product_return_moves']]"
+                position="before"
+            >
                 <group name="group_rma">
-                    <field name="create_rma"
-                           attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"/>
-                    <field name="picking_id" invisible="1"/>
-                    <field name="picking_type_code" invisible="1"/>
+                    <field
+                        name="create_rma"
+                        attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"
+                    />
+                    <field name="picking_id" invisible="1" />
+                    <field name="picking_type_code" invisible="1" />
                 </group>
             </xpath>
         </field>

From 3408e5bf92a41e3d72b035c0a710652cbe7f0c2d Mon Sep 17 00:00:00 2001
From: Ernesto Tejeda <ernesto.tejeda@tecnativa.com>
Date: Fri, 23 Oct 2020 15:29:47 -0400
Subject: [PATCH 013/108] [MIG] rma: Migration to 13.0

---
 rma/README.rst                                |  14 +-
 rma/__manifest__.py                           |   7 +-
 rma/data/stock_data.xml                       |   9 +
 rma/hooks.py                                  |  13 +-
 rma/i18n/es.po                                | 239 +++++++------
 rma/i18n/pt_BR.po                             | 297 +++++++++-------
 rma/i18n/rma.pot                              | 318 +++++++++++-------
 rma/migrations/12.0.2.0.0/post-migration.py   |   9 -
 rma/models/__init__.py                        |   2 +-
 .../{account_invoice.py => account_move.py}   |  12 +-
 rma/models/res_partner.py                     |   4 +-
 rma/models/rma.py                             | 135 ++++----
 rma/models/rma_team.py                        |   5 +-
 rma/models/stock_move.py                      |   2 +-
 rma/models/stock_picking.py                   |   3 +-
 rma/models/stock_warehouse.py                 |  52 ++-
 rma/security/rma_security.xml                 |   4 +-
 rma/static/description/index.html             |   6 +-
 rma/tests/test_rma.py                         |  67 ++--
 rma/views/rma_portal_templates.xml            |  14 +-
 rma/views/rma_team_views.xml                  |   1 -
 rma/views/rma_views.xml                       |   1 -
 rma/wizard/rma_delivery.py                    |  10 +-
 rma/wizard/rma_delivery_views.xml             |   6 +-
 rma/wizard/rma_split.py                       |   4 +-
 rma/wizard/rma_split_views.xml                |   1 -
 rma/wizard/stock_picking_return.py            |  18 +-
 27 files changed, 726 insertions(+), 527 deletions(-)
 create mode 100644 rma/data/stock_data.xml
 delete mode 100644 rma/migrations/12.0.2.0.0/post-migration.py
 rename rma/models/{account_invoice.py => account_move.py} (84%)

diff --git a/rma/README.rst b/rma/README.rst
index dea2df0f2..abdfda0aa 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -7,20 +7,20 @@ Return Merchandise Authorization Management
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
     :target: https://odoo-community.org/page/development-status
-    :alt: Beta
+    :alt: Production/Stable
 .. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :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/12.0/rma
+    :target: https://github.com/OCA/rma/tree/13.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-12-0/rma-12-0-rma
+    :target: https://translation.odoo-community.org/projects/rma-13-0/rma-13-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/12.0
+    :target: https://runbot.odoo-community.org/runbot/145/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -120,7 +120,7 @@ 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:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2013.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.
 
@@ -162,6 +162,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-ernestotejeda| 
 
-This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/12.0/rma>`_ project on GitHub.
+This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/13.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 5ecc5d933..ecc7ce28a 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,19 +3,20 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "12.0.1.6.0",
-    "development_status": "Beta",
+    "version": "13.0.1.0.0",
+    "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "maintainers": ["ernestotejeda"],
     "license": "AGPL-3",
-    "depends": ["account", "stock",],
+    "depends": ["account", "stock"],
     "data": [
         "views/report_rma.xml",
         "report/report.xml",
         "data/mail_data.xml",
         "data/rma_operation_data.xml",
+        "data/stock_data.xml",
         "security/rma_security.xml",
         "security/ir.model.access.csv",
         "wizard/stock_picking_return_views.xml",
diff --git a/rma/data/stock_data.xml b/rma/data/stock_data.xml
new file mode 100644
index 000000000..8ee0cdda1
--- /dev/null
+++ b/rma/data/stock_data.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<data noupdate="1">
+    <record id="stock_location_rma" model="stock.location">
+        <field name="name">RMA</field>
+        <field name="location_id" ref="stock.stock_location_locations" />
+        <field name="usage">view</field>
+        <field name="company_id" />
+    </record>
+</data>
diff --git a/rma/hooks.py b/rma/hooks.py
index 1c2791c8f..dbdbf75ab 100644
--- a/rma/hooks.py
+++ b/rma/hooks.py
@@ -23,12 +23,13 @@ def _get_next_picking_type_color():
 
     def create_rma_locations(warehouse):
         stock_location = env["stock.location"]
-        location_vals = warehouse._get_locations_values({})
-        for field_name, values in location_vals.items():
-            if field_name == "rma_loc_id" and not warehouse.rma_loc_id:
-                warehouse.rma_loc_id = (
-                    stock_location.with_context(active_test=False).create(values).id
-                )
+        if not warehouse.rma_loc_id:
+            rma_location_vals = warehouse._get_rma_location_values()
+            warehouse.rma_loc_id = (
+                stock_location.with_context(active_test=False)
+                .create(rma_location_vals)
+                .id
+            )
 
     def create_rma_picking_types(whs):
         ir_sequence_sudo = env["ir.sequence"].sudo()
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index b807bbd73..cbea57be7 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-21 05:13+0000\n"
-"PO-Revision-Date: 2020-10-06 14:16+0000\n"
+"POT-Creation-Date: 2020-10-23 20:11+0000\n"
+"PO-Revision-Date: 2020-10-23 16:21-0400\n"
 "Last-Translator: David Vidal <david.vidal@tecnativa.com>\n"
 "Language-Team: \n"
 "Language: es\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #. module: rma
 #: model:mail.template,report_name:rma.mail_template_rma_notification
@@ -28,16 +28,25 @@ 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
-#: code:addons/rma/models/rma_team.py:46
+#: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
+#. module: rma
+#: 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>Asunto del correo electrónico:</b> %s<br/><br/><b>Cuerpo del correo "
+"electrónico:</b><br/>%s"
+
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
+#, fuzzy
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\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"
@@ -48,7 +57,7 @@ msgid ""
 "    <br/><br/>\n"
 "    Do not hesitate to contact us if you have any question.\n"
 "</p>\n"
-"</div>\n"
+"            </div>\n"
 "        "
 msgstr ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
@@ -77,12 +86,18 @@ msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-msgid "<i class=\"fa fa-fw fa-check\"/> <b>Paid</b>"
+#, fuzzy
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
 msgstr "<i class=\"fa fa-fw fa-check\"/><b>Pagado</b>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-msgid "<i class=\"fa fa-fw fa-clock-o\"/> <b>Waiting Payment</b>"
+#, fuzzy
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
 msgstr "<i class=\"fa fa-fw fa-clock-o\"/><b>Esperando Pago</b>"
 
 #. module: rma
@@ -290,6 +305,11 @@ msgstr "Activo"
 msgid "Activities"
 msgstr "Actividades"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_state
 msgid "Activity State"
@@ -369,7 +389,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -411,7 +431,8 @@ msgid "Confirm"
 msgstr "Confirmar"
 
 #. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Confirmed"
 msgstr "Confirmado"
 
@@ -455,7 +476,7 @@ msgid "Customer Portal URL"
 msgstr "URL del portal de cliente"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:42
+#: 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
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -525,7 +546,8 @@ msgid "Display Name"
 msgstr "Nombre mostrado"
 
 #. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Draft"
 msgstr "Borrador"
 
@@ -535,20 +557,6 @@ msgstr "Borrador"
 msgid "Draft RMA"
 msgstr "RMA en estado Borrador"
 
-#. module: rma
-#: code:addons/rma/models/rma.py:1098
-#, python-format
-msgid ""
-"E-mail subject: %s\n"
-"\n"
-"E-mail body:\n"
-"%s"
-msgstr ""
-"Asunto del correo electrónico: %s\n"
-"\n"
-"Cuerpo del correo electrónico:\n"
-"%s"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email"
@@ -560,7 +568,7 @@ msgid "Email Alias"
 msgstr "Pseudónimo de correo"
 
 #. module: rma
-#: code:addons/rma/wizard/rma_split.py:63
+#: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
 msgstr "RMA Extraído"
@@ -612,20 +620,28 @@ msgstr ""
 "contiene el seudónimo para la creación de tareas)"
 
 #. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread
-#: 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."
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+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 "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."
 
@@ -639,32 +655,32 @@ msgstr ""
 "sin eliminarlo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1102
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
 msgstr "Correo electrónico entrante"
 
-#. module: rma
-#: model:ir.model,name:rma.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
 msgid "Invoice Address"
 msgstr "Dirección de factura"
 
-#. module: rma
-#: model:ir.model,name:rma.model_account_invoice_line
-msgid "Invoice Line"
-msgstr "Linea de factura"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
 msgid "Is Follower"
 msgstr "Es un seguidor"
 
+#. module: rma
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entries"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
@@ -708,7 +724,7 @@ msgid "Lock"
 msgstr "Bloquear"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
 msgid "Locked"
 msgstr "Bloqueado"
 
@@ -741,7 +757,7 @@ msgid "Messages"
 msgstr "Mensajes"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:43
+#: 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
 #: model:ir.model.fields,field_description:rma.field_rma_team__name
@@ -750,8 +766,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:494
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
 msgstr "Nuevo"
@@ -772,24 +787,24 @@ msgid "Next Activity Type"
 msgstr "Siguiente tipo de actividad"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:772
+#: 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
-#: code:addons/rma/models/rma.py:755
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr "Ninguno de los RMAs seleccionados puede realizar una devolución."
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
 msgid "Normal"
 msgstr "Normal"
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
 msgid "Not urgent"
 msgstr "No Urgente"
 
@@ -802,8 +817,8 @@ msgstr "Número de acciones"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
-msgid "Number of error"
-msgstr "Número de error"
+msgid "Number of errors"
+msgstr "Número de errores"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
@@ -854,11 +869,6 @@ msgstr "Movimiento"
 msgid "Other Information"
 msgstr "Otra información"
 
-#. module: rma
-#: selection:rma,activity_state:0
-msgid "Overdue"
-msgstr "Vencidas"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
 msgid "Owner"
@@ -889,11 +899,6 @@ msgstr ""
 msgid "Partner"
 msgstr "Empresa"
 
-#. module: rma
-#: selection:rma,activity_state:0
-msgid "Planned"
-msgstr "Planeado"
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_contact
 msgid ""
@@ -948,7 +953,8 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: rma
-#: code:addons/rma/wizard/rma_delivery.py:49 sql_constraint:rma.split.wizard:0
+#: 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
 msgid "Quantity must be greater than 0."
 msgstr "La cantidad debe ser mayor que cero."
@@ -959,7 +965,7 @@ msgid "Quantity to extract"
 msgstr "Cantidad a extraer"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:805
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Quantity to extract cannot be greater than remaining delivery quantity (%s "
@@ -976,7 +982,7 @@ msgstr "Cantidad a extraer en nuevo RMA."
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_action
 #: model:ir.model,name:rma.model_rma
-#: model:ir.model.fields,field_description:rma.field_account_invoice_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
 #: model:ir.module.category,name:rma.rma_module_category
@@ -993,7 +999,7 @@ msgid "RMA #"
 msgstr "RMA nº"
 
 #. module: rma
-#: code:addons/rma/models/res_company.py:18
+#: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
 msgstr "Código de RMA"
@@ -1009,7 +1015,7 @@ msgid "RMA Deadline"
 msgstr "RMA fecha límite"
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:82
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
 msgstr "Órdenes de entrega de RMA"
@@ -1047,7 +1053,7 @@ msgid "RMA Out Type"
 msgstr "Tipo de operación para entrega de RMA"
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:73
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
 msgstr "Recepciones de RMA"
@@ -1137,7 +1143,8 @@ msgid "Receipt"
 msgstr "Recepción"
 
 #. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Received"
 msgstr "Recibido"
 
@@ -1157,7 +1164,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referencia al documento que generó este RMA."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:693
+#: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1176,7 +1183,7 @@ msgid "Refund line"
 msgstr "Línea de factura rectificativa"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
 msgid "Refunded"
 msgstr "Reembolsado"
 
@@ -1196,8 +1203,8 @@ msgid "Repair"
 msgstr "Reparar"
 
 #. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
-#: selection:rma.delivery.wizard,type:0
 #: model:rma.operation,name:rma.rma_operation_replace
 msgid "Replace"
 msgstr "Reemplazar"
@@ -1208,12 +1215,12 @@ msgid "Replace Product"
 msgstr "Reemplazar producto"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
 msgid "Replaced"
 msgstr "Reemplazado"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1011
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
@@ -1225,7 +1232,7 @@ msgstr ""
 "picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1022
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
@@ -1249,7 +1256,7 @@ msgid "Requested operation"
 msgstr "Operación solicitada"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:736
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
 msgstr "Campo(s) requerido(s):%s"
@@ -1272,13 +1279,13 @@ msgstr "Albarán de devolución"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
-#: selection:rma.delivery.wizard,type:0
 msgid "Return to customer"
 msgstr "Devolver al cliente"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:972
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
@@ -1288,7 +1295,7 @@ msgstr ""
 "\" data-oe-id=\"%d\">%s</a> ha sido creada."
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
 msgid "Returned"
 msgstr "Devuelto"
 
@@ -1297,6 +1304,13 @@ msgstr "Devuelto"
 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
+#, fuzzy
+msgid "SMS Delivery error"
+msgstr "Error de Envío de Mensaje"
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1328,13 +1342,13 @@ msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:48
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr "Secuencia de recepción de RMA"
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:53
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
 msgstr "Secuencia de entrega de RMA"
@@ -1366,7 +1380,7 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:889
+#: 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 "
@@ -1382,7 +1396,7 @@ msgid "State"
 msgstr "Estado"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:44
+#: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
@@ -1423,7 +1437,7 @@ msgid "Team Members"
 msgstr "Miembros del equipo"
 
 #. module: rma
-#: sql_constraint:rma.operation:0
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
 msgid "That operation name already exists !"
 msgstr "¡El nombre de operación ya existe!"
 
@@ -1462,7 +1476,7 @@ msgstr ""
 "dirección."
 
 #. module: rma
-#: code:addons/rma/models/stock_move.py:64
+#: 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 "
@@ -1472,13 +1486,13 @@ msgstr ""
 "inicial porque el movimiento está enlazado a un RMA (%s)."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:793
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr "La cantidad a devolver es mayor que la cantidad restante del RMA."
 
 #. module: rma
-#: code:addons/rma/models/account_invoice.py:22
+#: 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 "
@@ -1488,19 +1502,19 @@ msgstr ""
 "cantidad especificada en el RMA asociado."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:782
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr "Este RMA no puede ser dividido."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:769
+#: 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
-#: code:addons/rma/models/rma.py:752
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr "Este RMA no puede realizar una devolución."
@@ -1511,11 +1525,6 @@ msgstr "Este RMA no puede realizar una devolución."
 msgid "To Refund"
 msgstr "Reembolsar"
 
-#. module: rma
-#: selection:rma,activity_state:0
-msgid "Today"
-msgstr "Hoy"
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_picking
 msgid "Transfer"
@@ -1531,6 +1540,11 @@ msgstr "Tipo"
 msgid "Type of Operation"
 msgstr "Tipo de operación"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unassigned RMAs"
@@ -1570,7 +1584,7 @@ msgid "UoM"
 msgstr "UdM"
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
 msgid "Urgent"
 msgstr "Urgente"
 
@@ -1590,17 +1604,17 @@ msgid "Users"
 msgstr "Usuarios"
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__3
 msgid "Very Urgent"
 msgstr "Muy Urgente"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
 msgstr "Esperando por reemplazo"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
 msgid "Waiting for return"
 msgstr "Esperando por devolución"
 
@@ -1624,13 +1638,13 @@ msgid "Website communication history"
 msgstr "Historial de comunicaciones del sitio web"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:516
+#: 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
-#: code:addons/rma/wizard/stock_picking_return.py:55
+#: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
 "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
@@ -1639,6 +1653,11 @@ msgstr ""
 "Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los "
 "RMAs serán creados"
 
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "object._get_report_base_filename()"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
 msgid ""
@@ -1660,6 +1679,24 @@ msgstr ""
 "El usuario tendrá acceso a la configuración de RMA y a los informes "
 "estadísticos."
 
+#~ msgid "If checked new messages require your attention."
+#~ msgstr "Si está marcado, hay nuevos mensajes que requieren su atención."
+
+#~ msgid "Invoice"
+#~ msgstr "Factura"
+
+#~ msgid "Invoice Line"
+#~ msgstr "Linea de factura"
+
+#~ msgid "Overdue"
+#~ msgstr "Vencidas"
+
+#~ msgid "Planned"
+#~ msgstr "Planeado"
+
+#~ msgid "Today"
+#~ msgstr "Hoy"
+
 #~ msgid "Waiting for refund"
 #~ msgstr "Esperando por reembolso"
 
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 6475bdf3c..c7e484c0d 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -27,16 +27,22 @@ 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
-#: code:addons/rma/models/rma_team.py:46
+#: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Cópia)"
 
+#. module: rma
+#: 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 ""
+
 #. 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"
+"                <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"
@@ -47,23 +53,9 @@ msgid ""
 "    <br/><br/>\n"
 "    Do not hesitate to contact us if you have any question.\n"
 "</p>\n"
-"</div>\n"
+"            </div>\n"
 "        "
 msgstr ""
-"<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"
-"    Aqui está o RMA <strong>${object.name}</strong> from ${object.company_id."
-"name}.\n"
-"    <br/><br/>\n"
-"    Não deixe de nos contactar se houver qualquer dúvida ou outra questão.\n"
-"</p>\n"
-"</div>\n"
-"        "
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -76,13 +68,17 @@ msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-msgid "<i class=\"fa fa-fw fa-check\"/> <b>Paid</b>"
-msgstr "<i class=\"fa fa-fw fa-check\"/> <b>Pago</b>"
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
+msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-msgid "<i class=\"fa fa-fw fa-clock-o\"/> <b>Waiting Payment</b>"
-msgstr "<i class=\"fa fa-fw fa-clock-o\"/> <b>Aguardando Pagamento</b>"
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
+msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -289,6 +285,11 @@ msgstr "Ativar/Ativo(a)"
 msgid "Activities"
 msgstr "Atividades"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_state
 msgid "Activity State"
@@ -368,7 +369,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
 msgid "Canceled"
 msgstr "Cancelado(a)"
 
@@ -410,7 +411,8 @@ msgid "Confirm"
 msgstr "Confirmar"
 
 #. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Confirmed"
 msgstr "Confirmado(a)"
 
@@ -454,7 +456,7 @@ msgid "Customer Portal URL"
 msgstr "URL do portal do cliente"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:42
+#: 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
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -524,7 +526,8 @@ msgid "Display Name"
 msgstr "Exibir Nome"
 
 #. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Draft"
 msgstr "Rascunho"
 
@@ -534,20 +537,6 @@ msgstr "Rascunho"
 msgid "Draft RMA"
 msgstr "Rascunho do RMA"
 
-#. module: rma
-#: code:addons/rma/models/rma.py:1098
-#, python-format
-msgid ""
-"E-mail subject: %s\n"
-"\n"
-"E-mail body:\n"
-"%s"
-msgstr ""
-"Assunto do E-mail: %s\n"
-"\n"
-"Corpo do E-mail:\n"
-"%s"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email"
@@ -559,7 +548,7 @@ msgid "Email Alias"
 msgstr "Alias do Email"
 
 #. module: rma
-#: code:addons/rma/wizard/rma_split.py:63
+#: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
 msgstr "RMA Extraído"
@@ -611,20 +600,28 @@ msgstr ""
 "de criação da tarefa)"
 
 #. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread
-#: 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."
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+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."
 
@@ -638,32 +635,32 @@ msgstr ""
 "sem removê-lo."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1102
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
 msgstr "E-mail recebido"
 
-#. module: rma
-#: model:ir.model,name:rma.model_account_invoice
-msgid "Invoice"
-msgstr "Fatura"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
 msgid "Invoice Address"
 msgstr "Endereço de Faturamento"
 
-#. module: rma
-#: model:ir.model,name:rma.model_account_invoice_line
-msgid "Invoice Line"
-msgstr "Linha da Fatura"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
 msgid "Is Follower"
 msgstr "É Seguidor"
 
+#. module: rma
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entries"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
@@ -707,7 +704,7 @@ msgid "Lock"
 msgstr "Travar"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
 msgid "Locked"
 msgstr "Travado"
 
@@ -740,7 +737,7 @@ msgid "Messages"
 msgstr "Mensagens"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:43
+#: 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
 #: model:ir.model.fields,field_description:rma.field_rma_team__name
@@ -749,8 +746,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:31 code:addons/rma/models/rma.py:494
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
 msgstr "Novo(a)"
@@ -771,24 +767,24 @@ msgid "Next Activity Type"
 msgstr "Tipo da Próxima Atividade"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:772
+#: 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
-#: code:addons/rma/models/rma.py:755
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr "Nenhum dos RMAs selecionados pode executar uma devolução."
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
 msgid "Normal"
 msgstr "Normal"
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
 msgid "Not urgent"
 msgstr "Não é urgente"
 
@@ -801,8 +797,8 @@ msgstr "Número de Ações"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
-msgid "Number of error"
-msgstr "Número de Erros"
+msgid "Number of errors"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
@@ -853,11 +849,6 @@ msgstr "Origem da Movimentação"
 msgid "Other Information"
 msgstr "Outra Informação"
 
-#. module: rma
-#: selection:rma,activity_state:0
-msgid "Overdue"
-msgstr "Vencidos(as)"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
 msgid "Owner"
@@ -889,11 +880,6 @@ msgstr ""
 msgid "Partner"
 msgstr "Parceiro"
 
-#. module: rma
-#: selection:rma,activity_state:0
-msgid "Planned"
-msgstr "Planejado)a)"
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_contact
 msgid ""
@@ -947,7 +933,8 @@ msgid "Quantity"
 msgstr "Quantidade"
 
 #. module: rma
-#: code:addons/rma/wizard/rma_delivery.py:49 sql_constraint:rma.split.wizard:0
+#: 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
 msgid "Quantity must be greater than 0."
 msgstr "Quantidade precisa ser maior que zero."
@@ -958,7 +945,7 @@ msgid "Quantity to extract"
 msgstr "Quantidade a extrair"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:805
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Quantity to extract cannot be greater than remaining delivery quantity (%s "
@@ -975,7 +962,7 @@ msgstr "Quantidade a extrair para um novo RMA."
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_action
 #: model:ir.model,name:rma.model_rma
-#: model:ir.model.fields,field_description:rma.field_account_invoice_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
 #: model:ir.module.category,name:rma.rma_module_category
@@ -992,7 +979,7 @@ msgid "RMA #"
 msgstr "RMA #"
 
 #. module: rma
-#: code:addons/rma/models/res_company.py:18
+#: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
 msgstr "Código RMA"
@@ -1008,7 +995,7 @@ msgid "RMA Deadline"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:82
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
 msgstr "Pedidos de Entrega RMA"
@@ -1046,7 +1033,7 @@ msgid "RMA Out Type"
 msgstr "Tipo Saída RMA"
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:73
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
 msgstr "Recebimentos RMA"
@@ -1135,7 +1122,8 @@ msgid "Receipt"
 msgstr "Recebimento"
 
 #. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_search selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Received"
 msgstr "Recebido"
 
@@ -1155,7 +1143,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr "Referência do documento que gerou este RMA."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:693
+#: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1174,7 +1162,7 @@ msgid "Refund line"
 msgstr "Linha de Restituição"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
 msgid "Refunded"
 msgstr "Restituído"
 
@@ -1194,8 +1182,8 @@ msgid "Repair"
 msgstr "Reparo"
 
 #. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
-#: selection:rma.delivery.wizard,type:0
 #: model:rma.operation,name:rma.rma_operation_replace
 msgid "Replace"
 msgstr "Substituir"
@@ -1206,12 +1194,12 @@ msgid "Replace Product"
 msgstr "Substituir Produto"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
 msgid "Replaced"
 msgstr "Substituído"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1011
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
@@ -1223,7 +1211,7 @@ msgstr ""
 "data-oe-id=\"%d\">%s</a> foi criada."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1022
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
@@ -1247,7 +1235,7 @@ msgid "Requested operation"
 msgstr "Operação Solicitada"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:736
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
 msgstr "Campo(s) Solicitado(s):%s"
@@ -1270,13 +1258,13 @@ msgstr "Retorno de Coleta"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
-#: selection:rma.delivery.wizard,type:0
 msgid "Return to customer"
 msgstr "Retornar ao cliente"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:972
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
@@ -1286,7 +1274,7 @@ msgstr ""
 "a> foi criado."
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
 msgid "Returned"
 msgstr "Retornado(a)"
 
@@ -1295,6 +1283,12 @@ msgstr "Retornado(a)"
 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"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1326,13 +1320,13 @@ msgid "Sequence"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:48
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr "Sequência de Entrada RMA"
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:53
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
 msgstr "Sequência de Saída RMA"
@@ -1364,7 +1358,7 @@ msgid "Split RMA"
 msgstr "Dividir RMA"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:889
+#: 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 "
@@ -1380,7 +1374,7 @@ msgid "State"
 msgstr "Situação"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:44
+#: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
@@ -1421,7 +1415,7 @@ msgid "Team Members"
 msgstr "Membros da Equipe"
 
 #. module: rma
-#: sql_constraint:rma.operation:0
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
 msgid "That operation name already exists !"
 msgstr "Esse nome de operação já existe!"
 
@@ -1459,7 +1453,7 @@ msgstr ""
 "nenhum usuário do sistema for encontrado para esse endereço."
 
 #. module: rma
-#: code:addons/rma/models/stock_move.py:64
+#: 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 "
@@ -1469,13 +1463,13 @@ msgstr ""
 "inicial, porque a movimentação do estoque está vinculada a uma RMA (%s)."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:793
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr "A quantidade a retornar é maior que a quantidade restante."
 
 #. module: rma
-#: code:addons/rma/models/account_invoice.py:22
+#: 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 "
@@ -1485,19 +1479,19 @@ msgstr ""
 "especificada na sua RMA vinculada."
 
 #. module: rma
-#: code:addons/rma/models/rma.py:782
+#: 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
-#: code:addons/rma/models/rma.py:769
+#: 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
-#: code:addons/rma/models/rma.py:752
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr "Este RMA não pode executar uma devolução."
@@ -1508,11 +1502,6 @@ msgstr "Este RMA não pode executar uma devolução."
 msgid "To Refund"
 msgstr "A Ser Restituído"
 
-#. module: rma
-#: selection:rma,activity_state:0
-msgid "Today"
-msgstr "Hoje"
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_picking
 msgid "Transfer"
@@ -1528,6 +1517,11 @@ msgstr "Tipo"
 msgid "Type of Operation"
 msgstr "Tipo de Operação"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unassigned RMAs"
@@ -1567,7 +1561,7 @@ msgid "UoM"
 msgstr "Unidade de Medida"
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
 msgid "Urgent"
 msgstr "Urgente"
 
@@ -1587,17 +1581,17 @@ msgid "Users"
 msgstr "Usuários"
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__3
 msgid "Very Urgent"
 msgstr "Muito Urgente"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
 msgstr "Aguardando Substituição"
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
 msgid "Waiting for return"
 msgstr "Aguardando Devolução"
 
@@ -1621,13 +1615,13 @@ msgid "Website communication history"
 msgstr "Histórico de Comunicação Através do Site"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:516
+#: 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
-#: code:addons/rma/wizard/stock_picking_return.py:55
+#: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
 "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
@@ -1636,6 +1630,11 @@ msgstr ""
 "Você deve especificar o 'Cliente' na 'Seleção de estoque' a partir do qual "
 "as RMAs serão criadas"
 
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "object._get_report_base_filename()"
+msgstr ""
+
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
 msgid ""
@@ -1656,6 +1655,76 @@ msgstr ""
 "o usuário terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
 
+#~ 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"
+#~ "    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"
+#~ "    Aqui está o RMA <strong>${object.name}</strong> from ${object."
+#~ "company_id.name}.\n"
+#~ "    <br/><br/>\n"
+#~ "    Não deixe de nos contactar se houver qualquer dúvida ou outra "
+#~ "questão.\n"
+#~ "</p>\n"
+#~ "</div>\n"
+#~ "        "
+
+#~ msgid "<i class=\"fa fa-fw fa-check\"/> <b>Paid</b>"
+#~ msgstr "<i class=\"fa fa-fw fa-check\"/> <b>Pago</b>"
+
+#~ msgid "<i class=\"fa fa-fw fa-clock-o\"/> <b>Waiting Payment</b>"
+#~ msgstr "<i class=\"fa fa-fw fa-clock-o\"/> <b>Aguardando Pagamento</b>"
+
+#~ msgid ""
+#~ "E-mail subject: %s\n"
+#~ "\n"
+#~ "E-mail body:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Assunto do E-mail: %s\n"
+#~ "\n"
+#~ "Corpo do E-mail:\n"
+#~ "%s"
+
+#~ msgid "If checked new messages require your attention."
+#~ msgstr "Se marcada, novas mensagens requerem sua atenção."
+
+#~ msgid "Invoice"
+#~ msgstr "Fatura"
+
+#~ msgid "Invoice Line"
+#~ msgstr "Linha da Fatura"
+
+#~ msgid "Number of error"
+#~ msgstr "Número de Erros"
+
+#~ msgid "Overdue"
+#~ msgstr "Vencidos(as)"
+
+#~ msgid "Planned"
+#~ msgstr "Planejado)a)"
+
+#~ msgid "Today"
+#~ msgstr "Hoje"
+
 #~ msgid "Waiting for refund"
 #~ msgstr "Aguardando Restituição"
 
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 0e633fe8d..36cce6175 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* rma
+# 	* rma
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,15 +24,22 @@ msgid "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma_team.py:46
+#: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: rma
+#: 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 ""
+
 #. 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"
+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"
@@ -42,7 +49,7 @@ msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
 "    <br/><br/>\n"
 "    Do not hesitate to contact us if you have any question.\n"
 "</p>\n"
-"</div>\n"
+"            </div>\n"
 "        "
 msgstr ""
 
@@ -53,42 +60,58 @@ msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-msgid "<i class=\"fa fa-fw fa-check\"/> <b>Paid</b>"
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
 msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-msgid "<i class=\"fa fa-fw fa-clock-o\"/> <b>Waiting Payment</b>"
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
 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\"/>"
+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\" title=\"Download\"/>"
+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\"><i class=\"fa fa-fw fa-times\"/> Cancelled</span>"
+msgid ""
+"<span class=\"badge badge-danger label-text-align\"><i class=\"fa fa-fw fa-"
+"times\"/> Cancelled</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>"
+msgid ""
+"<span class=\"badge badge-info label-text-align\"><i class=\"fa fa-fw fa-"
+"clock-o\"/> Preparation</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>"
+msgid ""
+"<span class=\"badge badge-success label-text-align\"><i class=\"fa fa-fw fa-"
+"truck\"/> Shipped</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>"
+msgid ""
+"<span class=\"badge badge-warning label-text-align\"><i class=\"fa fa-fw fa-"
+"clock-o\"/> Partially Available</span>"
 msgstr ""
 
 #. module: rma
@@ -209,7 +232,9 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
-msgid "A Python dictionary that will be evaluated to provide default values when creating new records for this alias."
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
 msgstr ""
 
 #. module: rma
@@ -238,6 +263,11 @@ msgstr ""
 msgid "Activities"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_state
 msgid "Activity State"
@@ -317,7 +347,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
 msgid "Canceled"
 msgstr ""
 
@@ -359,8 +389,8 @@ msgid "Confirm"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
-#: selection:rma,state:0
 msgid "Confirmed"
 msgstr ""
 
@@ -404,7 +434,7 @@ msgid "Customer Portal URL"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:42
+#: 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
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -474,8 +504,8 @@ msgid "Display Name"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
-#: selection:rma,state:0
 msgid "Draft"
 msgstr ""
 
@@ -485,15 +515,6 @@ msgstr ""
 msgid "Draft RMA"
 msgstr ""
 
-#. module: rma
-#: code:addons/rma/models/rma.py:1098
-#, python-format
-msgid "E-mail subject: %s\n"
-"\n"
-"E-mail body:\n"
-"%s"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email"
@@ -505,7 +526,7 @@ msgid "Email Alias"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/wizard/rma_split.py:63
+#: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
 msgstr ""
@@ -549,57 +570,69 @@ 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)"
+msgid ""
+"ID of the parent record holding the alias (example: project holding the task"
+" creation alias)"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,help:rma.field_rma__message_unread
-#: model:ir.model.fields,help:rma.field_rma_team__message_unread
-msgid "If checked new messages require your attention."
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
 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 ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
-msgid "If the active field is set to false, it will allow you to hide the RMA Team without removing it."
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1102
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
 msgstr ""
 
 #. module: rma
-#: model:ir.model,name:rma.model_account_invoice
-msgid "Invoice"
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
-msgid "Invoice Address"
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
 msgstr ""
 
 #. module: rma
-#: model:ir.model,name:rma.model_account_invoice_line
-msgid "Invoice Line"
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entries"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
-msgid "Is Follower"
+#: model:ir.model,name:rma.model_account_move_line
+msgid "Journal Item"
 msgstr ""
 
 #. module: rma
@@ -645,7 +678,7 @@ msgid "Lock"
 msgstr ""
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
 msgid "Locked"
 msgstr ""
 
@@ -678,7 +711,7 @@ msgid "Messages"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:43
+#: 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
 #: model:ir.model.fields,field_description:rma.field_rma_team__name
@@ -687,9 +720,8 @@ msgid "Name"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:31
-#: code:addons/rma/models/rma.py:494
-#: code:addons/rma/models/rma.py:1101
+#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
 msgstr ""
@@ -710,24 +742,24 @@ msgid "Next Activity Type"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:772
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:755
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
 msgstr ""
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
 msgid "Normal"
 msgstr ""
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
 msgid "Not urgent"
 msgstr ""
 
@@ -740,7 +772,7 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: rma
@@ -763,7 +795,10 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
-msgid "Optional ID of a thread (record) to which all incoming messages will be attached, even if they did not reply to it. If set, this will disable the creation of new records completely."
+msgid ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
 msgstr ""
 
 #. module: rma
@@ -786,11 +821,6 @@ msgstr ""
 msgid "Other Information"
 msgstr ""
 
-#. module: rma
-#: selection:rma,activity_state:0
-msgid "Overdue"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
 msgid "Owner"
@@ -808,7 +838,10 @@ 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) and task (model))"
+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) and task (model))"
 msgstr ""
 
 #. module: rma
@@ -816,18 +849,13 @@ msgstr ""
 msgid "Partner"
 msgstr ""
 
-#. module: rma
-#: selection:rma,activity_state:0
-msgid "Planned"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_contact
-msgid "Policy to post a message on the document using the mailgateway.\n"
+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"
-""
 msgstr ""
 
 #. module: rma
@@ -868,8 +896,8 @@ msgid "Quantity"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/wizard/rma_delivery.py:49
-#: sql_constraint:rma.split.wizard:0
+#: 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
 msgid "Quantity must be greater than 0."
 msgstr ""
@@ -880,9 +908,11 @@ msgid "Quantity to extract"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:805
+#: code:addons/rma/models/rma.py:0
 #, python-format
-msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
+msgid ""
+"Quantity to extract cannot be greater than remaining delivery quantity (%s "
+"%s)"
 msgstr ""
 
 #. module: rma
@@ -893,7 +923,7 @@ msgstr ""
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_action
 #: model:ir.model,name:rma.model_rma
-#: model:ir.model.fields,field_description:rma.field_account_invoice_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
 #: model:ir.module.category,name:rma.rma_module_category
@@ -910,7 +940,7 @@ msgid "RMA #"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/res_company.py:18
+#: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
 msgstr ""
@@ -926,7 +956,7 @@ msgid "RMA Deadline"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:82
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
 msgstr ""
@@ -964,7 +994,7 @@ msgid "RMA Out Type"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:73
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
 msgstr ""
@@ -1053,8 +1083,8 @@ msgid "Receipt"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
-#: selection:rma,state:0
 msgid "Received"
 msgstr ""
 
@@ -1074,7 +1104,7 @@ msgid "Reference of the document that generated this RMA."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:693
+#: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
@@ -1093,7 +1123,7 @@ msgid "Refund line"
 msgstr ""
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
 msgid "Refunded"
 msgstr ""
 
@@ -1113,8 +1143,8 @@ msgid "Repair"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
-#: selection:rma.delivery.wizard,type:0
 #: model:rma.operation,name:rma.rma_operation_replace
 msgid "Replace"
 msgstr ""
@@ -1125,20 +1155,27 @@ msgid "Replace Product"
 msgstr ""
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
 msgid "Replaced"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1011
+#: 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."
+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 ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:1022
+#: 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."
+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 ""
 
 #. module: rma
@@ -1152,7 +1189,7 @@ msgid "Requested operation"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:736
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
 msgstr ""
@@ -1175,19 +1212,21 @@ msgstr ""
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
-#: selection:rma.delivery.wizard,type:0
 msgid "Return to customer"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:972
+#: 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."
+msgid ""
+"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
+"id=\"%d\">%s</a> has been created."
 msgstr ""
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
 msgid "Returned"
 msgstr ""
 
@@ -1196,6 +1235,12 @@ msgstr ""
 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"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1227,13 +1272,13 @@ msgid "Sequence"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:48
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/stock_warehouse.py:53
+#: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
 msgstr ""
@@ -1265,9 +1310,11 @@ msgid "Split RMA"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:889
+#: 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."
+msgid ""
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been"
+" created."
 msgstr ""
 
 #. module: rma
@@ -1277,7 +1324,7 @@ msgid "State"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:44
+#: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
@@ -1285,7 +1332,8 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_state
-msgid "Status based on activities\n"
+msgid ""
+"Status based on activities\n"
 "Overdue: Due date is already passed\n"
 "Today: Activity date is today\n"
 "Planned: Future activities."
@@ -1313,57 +1361,70 @@ msgid "Team Members"
 msgstr ""
 
 #. module: rma
-#: sql_constraint:rma.operation:0
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
 msgid "That operation name already exists !"
 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)"
+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)"
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_name
-msgid "The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.odoo.com>"
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid "The owner of records created upon receiving emails on this alias. If this field is not set the system will attempt to find the right owner based on the sender (From) address, or will use the Administrator account if no system user is found for that address."
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/stock_move.py:64
+#: 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)."
+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 ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:793
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/account_invoice.py:22
+#: 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."
+msgid ""
+"There is at least one invoice lines whose quantity is less than the quantity"
+" specified in its linked RMA."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:782
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:769
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:752
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
 msgstr ""
@@ -1374,11 +1435,6 @@ msgstr ""
 msgid "To Refund"
 msgstr ""
 
-#. module: rma
-#: selection:rma,activity_state:0
-msgid "Today"
-msgstr ""
-
 #. module: rma
 #: model:ir.model,name:rma.model_stock_picking
 msgid "Transfer"
@@ -1394,6 +1450,11 @@ msgstr ""
 msgid "Type of Operation"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unassigned RMAs"
@@ -1433,7 +1494,7 @@ msgid "UoM"
 msgstr ""
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
 msgid "Urgent"
 msgstr ""
 
@@ -1453,17 +1514,17 @@ msgid "Users"
 msgstr ""
 
 #. module: rma
-#: selection:rma,priority:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__3
 msgid "Very Urgent"
 msgstr ""
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
 msgstr ""
 
 #. module: rma
-#: selection:rma,state:0
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
 msgid "Waiting for return"
 msgstr ""
 
@@ -1487,20 +1548,28 @@ msgid "Website communication history"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/models/rma.py:516
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
 
 #. module: rma
-#: code:addons/rma/wizard/stock_picking_return.py:55
+#: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
-msgid "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will be created"
+msgid ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "object._get_report_base_filename()"
 msgstr ""
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
-msgid "the user will have access to all records of everyone in the RMA application."
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
 msgstr ""
 
 #. module: rma
@@ -1510,6 +1579,7 @@ msgstr ""
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_manager
-msgid "the user will have an access to the RMA configuration as well as statistic reports."
+msgid ""
+"the user will have an access to the RMA configuration as well as statistic "
+"reports."
 msgstr ""
-
diff --git a/rma/migrations/12.0.2.0.0/post-migration.py b/rma/migrations/12.0.2.0.0/post-migration.py
deleted file mode 100644
index 6056dcabe..000000000
--- a/rma/migrations/12.0.2.0.0/post-migration.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2020 Tecnativa - David Vidal
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from openupgradelib import openupgrade
-
-
-@openupgrade.migrate()
-def migrate(env, version):
-    # Convert Text description field to Html
-    openupgrade.convert_field_to_html(env.cr, "rma", "description", "description")
diff --git a/rma/models/__init__.py b/rma/models/__init__.py
index 134da114c..f3c5b7de7 100644
--- a/rma/models/__init__.py
+++ b/rma/models/__init__.py
@@ -1,6 +1,6 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from . import account_invoice
+from . import account_move
 from . import rma
 from . import rma_operation
 from . import rma_team
diff --git a/rma/models/account_invoice.py b/rma/models/account_move.py
similarity index 84%
rename from rma/models/account_invoice.py
rename to rma/models/account_move.py
index 823a49899..3bd81e6c4 100644
--- a/rma/models/account_invoice.py
+++ b/rma/models/account_move.py
@@ -6,10 +6,10 @@
 from odoo.tools import float_compare
 
 
-class AccountInvoice(models.Model):
-    _inherit = "account.invoice"
+class AccountMove(models.Model):
+    _inherit = "account.move"
 
-    def action_invoice_open(self):
+    def post(self):
         """ Avoids to validate a refund with less quantity of product than
         quantity in the linked RMA.
         """
@@ -33,7 +33,7 @@ def action_invoice_open(self):
                     "less than the quantity specified in its linked RMA."
                 )
             )
-        return super().action_invoice_open()
+        return super().post()
 
     def unlink(self):
         rma = self.mapped("invoice_line_ids.rma_id")
@@ -41,7 +41,7 @@ def unlink(self):
         return super().unlink()
 
 
-class AccountInvoiceLine(models.Model):
-    _inherit = "account.invoice.line"
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
 
     rma_id = fields.Many2one(comodel_name="rma", string="RMA",)
diff --git a/rma/models/res_partner.py b/rma/models/res_partner.py
index d26f3845e..45ff8f1bc 100644
--- a/rma/models/res_partner.py
+++ b/rma/models/res_partner.py
@@ -16,9 +16,7 @@ def _compute_rma_count(self):
         rma_data = self.env["rma"].read_group(
             [("partner_id", "in", self.ids)], ["partner_id"], ["partner_id"]
         )
-        mapped_data = {
-            r["partner_id"][0]: r["partner_id_count"] for r in rma_data
-        }
+        mapped_data = {r["partner_id"][0]: r["partner_id_count"] for r in rma_data}
         for record in self:
             record.rma_count = mapped_data.get(record.id, 0)
 
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 4c6251a13..78b19acbf 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -8,7 +8,6 @@
 from odoo.tests import Form
 from odoo.tools import html2plaintext
 
-import odoo.addons.decimal_precision as dp
 from odoo.addons.stock.models.stock_move import PROCUREMENT_PRIORITIES
 
 
@@ -34,7 +33,7 @@ def _domain_location_id(self):
     )
     origin = fields.Char(
         string="Source Document",
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
         help="Reference of the document that generated this RMA.",
     )
     date = fields.Datetime(
@@ -45,24 +44,26 @@ def _domain_location_id(self):
         states={"draft": [("readonly", False)]},
     )
     deadline = fields.Date(
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
     )
     user_id = fields.Many2one(
         comodel_name="res.users",
         string="Responsible",
-        track_visibility="always",
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
+        index=True,
+        default=lambda self: self.env.user,
+        tracking=True,
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
     )
     team_id = fields.Many2one(
         comodel_name="rma.team",
         string="RMA team",
         index=True,
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
     )
     company_id = fields.Many2one(
         comodel_name="res.company",
-        default=lambda self: self.env.user.company_id,
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
+        default=lambda self: self.env.company,
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
     )
     partner_id = fields.Many2one(
         string="Customer",
@@ -70,14 +71,14 @@ def _domain_location_id(self):
         readonly=True,
         states={"draft": [("readonly", False)]},
         index=True,
-        track_visibility="always",
+        tracking=True,
     )
     partner_invoice_id = fields.Many2one(
         string="Invoice Address",
         comodel_name="res.partner",
         readonly=True,
         states={"draft": [("readonly", False)]},
-        domain=[("customer", "=", True)],
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
         help="Refund address for current RMA.",
     )
     commercial_partner_id = fields.Many2one(
@@ -111,7 +112,7 @@ def _domain_location_id(self):
         string="Quantity",
         required=True,
         default=1.0,
-        digits=dp.get_precision("Product Unit of Measure"),
+        digits="Product Unit of Measure",
         readonly=True,
         states={"draft": [("readonly", False)]},
     )
@@ -158,10 +159,10 @@ def _domain_location_id(self):
         ],
         default="draft",
         copy=False,
-        track_visibility="onchange",
+        tracking=True,
     )
     description = fields.Html(
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)],},
+        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
     )
     # Reception fields
     location_id = fields.Many2one(
@@ -178,10 +179,10 @@ def _domain_location_id(self):
     )
     # Refund fields
     refund_id = fields.Many2one(
-        comodel_name="account.invoice", string="Refund", readonly=True, copy=False,
+        comodel_name="account.move", string="Refund", readonly=True, copy=False,
     )
     refund_line_id = fields.Many2one(
-        comodel_name="account.invoice.line",
+        comodel_name="account.move.line",
         string="Refund line",
         readonly=True,
         copy=False,
@@ -200,26 +201,27 @@ def _domain_location_id(self):
     )
     delivered_qty = fields.Float(
         string="Delivered qty",
-        digits=dp.get_precision("Product Unit of Measure"),
+        digits="Product Unit of Measure",
         compute="_compute_delivered_qty",
         store=True,
     )
     delivered_qty_done = fields.Float(
         string="Delivered qty done",
-        digits=dp.get_precision("Product Unit of Measure"),
+        digits="Product Unit of Measure",
         compute="_compute_delivered_qty",
+        compute_sudo=True,
     )
     can_be_returned = fields.Boolean(compute="_compute_can_be_returned",)
     can_be_replaced = fields.Boolean(compute="_compute_can_be_replaced",)
     can_be_locked = fields.Boolean(compute="_compute_can_be_locked",)
     remaining_qty = fields.Float(
         string="Remaining delivered qty",
-        digits=dp.get_precision("Product Unit of Measure"),
+        digits="Product Unit of Measure",
         compute="_compute_remaining_qty",
     )
     remaining_qty_to_done = fields.Float(
         string="Remaining delivered qty to done",
-        digits=dp.get_precision("Product Unit of Measure"),
+        digits="Product Unit of Measure",
         compute="_compute_remaining_qty",
     )
     # Split fields
@@ -457,7 +459,7 @@ def _onchange_product_id(self):
                 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.user.company_id
+                company = self.company_id or self.env.company
                 warehouse = self.env["stock.warehouse"].search(
                     [("company_id", "=", company.id)], limit=1
                 )
@@ -465,19 +467,21 @@ def _onchange_product_id(self):
         return {"domain": {"product_uom": domain_product_uom}}
 
     # CRUD methods (ORM overrides)
-    @api.model
-    def create(self, vals):
-        if vals.get("name", _("New")) == _("New"):
-            ir_sequence = self.env["ir.sequence"]
-            if "company_id" in vals:
-                ir_sequence = ir_sequence.with_context(force_company=vals["company_id"])
-            vals["name"] = ir_sequence.next_by_code("rma")
-        # Assign a default team_id which will be the first in the sequence
-        if "team_id" not in vals:
-            vals["team_id"] = self.env["rma.team"].search([], limit=1).id
-        return super().create(vals)
-
-    @api.multi
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            if vals.get("name", _("New")) == _("New"):
+                ir_sequence = self.env["ir.sequence"]
+                if "company_id" in vals:
+                    ir_sequence = ir_sequence.with_context(
+                        force_company=vals["company_id"]
+                    )
+                vals["name"] = ir_sequence.next_by_code("rma")
+            # Assign a default team_id which will be the first in the sequence
+            if "team_id" not in vals:
+                vals["team_id"] = self.env["rma.team"].search([], limit=1).id
+        return super().create(vals_list)
+
     def copy(self, default=None):
         team = super().copy(default)
         for follower in self.message_follower_ids:
@@ -529,9 +533,7 @@ def action_confirm(self):
                 reception_move = self._create_receptions_from_picking()
             else:
                 reception_move = self._create_receptions_from_product()
-            self.write(
-                {"reception_move_id": reception_move.id, "state": "confirmed",}
-            )
+            self.write({"reception_move_id": reception_move.id, "state": "confirmed"})
             if self.partner_id not in self.message_partner_ids:
                 self.message_subscribe([self.partner_id.id])
 
@@ -547,24 +549,24 @@ def action_refund(self):
         for rmas in group_dict.values():
             origin = ", ".join(rmas.mapped("name"))
             invoice_form = Form(
-                self.env["account.invoice"].with_context(
+                self.env["account.move"].with_context(
                     default_type="out_refund", company_id=rmas[0].company_id.id,
                 ),
-                "account.invoice_form",
+                "account.view_move_form",
             )
             rmas[0]._prepare_refund(invoice_form, origin)
             refund = invoice_form.save()
             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)
-                # 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 instead of save the form. We also need
-                # the new refund line id to be linked to the rma.
-                refund_vals = invoice_form._values_to_save(all_fields=True)
-                line_vals = refund_vals["invoice_line_ids"][-1][2]
-                line_vals.update(invoice_id=refund.id, rma_id=rma.id)
-                line = self.env["account.invoice.line"].create(line_vals)
+                refund = invoice_form.save()
+                line = refund.invoice_line_ids.filtered(lambda r: not r.rma_id)
+                line.rma_id = rma.id
                 rma.write(
                     {
                         "refund_line_id": line.id,
@@ -572,6 +574,7 @@ def action_refund(self):
                         "state": "refunded",
                     }
                 )
+            refund.invoice_origin = origin
             refund.message_post_with_view(
                 "mail.message_origin_link",
                 values={"self": refund, "origin": rmas},
@@ -683,8 +686,8 @@ def action_view_refund(self):
             "type": "ir.actions.act_window",
             "view_type": "form",
             "view_mode": "form",
-            "res_model": "account.invoice",
-            "views": [(self.env.ref("account.invoice_form").id, "form")],
+            "res_model": "account.move",
+            "views": [(self.env.ref("account.view_move_form").id, "form")],
             "res_id": self.refund_id.id,
         }
 
@@ -800,12 +803,15 @@ def _create_receptions_from_picking(self):
         self.ensure_one()
         create_vals = {}
         if self.location_id:
-            create_vals["location_id"] = self.location_id.id
+            create_vals.update(
+                location_id=self.location_id.id, picking_id=self.picking_id.id,
+            )
         return_wizard = (
             self.env["stock.return.picking"]
             .with_context(active_id=self.picking_id.id, active_ids=self.picking_id.ids,)
             .create(create_vals)
         )
+        return_wizard._onchange_picking_id()
         return_wizard.product_return_moves.filtered(
             lambda r: r.move_id != self.move_id
         ).unlink()
@@ -843,7 +849,6 @@ def _create_receptions_from_product(self):
         return picking.move_lines
 
     def _prepare_picking(self, picking_form):
-        picking_form.company_id = self.company_id
         picking_form.origin = self.name
         picking_form.partner_id = self.partner_id
         picking_form.location_dest_id = self.location_id
@@ -898,9 +903,7 @@ def _prepare_refund(self, invoice_form, origin):
         rma.action_refund
         """
         self.ensure_one()
-        invoice_form.company_id = self.company_id
         invoice_form.partner_id = self.partner_invoice_id
-        invoice_form.origin = origin
 
     def _prepare_refund_line(self, line_form):
         """ Hook method for preparing a refund line Form.
@@ -914,7 +917,7 @@ def _prepare_refund_line(self, line_form):
         self.ensure_one()
         line_form.product_id = self.product_id
         line_form.quantity = self.product_uom_qty
-        line_form.uom_id = self.product_uom
+        line_form.product_uom_id = self.product_uom
         line_form.price_unit = self._get_refund_line_price_unit()
 
     def _get_refund_line_price_unit(self):
@@ -928,7 +931,8 @@ def create_return(self, scheduled_date, qty=None, uom=None):
         self._ensure_can_be_returned()
         self._ensure_qty_to_return(qty, uom)
         group_dict = {}
-        for record in self.filtered("can_be_returned"):
+        rmas_to_return = self.filtered("can_be_returned")
+        for record in rmas_to_return:
             key = (record.partner_id.id, record.company_id.id, record.warehouse_id)
             group_dict.setdefault(key, self.env["rma"])
             group_dict[key] |= record
@@ -972,11 +976,10 @@ def create_return(self, scheduled_date, qty=None, uom=None):
                 values={"self": picking, "origin": rmas},
                 subtype_id=self.env.ref("mail.mt_note").id,
             )
-        self.write({"state": "waiting_return"})
+        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.company_id = self.company_id
         picking_form.origin = origin or self.name
         picking_form.partner_id = self.partner_id
 
@@ -1052,15 +1055,18 @@ def _action_launch_stock_rule(
         values = self._prepare_procurement_values(
             self.procurement_group_id, scheduled_date, warehouse
         )
-        self.env["procurement.group"].run(
+        procurement = self.env["procurement.group"].Procurement(
             product,
             qty,
             uom,
             self.partner_id.property_stock_customer,
             self.product_id.display_name,
             self.procurement_group_id.name,
+            self.company_id,
             values,
         )
+        self.env["procurement.group"].run([procurement])
+        return True
 
     def _prepare_procurement_values(
         self, group_id, scheduled_date, warehouse,
@@ -1077,11 +1083,11 @@ def _prepare_procurement_values(
         }
 
     # Mail business methods
-    def _track_subtype(self, init_values):
-        self.ensure_one()
-        if "state" in init_values and self.state == "draft":
-            return "rma.mt_rma_draft"
-        return super()._track_subtype(init_values)
+    def _creation_subtype(self):
+        if self.state in ("draft", "confirmed"):
+            return self.env.ref("rma.mt_rma_draft")
+        else:
+            return super()._creation_subtype()
 
     def message_new(self, msg_dict, custom_values=None):
         """Extract the needed values from an incoming rma emails data-set
@@ -1091,7 +1097,10 @@ def message_new(self, msg_dict, custom_values=None):
             custom_values = {}
         subject = msg_dict.get("subject", "")
         body = html2plaintext(msg_dict.get("body", ""))
-        desc = _("E-mail subject: %s\n\nE-mail body:\n%s") % (subject, body)
+        desc = _("<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s") % (
+            subject,
+            body,
+        )
         defaults = {
             "description": desc,
             "name": _("New"),
diff --git a/rma/models/rma_team.py b/rma/models/rma_team.py
index 11faca129..4bb2e7d72 100644
--- a/rma/models/rma_team.py
+++ b/rma/models/rma_team.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import _, fields, models
 
 
 class RmaTeam(models.Model):
@@ -20,7 +20,7 @@ class RmaTeam(models.Model):
     company_id = fields.Many2one(
         comodel_name="res.company",
         string="Company",
-        default=lambda self: self.env.user.company_id,
+        default=lambda self: self.env.company,
     )
     user_id = fields.Many2one(
         comodel_name="res.users",
@@ -32,7 +32,6 @@ class RmaTeam(models.Model):
         comodel_name="res.users", inverse_name="rma_team_id", string="Team Members",
     )
 
-    @api.multi
     def copy(self, default=None):
         self.ensure_one()
         if default is None:
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index 3912b122a..a1b702c81 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -43,7 +43,7 @@ def _action_cancel(self):
         cancelled_moves.mapped("rma_id").update_replaced_state()
         return res
 
-    def _action_done(self):
+    def _action_done(self, cancel_backorder=False):
         """ Avoids to validate stock.move with less quantity than the
         quantity in the linked receiver RMA. It also set the appropriated
         linked RMA to 'received' or 'delivered'.
diff --git a/rma/models/stock_picking.py b/rma/models/stock_picking.py
index 449e1fe3f..e343ae3a2 100644
--- a/rma/models/stock_picking.py
+++ b/rma/models/stock_picking.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class StockPicking(models.Model):
@@ -13,7 +13,6 @@ def _compute_rma_count(self):
         for rec in self:
             rec.rma_count = len(rec.move_lines.mapped("rma_ids"))
 
-    @api.multi
     def copy(self, default=None):
         self.ensure_one()
         if self.env.context.get("set_rma_picking_type"):
diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py
index 86fc2cf0b..0b1c30916 100644
--- a/rma/models/stock_warehouse.py
+++ b/rma/models/stock_warehouse.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, fields, models
+from odoo import _, api, fields, models
 
 
 class StockWarehouse(models.Model):
@@ -23,21 +23,33 @@ class StockWarehouse(models.Model):
     )
     rma_loc_id = fields.Many2one(comodel_name="stock.location", string="RMA Location",)
 
-    def _get_locations_values(self, vals):
-        values = super()._get_locations_values(vals)
-        values.update(
-            {
-                "rma_loc_id": {
-                    "name": "RMA",
-                    "active": True,
-                    "return_location": True,
-                    "usage": "internal",
-                    "company_id": vals.get("company_id", self.company_id.id),
-                    "location_id": self.view_location_id.id,
-                },
-            }
-        )
-        return values
+    @api.model_create_multi
+    def create(self, vals_list):
+        """ To create an RMA location and link it with a new warehouse,
+        this method is overridden instead of '_get_locations_values'
+        method because the locations that are created with the
+        values ​​returned by that method are forced to be children
+        of view_location_id, and we don't want that.
+        """
+        res = super().create(vals_list)
+        stock_location = self.env["stock.location"]
+        for record in res:
+            rma_location_vals = record._get_rma_location_values()
+            record.rma_loc_id = stock_location.create(rma_location_vals).id
+        return res
+
+    def _get_rma_location_values(self):
+        """ this method is intended to be used by 'create' method
+        to create a new RMA location to be linked to a new warehouse.
+        """
+        return {
+            "name": self.view_location_id.name,
+            "active": True,
+            "return_location": True,
+            "usage": "internal",
+            "company_id": self.company_id.id,
+            "location_id": self.env.ref("rma.stock_location_rma").id,
+        }
 
     def _get_sequence_values(self):
         values = super()._get_sequence_values()
@@ -79,6 +91,8 @@ def _get_picking_type_create_values(self, max_sequence):
                     "default_location_src_id": False,
                     "default_location_dest_id": self.rma_loc_id.id,
                     "sequence": max_sequence + 1,
+                    "sequence_code": "RMA/IN",
+                    "company_id": self.company_id.id,
                 },
                 "rma_out_type_id": {
                     "name": _("RMA Delivery Orders"),
@@ -88,6 +102,8 @@ def _get_picking_type_create_values(self, max_sequence):
                     "default_location_src_id": self.rma_loc_id.id,
                     "default_location_dest_id": False,
                     "sequence": max_sequence + 2,
+                    "sequence_code": "RMA/OUT",
+                    "company_id": self.company_id.id,
                 },
             }
         )
@@ -97,8 +113,8 @@ def _get_picking_type_update_values(self):
         data = super()._get_picking_type_update_values()
         data.update(
             {
-                "rma_in_type_id": {"default_location_dest_id": self.rma_loc_id.id,},
-                "rma_out_type_id": {"default_location_src_id": self.rma_loc_id.id,},
+                "rma_in_type_id": {"default_location_dest_id": self.rma_loc_id.id},
+                "rma_out_type_id": {"default_location_src_id": self.rma_loc_id.id},
             }
         )
         return data
diff --git a/rma/security/rma_security.xml b/rma/security/rma_security.xml
index 81385aa12..e7c422899 100644
--- a/rma/security/rma_security.xml
+++ b/rma/security/rma_security.xml
@@ -69,7 +69,7 @@
         <field name="global" eval="True" />
         <field
             name="domain_force"
-        >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
     </record>
     <record id="rma_team_rule_multi_company" model="ir.rule">
         <field name="name">RMA team multi-company</field>
@@ -77,7 +77,7 @@
         <field name="global" eval="True" />
         <field
             name="domain_force"
-        >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
     </record>
     <!-- New users will belong to rma_group_user_own  -->
     <record id="base.default_user" model="res.users">
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index 88523ce37..f99fdcdeb 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.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/12.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-12-0/rma-12-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/12.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" 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/13.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-13-0/rma-13-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/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-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
@@ -477,7 +477,7 @@ <h1><a class="toc-backref" href="#id4">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:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2013.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">
@@ -508,7 +508,7 @@ <h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
 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/12.0/rma">OCA/rma</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/13.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 db80078b3..b917f2692 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -2,9 +2,10 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo.exceptions import UserError, ValidationError
-from odoo.tests import Form, SavepointCase
+from odoo.tests import Form, SavepointCase, tagged
 
 
+@tagged("post_install", "-at_install")
 class TestRma(SavepointCase):
     @classmethod
     def setUpClass(cls):
@@ -16,27 +17,11 @@ def setUpClass(cls):
             [("company_id", "=", cls.company.id)], limit=1
         )
         cls.rma_loc = cls.warehouse_company.rma_loc_id
-        account_pay = cls.env["account.account"].create(
-            {
-                "code": "X1111",
-                "name": "Creditors - (test)",
-                "user_type_id": cls.env.ref("account.data_account_type_payable").id,
-                "reconcile": True,
-            }
-        )
-        cls.journal = cls.env["account.journal"].create(
-            {
-                "name": "sale_0",
-                "code": "SALE0",
-                "type": "sale",
-                "default_debit_account_id": account_pay.id,
-            }
-        )
         cls.product = cls.product_product.create(
-            {"name": "Product test 1", "type": "product",}
+            {"name": "Product test 1", "type": "product"}
         )
         account_type = cls.env["account.account.type"].create(
-            {"name": "RCV type", "type": "receivable",}
+            {"name": "RCV type", "type": "receivable", "internal_group": "income"}
         )
         cls.account_receiv = cls.env["account.account"].create(
             {
@@ -116,7 +101,6 @@ def _create_delivery(self):
             ),
             view="stock.view_picking_form",
         )
-        picking_form.company_id = self.company
         picking_form.partner_id = self.partner
         with picking_form.move_ids_without_package.new() as move:
             move.product_id = self.product
@@ -148,7 +132,7 @@ def test_onchange(self):
             }
         )
         product_2 = self.product_product.create(
-            {"name": "Product test 2", "type": "product", "uom_id": uom_ten.id,}
+            {"name": "Product test 2", "type": "product", "uom_id": uom_ten.id}
         )
         outgoing_picking_type = self.env["stock.picking.type"].search(
             [
@@ -165,8 +149,6 @@ def test_onchange(self):
             ),
             view="stock.view_picking_form",
         )
-        picking_form.company_id = self.company
-        picking_form.partner_id = self.partner
         picking_form.partner_id = self.partner
         with picking_form.move_ids_without_package.new() as move:
             move.product_id = product_2
@@ -275,16 +257,20 @@ def test_action_refund(self):
         self.assertEqual(rma.refund_id.state, "draft")
         self.assertEqual(rma.refund_line_id.product_id, rma.product_id)
         self.assertEqual(rma.refund_line_id.quantity, 10)
-        self.assertEqual(rma.refund_line_id.uom_id, rma.product_uom)
+        self.assertEqual(rma.refund_line_id.product_uom_id, rma.product_uom)
         self.assertEqual(rma.state, "refunded")
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
-        rma.refund_line_id.quantity = 9
+        with Form(rma.refund_line_id.move_id) as refund_form:
+            with refund_form.invoice_line_ids.edit(0) as refund_line:
+                refund_line.quantity = 9
         with self.assertRaises(ValidationError):
-            rma.refund_id.action_invoice_open()
-        rma.refund_line_id.quantity = 10
-        rma.refund_id.action_invoice_open()
+            rma.refund_id.post()
+        with Form(rma.refund_line_id.move_id) as refund_form:
+            with refund_form.invoice_line_ids.edit(0) as refund_line:
+                refund_line.quantity = 10
+        rma.refund_id.post()
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
@@ -354,14 +340,18 @@ def test_mass_refund(self):
         for rma in all_rmas:
             self.assertEqual(rma.product_id, rma.refund_line_id.product_id)
             self.assertEqual(rma.product_uom_qty, rma.refund_line_id.quantity)
-            self.assertEqual(rma.product_uom, rma.refund_line_id.uom_id)
+            self.assertEqual(rma.product_uom, rma.refund_line_id.product_uom_id)
         # Less quantity -> error on confirm
-        rma_2.refund_line_id.quantity = 14
+        with Form(rma_2.refund_line_id.move_id) as refund_form:
+            with refund_form.invoice_line_ids.edit(1) as refund_line:
+                refund_line.quantity = 14
         with self.assertRaises(ValidationError):
-            refund_1.action_invoice_open()
-        rma_2.refund_line_id.quantity = 15
-        refund_1.action_invoice_open()
-        refund_2.action_invoice_open()
+            refund_1.post()
+        with Form(rma_2.refund_line_id.move_id) as refund_form:
+            with refund_form.invoice_line_ids.edit(1) as refund_line:
+                refund_line.quantity = 15
+        refund_1.post()
+        refund_2.post()
 
     def test_replace(self):
         # Create, confirm and receive an RMA
@@ -573,8 +563,9 @@ def test_rma_from_picking_return(self):
         return_wizard = (
             self.env["stock.return.picking"]
             .with_context(active_id=origin_delivery.id, active_ids=origin_delivery.ids,)
-            .create({"create_rma": True})
+            .create({"create_rma": True, "picking_id": origin_delivery.id})
         )
+        return_wizard._onchange_picking_id()
         picking_action = return_wizard.create_returns()
         # Each origin move is linked to a different RMA
         origin_moves = origin_delivery.move_lines
@@ -657,7 +648,11 @@ def test_rma_to_receive_on_delete_invoice(self):
 
     def test_rma_picking_type_default_values(self):
         warehouse = self.env["stock.warehouse"].create(
-            {"name": "Stock - RMA Test", "code": "SRT",}
+            {"name": "Stock - RMA Test", "code": "SRT"}
         )
         self.assertFalse(warehouse.rma_in_type_id.use_create_lots)
         self.assertTrue(warehouse.rma_in_type_id.use_existing_lots)
+
+    def test_quantities_on_hand(self):
+        rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
+        self.assertEqual(rma.product_id.qty_available, 0)
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index 30b404fa8..ef0ea47d8 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -28,7 +28,7 @@
         priority="30"
     >
         <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
-            <t t-call="portal.portal_docs_entry" t-if="rma_count">
+            <t t-call="portal.portal_docs_entry">
                 <t t-set="title">RMA Orders</t>
                 <t t-set="url" t-value="'/my/rmas'" />
                 <t t-set="count" t-value="rma_count" />
@@ -157,9 +157,9 @@
                                 <div class="row">
                                     <div class="col flex-grow-0 pr-3">
                                         <img
-                                            t-if="rma.partner_id.image"
+                                            t-if="rma.partner_id.image_1024"
                                             class="rounded-circle mt-1 o_portal_contact_img"
-                                            t-att-src="image_data_uri(rma.partner_id.image)"
+                                            t-att-src="image_data_uri(rma.partner_id.image_1024)"
                                             alt="Contact"
                                         />
                                         <img
@@ -184,9 +184,9 @@
                                 <div class="row">
                                     <div class="col flex-grow-0 pr-3">
                                         <img
-                                            t-if="rma.user_id.image"
+                                            t-if="rma.user_id.image_1024"
                                             class="rounded-circle mt-1 o_portal_contact_img"
-                                            t-att-src="image_data_uri(rma.user_id.image)"
+                                            t-att-src="image_data_uri(rma.user_id.image_1024)"
                                             alt="Contact"
                                         />
                                         <img
@@ -360,10 +360,10 @@
                                     aria-label="Download"
                                     title="Download"
                                 />
-                                <span t-esc="refund.number" class="mr-lg-3" />
+                                <span t-esc="refund.name" class="mr-lg-3" />
                                 <div class="d-lg-inline-block">Date: <span
                                         class="text-muted"
-                                        t-field="refund.date_invoice"
+                                        t-field="refund.invoice_date"
                                     /></div>
                             </div>
                             <span
diff --git a/rma/views/rma_team_views.xml b/rma/views/rma_team_views.xml
index 55285afad..5ca01b821 100644
--- a/rma/views/rma_team_views.xml
+++ b/rma/views/rma_team_views.xml
@@ -141,7 +141,6 @@
     <record id="rma_team_action" model="ir.actions.act_window">
         <field name="name">RMA team</field>
         <field name="res_model">rma.team</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index a9434bc39..f270b8dac 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -352,7 +352,6 @@
     <record id="rma_action" model="ir.actions.act_window">
         <field name="name">RMA</field>
         <field name="res_model">rma</field>
-        <field name="view_type">form</field>
         <field name="view_mode">tree,form,pivot,calendar,activity</field>
         <field name="context">{"search_default_user_id": uid}</field>
         <field name="help" type="html">
diff --git a/rma/wizard/rma_delivery.py b/rma/wizard/rma_delivery.py
index 21ebaae02..ae7c0f429 100644
--- a/rma/wizard/rma_delivery.py
+++ b/rma/wizard/rma_delivery.py
@@ -4,8 +4,6 @@
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
 
-import odoo.addons.decimal_precision as dp
-
 
 class RmaReDeliveryWizard(models.TransientModel):
     _name = "rma.delivery.wizard"
@@ -13,7 +11,7 @@ class RmaReDeliveryWizard(models.TransientModel):
 
     rma_count = fields.Integer()
     type = fields.Selection(
-        selection=[("replace", "Replace"), ("return", "Return to customer"),],
+        selection=[("replace", "Replace"), ("return", "Return to customer")],
         string="Type",
         required=True,
     )
@@ -21,10 +19,10 @@ class RmaReDeliveryWizard(models.TransientModel):
         comodel_name="product.product", string="Replace Product",
     )
     product_uom_qty = fields.Float(
-        string="Product qty", digits=dp.get_precision("Product Unit of Measure"),
+        string="Product qty", digits="Product Unit of Measure",
     )
-    product_uom = fields.Many2one(comodel_name="uom.uom", string="Unit of measure",)
-    scheduled_date = fields.Datetime(required=True, default=fields.Datetime.now(),)
+    product_uom = fields.Many2one(comodel_name="uom.uom", string="Unit of measure")
+    scheduled_date = fields.Datetime(required=True, default=fields.Datetime.now())
     warehouse_id = fields.Many2one(
         comodel_name="stock.warehouse", string="Warehouse", required=True,
     )
diff --git a/rma/wizard/rma_delivery_views.xml b/rma/wizard/rma_delivery_views.xml
index c8ae41538..ae3ace93f 100644
--- a/rma/wizard/rma_delivery_views.xml
+++ b/rma/wizard/rma_delivery_views.xml
@@ -57,13 +57,11 @@
     <act_window
         id="rma_delivery_wizard_action"
         name="Return to customer"
-        src_model="rma"
+        binding_model="rma"
+        binding_views="list"
         res_model="rma.delivery.wizard"
-        view_type="form"
         view_mode="form"
-        key2="client_action_multi"
         target="new"
-        multi="True"
         context="{'rma_delivery_type': 'return'}"
     />
 </odoo>
diff --git a/rma/wizard/rma_split.py b/rma/wizard/rma_split.py
index f4fc5d9f9..1ac646a95 100644
--- a/rma/wizard/rma_split.py
+++ b/rma/wizard/rma_split.py
@@ -3,8 +3,6 @@
 
 from odoo import _, api, fields, models
 
-import odoo.addons.decimal_precision as dp
-
 
 class RmaReSplitWizard(models.TransientModel):
     _name = "rma.split.wizard"
@@ -13,7 +11,7 @@ class RmaReSplitWizard(models.TransientModel):
     rma_id = fields.Many2one(comodel_name="rma", string="RMA",)
     product_uom_qty = fields.Float(
         string="Quantity to extract",
-        digits=dp.get_precision("Product Unit of Measure"),
+        digits="Product Unit of Measure",
         required=True,
         help="Quantity to extract to a new RMA.",
     )
diff --git a/rma/wizard/rma_split_views.xml b/rma/wizard/rma_split_views.xml
index bf38f8f90..688075039 100644
--- a/rma/wizard/rma_split_views.xml
+++ b/rma/wizard/rma_split_views.xml
@@ -31,7 +31,6 @@
     <record id="rma_split_wizard_action" model="ir.actions.act_window">
         <field name="name">Split RMA</field>
         <field name="res_model">rma.split.wizard</field>
-        <field name="view_type">form</field>
         <field name="view_mode">form</field>
         <field name="target">new</field>
     </record>
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
index 9d80b4720..b337e73ab 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -25,14 +25,28 @@ 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([]).mapped("rma_loc_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)]
         else:
-            self.location_id = self.default_get(["location_id"])["location_id"]
+            # If self.create_rma is not True, the value of the location and
+            # the location domain 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}}
 

From bb0d7b52a4cff29681582c11c8c847f58ae212bc Mon Sep 17 00:00:00 2001
From: Ernesto Tejeda <ernesto.tejeda@tecnativa.com>
Date: Tue, 1 Dec 2020 09:37:45 -0500
Subject: [PATCH 014/108] [IMP] rma: Add customer as suggested recipient

---
 rma/__manifest__.py |  2 +-
 rma/i18n/es.po      |  2 ++
 rma/i18n/pt_BR.po   |  2 ++
 rma/i18n/rma.pot    |  2 ++
 rma/models/rma.py   | 13 ++++++++++++-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index ecc7ce28a..aac3ec2c6 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "13.0.1.0.0",
+    "version": "13.0.1.0.1",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index cbea57be7..1388d618f 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -466,7 +466,9 @@ msgid "Created on"
 msgstr "Creado el"
 
 #. module: rma
+#: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
 msgid "Customer"
 msgstr "Cliente"
 
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index c7e484c0d..7a06f38fc 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -446,7 +446,9 @@ msgid "Created on"
 msgstr "Criado em"
 
 #. module: rma
+#: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
 msgid "Customer"
 msgstr "Cliente"
 
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 36cce6175..de5d61abf 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -424,7 +424,9 @@ msgid "Created on"
 msgstr ""
 
 #. module: rma
+#: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
 msgid "Customer"
 msgstr ""
 
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 78b19acbf..8e7ddf4c9 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -4,7 +4,7 @@
 from collections import Counter
 
 from odoo import _, api, fields, models
-from odoo.exceptions import ValidationError
+from odoo.exceptions import AccessError, ValidationError
 from odoo.tests import Form
 from odoo.tools import html2plaintext
 
@@ -1135,6 +1135,17 @@ def message_post(self, **kwargs):
         self_with_context = self.with_context(mail_post_autofollow=True)
         return super(Rma, self_with_context).message_post(**kwargs)
 
+    def _message_get_suggested_recipients(self):
+        recipients = super()._message_get_suggested_recipients()
+        try:
+            for record in self.filtered("partner_id"):
+                record._message_add_suggested_recipient(
+                    recipients, partner=record.partner_id, reason=_("Customer")
+                )
+        except AccessError:  # no read access rights
+            pass
+        return recipients
+
     # Reporting business methods
     def _get_report_base_filename(self):
         self.ensure_one()

From fa37a911bf392d8b97d65d486c89303288d5b46f Mon Sep 17 00:00:00 2001
From: Dorin Hongu <dhongu@gmail.com>
Date: Fri, 11 Dec 2020 12:37:09 +0000
Subject: [PATCH 015/108] Added translation using Weblate (Romanian)

Currently translated at 62.2% (168 of 270 strings)

Translation: rma-13.0/rma-13.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-13-0/rma-13-0-rma/ro/
---
 rma/i18n/ro.po | 1646 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1646 insertions(+)
 create mode 100644 rma/i18n/ro.po

diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
new file mode 100644
index 000000000..a4eb7acb7
--- /dev/null
+++ b/rma/i18n/ro.po
@@ -0,0 +1,1646 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-12-20 05:43+0000\n"
+"Last-Translator: Dorin Hongu <dhongu@gmail.com>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+"X-Generator: Weblate 4.3.2\n"
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_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
+#: code:addons/rma/models/rma_team.py:0
+#, python-format
+msgid "%s (copy)"
+msgstr "%s (copie)"
+
+#. module: rma
+#: 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"
+
+#. 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"
+"            </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_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\"Download\"/>"
+msgstr ""
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Descarcă\" title=\""
+"Descarcă\"/>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
+msgstr ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Plătit</b>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
+msgstr ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Plata în așteptare</b>"
+
+#. 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 ""
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Descarcă\" "
+"title=\"Descarcă\"/>"
+
+#. 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 ""
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Descarcă\" title="
+"\"Descarcă\"/>"
+
+#. 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>"
+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>"
+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>"
+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>"
+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.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr "<strong class=\"d-block mb-1\">Livrare</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr "<strong class=\"d-block mb-1\">Recepție</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr "<strong class=\"d-block mb-1\">Rambursat</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr "<strong>Client:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr "<strong>Data:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr "<strong>Termen limită:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr "<strong>Termen limită</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr "<strong>Cant livrată:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr "<strong>Cantitate livrată</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Invoicing address:</strong>"
+msgstr "<strong>Adresă facturare:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr "<strong>Mișcare:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr "<strong>Livrare inițială:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin delivery</strong>"
+msgstr "<strong>Livrare inițială</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr "<strong>Origie:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr "<strong>Origine</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr "<strong>Produs:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr "<strong>Produs</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr "<strong>Cantitate:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr "<strong>Cantitate</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr "<strong>Dată formular retur</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr "<strong>Notă retur:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr "<strong>Responsabil:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr "<strong>Stare:</strong>"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+"Un dicționar Python care va fi evaluat pentru a furniza valori implicite "
+"atunci când se creează înregistrări noi pentru acest alias."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Accept Emails From"
+msgstr "Acceptă email-uri de la"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr "Avertizare acces"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr "Acțiune necesară"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+msgid "Active"
+msgstr "Activ"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr "Activități"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr "Status activitate"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr "Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr "Sigur doriți să anulați acest formular de retur"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr "Poate fi rambursat"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr "Poate fi înlocuit"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr "Poate fi returnat"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr "Poate fi divizat"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
+msgid "Canceled"
+msgstr "Anulat"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr "Faceți clic pentru a adăuga un nou formular de retur."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr "Entitate comercială"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr "Comunicare"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr "Companii"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr "Companie"
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr "Configurare"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr "Confirmă"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Confirmed"
+msgstr "Confirmat"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr "Contact"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr "Creați cerere retur"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr "Creat de"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr "Creat în"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
+msgid "Customer"
+msgstr "Client"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr "URL portal client"
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr "Dată"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr "Data:"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr "Termen limită"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr "Valori implicite"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr "Livrează"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered qty"
+msgstr "Cantitate livrată"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered qty done"
+msgstr "Cantitate livrată efectivă"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr "Livrare"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr "Rezervare livrare"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Description"
+msgstr "Descriere"
+
+#. module: rma
+#: 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_operation__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_team__display_name
+msgid "Display Name"
+msgstr "Nume afișat"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Draft"
+msgstr "Ciornă"
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr "Cerere retur ciornă"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr "Email"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/rma_split.py:0
+#, python-format
+msgid "Extracted RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr "Extras din"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+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
+msgid "Followers (Partners)"
+msgstr "Urmăritori (Parteneri)"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+msgstr "Grupează după"
+
+#. 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_operation__id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_team__id
+msgid "ID"
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr "Iconiță"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+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."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
+msgstr ""
+"Dacă câmpul activ este setat la fals, acesta vă va permite să ascundeți "
+"echipa fără a o elimina."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Incoming e-mail"
+msgstr "E-mail primite"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr "Adresă facurare"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr "Este Urmăritor"
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entries"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: rma
+#: 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_operation____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_team____last_update
+msgid "Last Modified on"
+msgstr "Ultima modificare în"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr "Ultima modificare de"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr "Ultima modificare în"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr "Cereri retur întârziate"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr "Locație"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr "Închide"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
+msgid "Locked"
+msgstr "Închis"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr "Gestionați autorizațiile de returnare a mărfurilor (RMA)."
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+msgid "Name"
+msgstr "Nume"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "New"
+msgstr "Nou"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a replacement."
+msgstr ""
+"La niciuna dintre cererile de retur selectate nu poate efectua o înlocuire."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a return."
+msgstr ""
+"La niciuna dintre cererile de retur selectate nu poate efectua un retur."
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+msgid "Normal"
+msgstr "Normal"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
+msgid "Not urgent"
+msgstr "Nu e urgent"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of errors"
+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 ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+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 ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr "Comenzi"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr "Livrare inițială"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr "Alte informații"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr "Proprietar"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+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) and task (model))"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr "Partener"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+msgstr ""
+"Politica de a posta un mesaj pe document folosind mailgateway.\n"
+"- toată lumea: toată lumea poate posta\n"
+"- parteneri: numai parteneri autentificați\n"
+"- adepți: numai adepții documentului înrudit sau membri ai canalelor\n"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr "Previzualizare"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr "Prioritate"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr "Grupul de achiziții"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr "Produs"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr "Cantitate produs"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Quantity"
+msgstr "Cantitate"
+
+#. module: rma
+#: 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
+msgid "Quantity must be greater than 0."
+msgstr "Cantitatea trebuie să fie mai mare de 0."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract"
+msgstr "Cantitatea de extras"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, 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)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr "Cantitatea de extras la un nou RMA."
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr "Cerere retur"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr "Număr retur"
+
+#. module: rma
+#: code:addons/rma/models/res_company.py:0
+#, python-format
+msgid "RMA Code"
+msgstr "Cod cerere retur"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr "Dată"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr "Termen limită"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr "Comenzi livrare"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+msgid "RMA Delivery Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr "Locație"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr "Comandă retur -"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr "Comenzi retur"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Receipts"
+msgstr "Recepții"
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr "Raport"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr "Echipă"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr "Recepții"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr "Operație solicitată"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr "Echipă"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr "Cereri retur"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr "Recepție"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Received"
+msgstr "Recepționat"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr "Mișcare recepție"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+msgid "Reference of the document that generated this RMA."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__refund_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: model:rma.operation,name:rma.rma_operation_refund
+#, python-format
+msgid "Refund"
+msgstr "Ramburs"
+
+#. 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"
+msgstr "Rambursat"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr ""
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr "Reparație"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: model:rma.operation,name:rma.rma_operation_replace
+msgid "Replace"
+msgstr "Înlocuire"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr "Înlocuire produs"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
+msgid "Replaced"
+msgstr "Înlocuit"
+
+#. module: rma
+#: 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."
+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
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_reporting_menu
+msgid "Reporting"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+msgid "Requested operation"
+msgstr "Operație solicitată"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Required field(s):%s"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr "Responsabil"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Return to customer"
+msgstr "Retur către client"
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
+msgid "Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr "Trimis"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA in"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA out"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr "Partajează"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr "Document sură"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+msgid "Split RMA"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__state
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "State"
+msgstr "Stare"
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:0
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#, python-format
+msgid "Status"
+msgstr "Stare"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr "Șef echipă"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr "Membrii echipei"
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
+msgid "That operation name already exists !"
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+"Proprietarul înregistrărilor create la primirea e-mailurilor de la acest "
+"alias. Dacă acest câmp nu este setat, sistemul va încerca să găsească "
+"proprietarul potrivit în funcție de adresa expeditorului (De la) sau va "
+"utiliza contul de administrator dacă nu este găsit niciun utilizator de "
+"sistem pentru acea adresă."
+
+#. module: rma
+#: 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)."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "The quantity to return is greater than remaining quantity."
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot be split."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a return."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr "De rambursat"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+#, fuzzy
+msgid "Transfer"
+msgstr "Transfer"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr "Tip"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr "Tip operație"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr "Unitate de măsură"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr "UM"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
+msgid "Urgent"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_all
+msgid "User: All Documents"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+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__priority__3
+msgid "Very Urgent"
+msgstr "Forate urgent"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
+msgid "Waiting for replacement"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
+msgid "Waiting for return"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "You cannot delete RMAs that are not in draft state"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
+msgstr ""
+"Trebuie să specificați „Clientul” în „Transferurile” din care vor fi create "
+"RMA-uri"
+
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "object._get_report_base_filename()"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+msgid ""
+"the user will have an access to the RMA configuration as well as statistic "
+"reports."
+msgstr ""

From e6d7640f51382a31ceb89b156eb4f78ae391d9c6 Mon Sep 17 00:00:00 2001
From: Bosd <c5e2fd43-d292-4c90-9d1f-74ff3436329a@anonaddy.me>
Date: Sun, 13 Dec 2020 21:10:31 +0000
Subject: [PATCH 016/108] Added translation using Weblate (Dutch)

---
 rma/i18n/nl.po | 1588 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1588 insertions(+)
 create mode 100644 rma/i18n/nl.po

diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
new file mode 100644
index 000000000..9661dcebe
--- /dev/null
+++ b/rma/i18n/nl.po
@@ -0,0 +1,1588 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_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
+#: code:addons/rma/models/rma_team.py:0
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: rma
+#: 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 ""
+
+#. 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"
+"            </div>\n"
+"        "
+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\"/>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
+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\" "
+"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\"><i class=\"fa fa-fw fa-"
+"times\"/> Cancelled</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>"
+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>"
+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>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Invoicing address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin delivery</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Accept Emails From"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+msgid "Active"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
+msgid "Canceled"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Confirmed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered qty done"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Description"
+msgstr ""
+
+#. module: rma
+#: 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_operation__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_team__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Draft"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/rma_split.py:0
+#, python-format
+msgid "Extracted RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+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
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+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_operation__id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_team__id
+msgid "ID"
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+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 ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Incoming e-mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entries"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: rma
+#: 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_operation____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_team____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
+msgid "Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+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
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a return."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+msgid "Normal"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
+msgid "Not urgent"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of errors"
+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 ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+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 ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+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) and task (model))"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Quantity"
+msgstr ""
+
+#. module: rma
+#: 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
+msgid "Quantity must be greater than 0."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid ""
+"Quantity to extract cannot be greater than remaining delivery quantity (%s "
+"%s)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/res_company.py:0
+#, python-format
+msgid "RMA Code"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+msgid "RMA Delivery Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Receipts"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Received"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+msgid "Reference of the document that generated this RMA."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__refund_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: model:rma.operation,name:rma.rma_operation_refund
+#, python-format
+msgid "Refund"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
+msgid "Refund address for current RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund line"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
+msgid "Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr ""
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: model:rma.operation,name:rma.rma_operation_replace
+msgid "Replace"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
+msgid "Replaced"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_reporting_menu
+msgid "Reporting"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+msgid "Requested operation"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Required field(s):%s"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Return to customer"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
+msgid "Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA in"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA out"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+msgid "Split RMA"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__state
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "State"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:0
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#, python-format
+msgid "Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
+msgid "That operation name already exists !"
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+
+#. module: rma
+#: 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)."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "The quantity to return is greater than remaining quantity."
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot be split."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a return."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
+msgid "Urgent"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_all
+msgid "User: All Documents"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+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__priority__3
+msgid "Very Urgent"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
+msgid "Waiting for replacement"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
+msgid "Waiting for return"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "You cannot delete RMAs that are not in draft state"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "object._get_report_base_filename()"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+msgid ""
+"the user will have an access to the RMA configuration as well as statistic "
+"reports."
+msgstr ""

From 67d8d2f9288e2a671a99b447ed28537f80952cfb Mon Sep 17 00:00:00 2001
From: Dong <dong@freshoo.cn>
Date: Sun, 21 Mar 2021 08:46:13 +0000
Subject: [PATCH 017/108] Added translation using Weblate (Chinese
 (Simplified))

Translated using Weblate (Chinese (Simplified))

Currently translated at 1.8% (5 of 270 strings)

Translation: rma-13.0/rma-13.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-13-0/rma-13-0-rma/zh_CN/
---
 rma/i18n/zh_CN.po | 1590 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1590 insertions(+)
 create mode 100644 rma/i18n/zh_CN.po

diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
new file mode 100644
index 000000000..c865460e1
--- /dev/null
+++ b/rma/i18n/zh_CN.po
@@ -0,0 +1,1590 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2021-03-21 11:46+0000\n"
+"Last-Translator: Dong <dong@freshoo.cn>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.3.2\n"
+
+#. module: rma
+#: model:mail.template,report_name:rma.mail_template_rma_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
+#: code:addons/rma/models/rma_team.py:0
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: rma
+#: 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 ""
+
+#. 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"
+"            </div>\n"
+"        "
+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\"/>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
+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\" "
+"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\"><i class=\"fa fa-fw fa-"
+"times\"/> Cancelled</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>"
+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>"
+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>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Invoicing address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin delivery</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Accept Emails From"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+msgid "Active"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
+msgid "Canceled"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Confirmed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered qty done"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Description"
+msgstr ""
+
+#. module: rma
+#: 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_operation__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_team__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Draft"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/rma_split.py:0
+#, python-format
+msgid "Extracted RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+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
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+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_operation__id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_team__id
+msgid "ID"
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+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 ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Incoming e-mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entries"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: rma
+#: 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_operation____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_team____last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
+msgid "Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+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
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a return."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+msgid "Normal"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
+msgid "Not urgent"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of errors"
+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 ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+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 ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+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) and task (model))"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Quantity"
+msgstr ""
+
+#. module: rma
+#: 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
+msgid "Quantity must be greater than 0."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid ""
+"Quantity to extract cannot be greater than remaining delivery quantity (%s "
+"%s)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/res_company.py:0
+#, python-format
+msgid "RMA Code"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+msgid "RMA Delivery Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Receipts"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Received"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+msgid "Reference of the document that generated this RMA."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__refund_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: model:rma.operation,name:rma.rma_operation_refund
+#, python-format
+msgid "Refund"
+msgstr "退货"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
+msgid "Refund address for current RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund line"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
+msgid "Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr ""
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr "维修"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#: model:rma.operation,name:rma.rma_operation_replace
+msgid "Replace"
+msgstr "换货"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr "换货产品"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
+msgid "Replaced"
+msgstr "已换货"
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_reporting_menu
+msgid "Reporting"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+msgid "Requested operation"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Required field(s):%s"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Return to customer"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
+msgid "Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA in"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA out"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+msgid "Split RMA"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__state
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "State"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:0
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#, python-format
+msgid "Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
+msgid "That operation name already exists !"
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+
+#. module: rma
+#: 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)."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "The quantity to return is greater than remaining quantity."
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot be split."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a return."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
+msgid "Urgent"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_all
+msgid "User: All Documents"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+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__priority__3
+msgid "Very Urgent"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
+msgid "Waiting for replacement"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
+msgid "Waiting for return"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "You cannot delete RMAs that are not in draft state"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "object._get_report_base_filename()"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+msgid ""
+"the user will have an access to the RMA configuration as well as statistic "
+"reports."
+msgstr ""

From 1247b23914fe09ed625c36321969171c12ebf83f Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Tue, 9 Feb 2021 13:50:02 +0100
Subject: [PATCH 018/108] [IMP] rma: auto send confirmation email

---
 rma/__manifest__.py                     |  1 +
 rma/models/__init__.py                  |  1 +
 rma/models/res_company.py               | 21 +++++++++-
 rma/models/res_config_settings.py       | 14 +++++++
 rma/models/rma.py                       | 10 +++++
 rma/tests/test_rma.py                   | 17 ++++++++
 rma/views/res_config_settings_views.xml | 52 +++++++++++++++++++++++++
 7 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 rma/models/res_config_settings.py
 create mode 100644 rma/views/res_config_settings_views.xml

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index aac3ec2c6..9abf748e0 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -29,6 +29,7 @@
         "views/rma_views.xml",
         "views/stock_picking_views.xml",
         "views/stock_warehouse_views.xml",
+        "views/res_config_settings_views.xml",
     ],
     "post_init_hook": "post_init_hook",
     "application": True,
diff --git a/rma/models/__init__.py b/rma/models/__init__.py
index f3c5b7de7..66a957a61 100644
--- a/rma/models/__init__.py
+++ b/rma/models/__init__.py
@@ -5,6 +5,7 @@
 from . import rma_operation
 from . import rma_team
 from . import res_company
+from . import res_config_settings
 from . import res_partner
 from . import res_users
 from . import stock_move
diff --git a/rma/models/res_company.py b/rma/models/res_company.py
index a71293911..0a270769d 100644
--- a/rma/models/res_company.py
+++ b/rma/models/res_company.py
@@ -1,12 +1,31 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, models
+from odoo import _, api, fields, models
 
 
 class Company(models.Model):
     _inherit = "res.company"
 
+    def _default_rma_mail_confirmation_template(self):
+        try:
+            return self.env.ref("rma.mail_template_rma_notification").id
+        except ValueError:
+            return False
+
+    send_rma_confirmation = fields.Boolean(
+        string="Send RMA Confirmation",
+        help="When the delivery is confirmed, send a confirmation email "
+        "to the customer.",
+    )
+    rma_mail_confirmation_template_id = fields.Many2one(
+        comodel_name="mail.template",
+        string="Email Template confirmation for RMA",
+        domain="[('model', '=', 'rma')]",
+        default=_default_rma_mail_confirmation_template,
+        help="Email sent to the customer once the RMA is confirmed.",
+    )
+
     @api.model
     def create(self, vals):
         company = super(Company, self).create(vals)
diff --git a/rma/models/res_config_settings.py b/rma/models/res_config_settings.py
new file mode 100644
index 000000000..d18ce0448
--- /dev/null
+++ b/rma/models/res_config_settings.py
@@ -0,0 +1,14 @@
+# Copyright 2021 Tecnativa - David Vidal
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    send_rma_confirmation = fields.Boolean(
+        related="company_id.send_rma_confirmation", readonly=False,
+    )
+    rma_mail_confirmation_template_id = fields.Many2one(
+        related="company_id.rma_mail_confirmation_template_id", readonly=False,
+    )
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 8e7ddf4c9..3ce4cb3b0 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -498,10 +498,19 @@ def unlink(self):
             )
         return super().unlink()
 
+    def _send_confirmation_email(self):
+        """Auto send notifications"""
+        for rma in self.filtered(lambda p: p.company_id.send_rma_confirmation):
+            rma_template_id = rma.company_id.rma_mail_confirmation_template_id.id
+            rma.with_context(
+                force_send=True, mark_rma_as_sent=True
+            ).message_post_with_template(rma_template_id)
+
     # Action methods
     def action_rma_send(self):
         self.ensure_one()
         template = self.env.ref("rma.mail_template_rma_notification", False)
+        template = self.company_id.rma_mail_confirmation_template_id or template
         form = self.env.ref("mail.email_compose_message_wizard_form", False)
         ctx = {
             "default_model": "rma",
@@ -536,6 +545,7 @@ def action_confirm(self):
             self.write({"reception_move_id": reception_move.id, "state": "confirmed"})
             if self.partner_id not in self.message_partner_ids:
                 self.message_subscribe([self.partner_id.id])
+            self._send_confirmation_email()
 
     def action_refund(self):
         """Invoked when 'Refund' button in rma form view is clicked
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index b917f2692..27cb010f6 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -656,3 +656,20 @@ def test_rma_picking_type_default_values(self):
     def test_quantities_on_hand(self):
         rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         self.assertEqual(rma.product_id.qty_available, 0)
+
+    def test_autoconfirm_email(self):
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        rma.company_id.send_rma_confirmation = True
+        rma.company_id.rma_mail_confirmation_template_id = self.env.ref(
+            "rma.mail_template_rma_notification"
+        )
+        previous_mails = self.env["mail.mail"].search(
+            [("partner_ids", "in", self.partner.ids)]
+        )
+        self.assertFalse(previous_mails)
+        rma.action_confirm()
+        mail = self.env["mail.message"].search(
+            [("partner_ids", "in", self.partner.ids)]
+        )
+        self.assertTrue(rma.name in mail.subject)
+        self.assertTrue(rma.name in mail.body)
diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
new file mode 100644
index 000000000..744da02bd
--- /dev/null
+++ b/rma/views/res_config_settings_views.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="stock.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath
+                expr="//div[@data-key='stock']/div[hasclass('o_settings_container')]"
+                position="inside"
+            >
+                <div
+                    class="col-12 col-lg-6 o_setting_box"
+                    title="Send automatic RMA info to customer"
+                >
+                    <div class="o_setting_left_pane">
+                        <field name="send_rma_confirmation" />
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label
+                            for="send_rma_confirmation"
+                            string="RMA Confirmation Email"
+                        />
+                        <span
+                            class="fa fa-lg fa-building-o"
+                            title="Values set here are company-specific."
+                            groups="base.group_multi_company"
+                        />
+                        <div class="text-muted">
+                            When the RMA is confirmed, send an automatic information email.
+                        </div>
+                        <div
+                            class="row mt16"
+                            attrs="{'invisible': [('send_rma_confirmation', '=', False)]}"
+                        >
+                            <label
+                                for="rma_mail_confirmation_template_id"
+                                string="Email Template"
+                                class="col-lg-4 o_light_label"
+                            />
+                            <field
+                                name="rma_mail_confirmation_template_id"
+                                class="oe_inline"
+                                attrs="{'required': [('send_rma_confirmation', '=', True)]}"
+                                context="{'default_model': 'rma'}"
+                            />
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>

From e91a8606b33ef4667830a6cb008abaa0660d174f Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Mon, 16 Nov 2020 17:26:06 +0100
Subject: [PATCH 019/108] [IMP] rma_sale: prepare kits integration

When a sale line has a phantom product (mrp kits) the RMA would not be
possible as the wizard couldn't pair the components moves with the
product in the line. With this approach, we can at least return the
spare components of the original kit line.

We also need some hooks to intervine in the main methods, like in
invoicing.
---
 rma/models/account_move.py         | 17 +++++++++++------
 rma/models/rma.py                  | 22 +++++++++++++++++++---
 rma/views/rma_portal_templates.xml |  4 ++--
 rma/views/rma_views.xml            |  2 +-
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/rma/models/account_move.py b/rma/models/account_move.py
index 3bd81e6c4..7c8d0af83 100644
--- a/rma/models/account_move.py
+++ b/rma/models/account_move.py
@@ -9,14 +9,13 @@
 class AccountMove(models.Model):
     _inherit = "account.move"
 
-    def post(self):
-        """ Avoids to validate a refund with less quantity of product than
-        quantity in the linked RMA.
-        """
+    def _check_rma_invoice_lines_qty(self):
+        """We can't refund a different qty than the stated in the RMA.
+        Extend to change criteria """
         precision = self.env["decimal.precision"].precision_get(
             "Product Unit of Measure"
         )
-        if (
+        return (
             self.sudo()
             .mapped("invoice_line_ids")
             .filtered(
@@ -26,7 +25,13 @@ def post(self):
                     < 0
                 )
             )
-        ):
+        )
+
+    def post(self):
+        """ Avoids to validate a refund with less quantity of product than
+        quantity in the linked RMA.
+        """
+        if self._check_rma_invoice_lines_qty():
             raise ValidationError(
                 _(
                     "There is at least one invoice lines whose quantity is "
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 3ce4cb3b0..554c8a901 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -925,16 +925,32 @@ def _prepare_refund_line(self, line_form):
         rma.action_refund
         """
         self.ensure_one()
-        line_form.product_id = self.product_id
-        line_form.quantity = self.product_uom_qty
-        line_form.product_uom_id = self.product_uom
+        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 {}
+
     # Returning business methods
     def create_return(self, scheduled_date, qty=None, uom=None):
         """Intended to be invoked by the delivery wizard"""
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index ef0ea47d8..002a5c805 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -46,7 +46,7 @@
                     <tr class="active">
                         <th>RMA #</th>
                         <th class='d-none d-md-table-cell'>Date</th>
-                        <th>Product</th>
+                        <th name="th_product">Product</th>
                         <th class='text-right'>Quantity</th>
                         <th class='d-none d-md-table-cell'>Status</th>
                     </tr>
@@ -66,7 +66,7 @@
                                 <span t-field="rma.date" />
                             </td>
                             <!-- Portal users don't have access to unpublished products -->
-                            <td>
+                            <td name="td_product">
                                 <span t-esc="rma.sudo().product_id.display_name" />
                             </td>
                             <td class='text-right'>
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index f270b8dac..a8efd3160 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -353,7 +353,7 @@
         <field name="name">RMA</field>
         <field name="res_model">rma</field>
         <field name="view_mode">tree,form,pivot,calendar,activity</field>
-        <field name="context">{"search_default_user_id": uid}</field>
+        <field name="context">{}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 Click to add a new RMA.

From 39123a1faa97d19faada35bb07cd7746933f39ad Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Mon, 1 Mar 2021 13:15:26 +0100
Subject: [PATCH 020/108] [IMP] rma: automatic notification subtypes

TT28344
---
 rma/data/mail_data.xml | 14 ++++++++++++++
 rma/models/rma.py      | 16 ++++++++++++++--
 rma/tests/test_rma.py  |  1 +
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/rma/data/mail_data.xml b/rma/data/mail_data.xml
index 3a0c32c28..175d44364 100644
--- a/rma/data/mail_data.xml
+++ b/rma/data/mail_data.xml
@@ -7,6 +7,12 @@
         <field name="default" eval="False" />
         <field name="description">RMA in draft state</field>
     </record>
+    <record id="mt_rma_notification" model="mail.message.subtype">
+        <field name="name">RMA Notificatoin</field>
+        <field name="res_model">rma</field>
+        <field name="default" eval="False" />
+        <field name="description">RMA automatic customer notifications</field>
+    </record>
     <!-- rma_team-related subtypes for messaging / Chatter -->
     <record id="mt_rma_team_rma_draft" model="mail.message.subtype">
         <field name="name">Draft RMA</field>
@@ -16,6 +22,14 @@
         <field name="parent_id" eval="ref('rma.mt_rma_draft')" />
         <field name="relation_field">team_id</field>
     </record>
+    <record id="mt_rma_team_rma_notification" model="mail.message.subtype">
+        <field name="name">RMA Notification</field>
+        <field name="sequence">20</field>
+        <field name="res_model">rma.team</field>
+        <field name="default" eval="True" />
+        <field name="parent_id" eval="ref('rma.mt_rma_notification')" />
+        <field name="relation_field">team_id</field>
+    </record>
     <!--RMA email template -->
     <record id="mail_template_rma_notification" model="mail.template">
         <field name="name">RMA Notification</field>
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 554c8a901..d61911b89 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -503,7 +503,9 @@ def _send_confirmation_email(self):
         for rma in self.filtered(lambda p: p.company_id.send_rma_confirmation):
             rma_template_id = rma.company_id.rma_mail_confirmation_template_id.id
             rma.with_context(
-                force_send=True, mark_rma_as_sent=True
+                force_send=True,
+                mark_rma_as_sent=True,
+                default_subtype_id=self.env.ref("rma.mt_rma_notification").id,
             ).message_post_with_template(rma_template_id)
 
     # Action methods
@@ -514,6 +516,7 @@ def action_rma_send(self):
         form = self.env.ref("mail.email_compose_message_wizard_form", False)
         ctx = {
             "default_model": "rma",
+            "default_subtype_id": self.env.ref("rma.mt_rma_notification").id,
             "default_res_id": self.ids[0],
             "default_use_template": bool(template),
             "default_template_id": template and template.id or False,
@@ -1110,11 +1113,20 @@ def _prepare_procurement_values(
 
     # Mail business methods
     def _creation_subtype(self):
-        if self.state in ("draft", "confirmed"):
+        if self.state in ("draft"):
             return self.env.ref("rma.mt_rma_draft")
         else:
             return super()._creation_subtype()
 
+    def _track_subtype(self, init_values):
+        self.ensure_one()
+        if "state" in init_values:
+            if self.state == "draft":
+                return self.env.ref("rma.mt_rma_draft")
+            elif self.state == "confirmed":
+                return self.env.ref("rma.mt_rma_notification")
+        return super()._track_subtype(init_values)
+
     def message_new(self, msg_dict, custom_values=None):
         """Extract the needed values from an incoming rma emails data-set
         to be used to create an RMA.
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 27cb010f6..767fabeee 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -673,3 +673,4 @@ def test_autoconfirm_email(self):
         )
         self.assertTrue(rma.name in mail.subject)
         self.assertTrue(rma.name in mail.body)
+        self.assertEqual(self.env.ref("rma.mt_rma_notification"), mail.subtype_id)

From 799208790667f1cd493d2efb8db9cd92d6bb6ec9 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Fri, 6 Nov 2020 16:56:02 +0100
Subject: [PATCH 021/108] [IMP] rma, rma_sale: shipping address

Allow to set the desired shipping address where the goods must be
returned after the RMA is processed.
---
 rma/models/rma.py        | 45 +++++++++++++++++++++++++++++++---------
 rma/models/stock_move.py |  7 +++++--
 rma/tests/test_rma.py    | 12 +++++++++--
 rma/views/rma_views.xml  |  1 +
 4 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index d61911b89..b2865a727 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -73,6 +73,13 @@ def _domain_location_id(self):
         index=True,
         tracking=True,
     )
+    partner_shipping_id = fields.Many2one(
+        string="Shipping Address",
+        comodel_name="res.partner",
+        readonly=True,
+        states={"draft": [("readonly", False)]},
+        help="Shipping address for current RMA.",
+    )
     partner_invoice_id = fields.Many2one(
         string="Invoice Address",
         comodel_name="res.partner",
@@ -385,7 +392,9 @@ def _compute_access_url(self):
             record.access_url = "/my/rmas/{}".format(record.id)
 
     # Constrains methods (@api.constrains)
-    @api.constrains("state", "partner_id", "partner_invoice_id", "product_id")
+    @api.constrains(
+        "state", "partner_id", "partner_shipping_id", "partner_invoice_id", "product_id"
+    )
     def _check_required_after_draft(self):
         """ Check that RMAs are being created or edited with the
         necessary fields filled out. Only applies to 'Draft' and
@@ -420,10 +429,13 @@ def _onchange_user_id(self):
     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"])
+            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):
@@ -723,7 +735,10 @@ def action_view_delivery(self):
     # Validation business methods
     def _ensure_required_fields(self):
         """ This method is used to ensure the following fields are not empty:
-        ['partner_id', 'partner_invoice_id', 'product_id', 'location_id']
+        [
+            'partner_id', 'partner_invoice_id', 'partner_shipping_id',
+            'product_id', 'location_id'
+        ]
 
         This method is intended to be called on confirm RMA action and is
         invoked by:
@@ -731,7 +746,13 @@ def _ensure_required_fields(self):
         rma.action_confirm
         """
         ir_translation = self.env["ir.translation"]
-        required = ["partner_id", "partner_invoice_id", "product_id", "location_id"]
+        required = [
+            "partner_id",
+            "partner_shipping_id",
+            "partner_invoice_id",
+            "product_id",
+            "location_id",
+        ]
         for record in self:
             desc = ""
             for field in filter(lambda item: not record[item], required):
@@ -863,7 +884,7 @@ def _create_receptions_from_product(self):
 
     def _prepare_picking(self, picking_form):
         picking_form.origin = self.name
-        picking_form.partner_id = self.partner_id
+        picking_form.partner_id = self.partner_shipping_id
         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
@@ -962,7 +983,11 @@ def create_return(self, scheduled_date, qty=None, uom=None):
         group_dict = {}
         rmas_to_return = self.filtered("can_be_returned")
         for record in rmas_to_return:
-            key = (record.partner_id.id, record.company_id.id, record.warehouse_id)
+            key = (
+                record.partner_shipping_id.id,
+                record.company_id.id,
+                record.warehouse_id,
+            )
             group_dict.setdefault(key, self.env["rma"])
             group_dict[key] |= record
         for rmas in group_dict.values():
@@ -1010,7 +1035,7 @@ def create_return(self, scheduled_date, qty=None, uom=None):
     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_id
+        picking_form.partner_id = self.partner_shipping_id
 
     def _prepare_returning_move(
         self, move_form, scheduled_date, quantity=None, uom=None
@@ -1076,7 +1101,7 @@ def _action_launch_stock_rule(
                     {
                         "name": self.name,
                         "move_type": "direct",
-                        "partner_id": self.partner_id.id,
+                        "partner_id": self.partner_shipping_id.id,
                     }
                 )
                 .id
@@ -1088,7 +1113,7 @@ def _action_launch_stock_rule(
             product,
             qty,
             uom,
-            self.partner_id.property_stock_customer,
+            self.partner_shipping_id.property_stock_customer,
             self.product_id.display_name,
             self.procurement_group_id.name,
             self.company_id,
@@ -1106,7 +1131,7 @@ def _prepare_procurement_values(
             "group_id": group_id,
             "date_planned": scheduled_date,
             "warehouse_id": warehouse,
-            "partner_id": self.partner_id.id,
+            "partner_id": self.partner_shipping_id.id,
             "rma_id": self.id,
             "priority": self.priority,
         }
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index a1b702c81..ade29234b 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -96,13 +96,16 @@ def _prepare_return_rma_vals(self, original_picking):
         partner = original_picking.partner_id
         if hasattr(original_picking, "sale_id") and original_picking.sale_id:
             partner_invoice_id = original_picking.sale_id.partner_invoice_id.id
+            partner_shipping_id = original_picking.sale_id.partner_shipping_id.id
         else:
-            partner_invoice_id = (
-                partner.address_get(["invoice"]).get("invoice", False),
+            partner_invoice_id = partner.address_get(["invoice"]).get("invoice", False)
+            partner_shipping_id = partner.address_get(["delivery"]).get(
+                "delivery", False
             )
         return {
             "user_id": self.env.user.id,
             "partner_id": partner.id,
+            "partner_shipping_id": partner_shipping_id,
             "partner_invoice_id": partner_invoice_id,
             "origin": original_picking.name,
             "picking_id": original_picking.id,
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 767fabeee..65d4a3f12 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -44,6 +44,13 @@ def setUpClass(cls):
                 "type": "invoice",
             }
         )
+        cls.partner_shipping = cls.res_partner.create(
+            {
+                "name": "Partner shipping test",
+                "parent_id": cls.partner.id,
+                "type": "delivery",
+            }
+        )
 
     def _create_rma(self, partner=None, product=None, qty=None, location=None):
         rma_form = Form(self.env["rma"])
@@ -181,7 +188,8 @@ def test_ensure_required_fields_on_confirm(self):
             rma.action_confirm()
         self.assertEqual(
             e.exception.name,
-            "Required field(s):\nCustomer\nInvoice Address\nProduct\nLocation",
+            "Required field(s):\nCustomer\nShipping Address\nInvoice Address\n"
+            "Product\nLocation",
         )
         with Form(rma) as rma_form:
             rma_form.partner_id = self.partner
@@ -531,7 +539,7 @@ def test_mass_return_to_customer(self):
         # One picking per partner
         self.assertNotEqual(pick_1.partner_id, pick_2.partner_id)
         self.assertEqual(
-            pick_1.partner_id, (rma_1 | rma_2 | rma_3).mapped("partner_id"),
+            pick_1.partner_id, (rma_1 | rma_2 | rma_3).mapped("partner_shipping_id"),
         )
         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
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index a8efd3160..5ac50e05f 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -239,6 +239,7 @@
                                 context="{'search_default_customer':1, 'show_address': 1, 'show_vat': True}"
                                 options="{'always_reload': True}"
                             />
+                            <field name="partner_shipping_id" />
                             <field name="partner_invoice_id" />
                             <field name="picking_id" options="{'no_create': True}" />
                             <field

From 293633a8c78847b9a298257e9f2ba475cbbe9013 Mon Sep 17 00:00:00 2001
From: Ernesto Tejeda <ernesto.tejeda@tecnativa.com>
Date: Thu, 4 Mar 2021 10:40:57 -0500
Subject: [PATCH 022/108] [FIX] rma: Set default source location for RMA
 created from scratch

---
 rma/__manifest__.py |   2 +-
 rma/i18n/es.po      |  82 +++++++++++++++++++++++++
 rma/i18n/nl.po      | 133 ++++++++++++++++++++++++++++++++--------
 rma/i18n/pt_BR.po   |  82 +++++++++++++++++++++++++
 rma/i18n/rma.pot    |  82 +++++++++++++++++++++++++
 rma/i18n/ro.po      | 143 +++++++++++++++++++++++++++++++++++---------
 rma/i18n/zh_CN.po   | 133 ++++++++++++++++++++++++++++++++--------
 rma/models/rma.py   |   1 +
 8 files changed, 580 insertions(+), 78 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 9abf748e0..bc29c2eca 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "13.0.1.0.1",
+    "version": "13.0.1.1.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 1388d618f..7385eeb77 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -154,6 +154,13 @@ 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
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -420,6 +427,11 @@ msgstr "Compañías"
 msgid "Company"
 msgstr "Compañía"
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_configuration_menu
 msgid "Configuration"
@@ -569,6 +581,23 @@ msgstr "Correo electrónico"
 msgid "Email Alias"
 msgstr "Pseudónimo de correo"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -1006,6 +1035,11 @@ msgstr "RMA nº"
 msgid "RMA Code"
 msgstr "Código de RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1037,6 +1071,16 @@ msgstr "Tipo de operación para recepción de RMA"
 msgid "RMA Location"
 msgstr "Ubicación de RMA"
 
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+msgid "RMA Notification"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
+msgid "RMA Notificatoin"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1083,6 +1127,11 @@ msgstr "Equipo de RMA"
 msgid "RMA Team the user is member of."
 msgstr "Equipo de RMA del cual el usuario es miembro."
 
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_count
@@ -1323,6 +1372,17 @@ msgstr "Fecha prevista"
 msgid "Security Token"
 msgstr "Token de seguridad"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1365,6 +1425,16 @@ msgstr "Establecer a borrador"
 msgid "Share"
 msgstr "Compartir"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
 msgid "Source Document"
@@ -1639,6 +1709,18 @@ msgstr "Mensajes del sitio web"
 msgid "Website communication history"
 msgstr "Historial de comunicaciones del sitio web"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index 9661dcebe..2b48dd106 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -46,7 +46,8 @@ msgid ""
 "        (${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"
+"    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"
@@ -56,7 +57,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
@@ -76,15 +79,15 @@ 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 ""
 
 #. 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 ""
 
 #. module: rma
@@ -115,6 +118,13 @@ msgid ""
 "clock-o\"/> Partially Available</span>"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -379,6 +389,11 @@ msgstr ""
 msgid "Company"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_configuration_menu
 msgid "Configuration"
@@ -528,6 +543,23 @@ msgstr ""
 msgid "Email Alias"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -574,8 +606,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
@@ -723,7 +755,6 @@ 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
 #, python-format
 msgid "New"
@@ -842,8 +873,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 ""
 
@@ -858,7 +889,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
@@ -948,6 +980,11 @@ msgstr ""
 msgid "RMA Code"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -979,6 +1016,16 @@ msgstr ""
 msgid "RMA Location"
 msgstr ""
 
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+msgid "RMA Notification"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
+msgid "RMA Notificatoin"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1025,6 +1072,11 @@ msgstr ""
 msgid "RMA Team the user is member of."
 msgstr ""
 
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_count
@@ -1166,9 +1218,9 @@ msgstr ""
 #: 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=\"%d"
+"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
+"\"%d\">%s</a>) has been created."
 msgstr ""
 
 #. module: rma
@@ -1224,8 +1276,8 @@ msgstr ""
 #: 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=\"%d\">%s</"
+"a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1254,6 +1306,17 @@ msgstr ""
 msgid "Security Token"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1296,6 +1359,16 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
 msgid "Source Document"
@@ -1316,8 +1389,8 @@ msgstr ""
 #: 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=\"%d\">%s</a> has been "
+"created."
 msgstr ""
 
 #. module: rma
@@ -1371,9 +1444,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
@@ -1410,8 +1483,8 @@ msgstr ""
 #: 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
@@ -1550,6 +1623,18 @@ msgstr ""
 msgid "Website communication history"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 7a06f38fc..eead5fb3b 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -134,6 +134,13 @@ 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
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -400,6 +407,11 @@ msgstr "Empresas"
 msgid "Company"
 msgstr "Empresa"
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_configuration_menu
 msgid "Configuration"
@@ -549,6 +561,23 @@ msgstr "Email"
 msgid "Email Alias"
 msgstr "Alias do Email"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -986,6 +1015,11 @@ msgstr "RMA #"
 msgid "RMA Code"
 msgstr "Código RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1017,6 +1051,16 @@ msgstr "Tipo Entrada RMA"
 msgid "RMA Location"
 msgstr "Localização RMA"
 
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+msgid "RMA Notification"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
+msgid "RMA Notificatoin"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1063,6 +1107,11 @@ msgstr "Equipe RMA"
 msgid "RMA Team the user is member of."
 msgstr "Equipe de RMA da qual o usuário é membro."
 
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_count
@@ -1301,6 +1350,17 @@ msgstr "Data Programada"
 msgid "Security Token"
 msgstr "Token de Segurança"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1343,6 +1403,16 @@ msgstr "Marcado como Rascunho"
 msgid "Share"
 msgstr "Compartilhar"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
 msgid "Source Document"
@@ -1616,6 +1686,18 @@ msgstr "Mensagens do Site"
 msgid "Website communication history"
 msgstr "Histórico de Comunicação Através do Site"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index de5d61abf..befbd4c9c 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -114,6 +114,13 @@ msgid ""
 "clock-o\"/> Partially Available</span>"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -378,6 +385,11 @@ msgstr ""
 msgid "Company"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_configuration_menu
 msgid "Configuration"
@@ -527,6 +539,23 @@ msgstr ""
 msgid "Email Alias"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -947,6 +976,11 @@ msgstr ""
 msgid "RMA Code"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -978,6 +1012,16 @@ msgstr ""
 msgid "RMA Location"
 msgstr ""
 
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+msgid "RMA Notification"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
+msgid "RMA Notificatoin"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1024,6 +1068,11 @@ msgstr ""
 msgid "RMA Team the user is member of."
 msgstr ""
 
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_count
@@ -1253,6 +1302,17 @@ msgstr ""
 msgid "Security Token"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1295,6 +1355,16 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
 msgid "Source Document"
@@ -1549,6 +1619,18 @@ msgstr ""
 msgid "Website communication history"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index a4eb7acb7..4559e852e 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -49,7 +49,8 @@ msgid ""
 "        (${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"
+"    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"
@@ -73,10 +74,12 @@ 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 ""
-"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Descarcă\" title=\""
-"Descarcă\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Descarcă\" title="
+"\"Descarcă\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -99,8 +102,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=\"Descarcă\" "
 "title=\"Descarcă\"/>"
@@ -108,8 +111,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=\"Descarcă\" title="
 "\"Descarcă\"/>"
@@ -150,6 +153,13 @@ 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
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -416,6 +426,11 @@ msgstr "Companii"
 msgid "Company"
 msgstr "Companie"
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_configuration_menu
 msgid "Configuration"
@@ -565,6 +580,23 @@ msgstr "Email"
 msgid "Email Alias"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -611,8 +643,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 ""
 
 #. module: rma
@@ -762,7 +794,6 @@ msgid "Name"
 msgstr "Nume"
 
 #. module: rma
-#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
@@ -883,8 +914,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 ""
 
@@ -899,7 +930,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 ""
 "Politica de a posta un mesaj pe document folosind mailgateway.\n"
 "- toată lumea: toată lumea poate posta\n"
@@ -995,6 +1027,11 @@ msgstr "Număr retur"
 msgid "RMA Code"
 msgstr "Cod cerere retur"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1026,6 +1063,16 @@ msgstr ""
 msgid "RMA Location"
 msgstr "Locație"
 
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+msgid "RMA Notification"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
+msgid "RMA Notificatoin"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1072,6 +1119,11 @@ msgstr "Echipă"
 msgid "RMA Team the user is member of."
 msgstr ""
 
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_count
@@ -1213,13 +1265,13 @@ msgstr "Înlocuit"
 #: 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=\"%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."
+"Î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
 #: code:addons/rma/models/rma.py:0
@@ -1274,8 +1326,8 @@ msgstr "Retur către client"
 #: 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=\"%d\">%s</"
+"a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1304,6 +1356,17 @@ msgstr ""
 msgid "Security Token"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1346,6 +1409,16 @@ msgstr ""
 msgid "Share"
 msgstr "Partajează"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
 msgid "Source Document"
@@ -1366,8 +1439,8 @@ msgstr ""
 #: 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=\"%d\">%s</a> has been "
+"created."
 msgstr ""
 
 #. module: rma
@@ -1421,9 +1494,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
@@ -1465,8 +1538,8 @@ msgstr ""
 #: 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
@@ -1606,6 +1679,18 @@ msgstr ""
 msgid "Website communication history"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
index c865460e1..4e956f15c 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -48,7 +48,8 @@ msgid ""
 "        (${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"
+"    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"
@@ -58,7 +59,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
@@ -78,15 +81,15 @@ 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 ""
 
 #. 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 ""
 
 #. module: rma
@@ -117,6 +120,13 @@ msgid ""
 "clock-o\"/> Partially Available</span>"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -381,6 +391,11 @@ msgstr ""
 msgid "Company"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_configuration_menu
 msgid "Configuration"
@@ -530,6 +545,23 @@ msgstr ""
 msgid "Email Alias"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -576,8 +608,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
@@ -725,7 +757,6 @@ 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
 #, python-format
 msgid "New"
@@ -844,8 +875,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 ""
 
@@ -860,7 +891,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
@@ -950,6 +982,11 @@ msgstr ""
 msgid "RMA Code"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -981,6 +1018,16 @@ msgstr ""
 msgid "RMA Location"
 msgstr ""
 
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+msgid "RMA Notification"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
+msgid "RMA Notificatoin"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1027,6 +1074,11 @@ msgstr ""
 msgid "RMA Team the user is member of."
 msgstr ""
 
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_count
@@ -1168,9 +1220,9 @@ msgstr "已换货"
 #: 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=\"%d"
+"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
+"\"%d\">%s</a>) has been created."
 msgstr ""
 
 #. module: rma
@@ -1226,8 +1278,8 @@ msgstr ""
 #: 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=\"%d\">%s</"
+"a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1256,6 +1308,17 @@ msgstr ""
 msgid "Security Token"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1298,6 +1361,16 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
 msgid "Source Document"
@@ -1318,8 +1391,8 @@ msgstr ""
 #: 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=\"%d\">%s</a> has been "
+"created."
 msgstr ""
 
 #. module: rma
@@ -1373,9 +1446,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
@@ -1412,8 +1485,8 @@ msgstr ""
 #: 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
@@ -1552,6 +1625,18 @@ msgstr ""
 msgid "Website communication history"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
diff --git a/rma/models/rma.py b/rma/models/rma.py
index b2865a727..e2bf8fec6 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -885,6 +885,7 @@ def _create_receptions_from_product(self):
     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

From 728db420a74c8d090d4270cb27d6e14f948e161c Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Wed, 5 May 2021 09:53:33 +0200
Subject: [PATCH 023/108] [FIX] rma: tagged test

---
 rma/tests/test_rma.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 65d4a3f12..1f07b7be7 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -2,10 +2,9 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo.exceptions import UserError, ValidationError
-from odoo.tests import Form, SavepointCase, tagged
+from odoo.tests import Form, SavepointCase
 
 
-@tagged("post_install", "-at_install")
 class TestRma(SavepointCase):
     @classmethod
     def setUpClass(cls):

From 13de7a9b77d8b2ace472486bd28c975bf7246c88 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Thu, 6 May 2021 10:46:58 +0200
Subject: [PATCH 024/108] [IMP] rma: tags

TT29594
---
 rma/__manifest__.py              |  3 +-
 rma/i18n/es.po                   | 74 +++++++++++++++++++++++++++++++
 rma/i18n/nl.po                   | 74 +++++++++++++++++++++++++++++++
 rma/i18n/pt_BR.po                | 74 +++++++++++++++++++++++++++++++
 rma/i18n/rma.pot                 | 74 +++++++++++++++++++++++++++++++
 rma/i18n/ro.po                   | 74 +++++++++++++++++++++++++++++++
 rma/i18n/zh_CN.po                | 74 +++++++++++++++++++++++++++++++
 rma/models/__init__.py           |  1 +
 rma/models/rma.py                |  1 +
 rma/models/rma_tag.py            | 21 +++++++++
 rma/security/ir.model.access.csv |  2 +
 rma/views/rma_tag_views.xml      | 76 ++++++++++++++++++++++++++++++++
 rma/views/rma_views.xml          |  7 +++
 13 files changed, 554 insertions(+), 1 deletion(-)
 create mode 100644 rma/models/rma_tag.py
 create mode 100644 rma/views/rma_tag_views.xml

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index bc29c2eca..33e9ed8a8 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "13.0.1.1.0",
+    "version": "13.0.1.2.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
@@ -27,6 +27,7 @@
         "views/rma_portal_templates.xml",
         "views/rma_team_views.xml",
         "views/rma_views.xml",
+        "views/rma_tag_views.xml",
         "views/stock_picking_views.xml",
         "views/stock_warehouse_views.xml",
         "views/res_config_settings_views.xml",
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 7385eeb77..272cc72a0 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -303,7 +303,9 @@ msgid "Action Needed"
 msgstr "Acción Necesaria"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr "Activo"
 
@@ -347,6 +349,11 @@ msgstr "Seudónimo del dominio"
 msgid "Aliased Model"
 msgstr "Modelo con seudónimo"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Archived"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Are you sure you want to cancel this RMA"
@@ -406,6 +413,11 @@ msgstr "Cancelado"
 msgid "Click to add a new RMA."
 msgstr "Click para agregar un nuevo RMA."
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
 msgid "Commercial Entity"
@@ -459,11 +471,17 @@ msgstr "Contacto"
 msgid "Create RMAs"
 msgstr "Crear RMAs"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
 msgid "Created by"
 msgstr "Creado por"
@@ -473,6 +491,7 @@ msgstr "Creado por"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_date
 msgid "Created on"
 msgstr "Creado el"
@@ -555,6 +574,7 @@ msgstr "Descripción"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
 msgid "Display Name"
 msgstr "Nombre mostrado"
@@ -637,6 +657,7 @@ msgstr "Agrupar por"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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
 msgid "ID"
 msgstr "ID"
@@ -717,6 +738,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
 msgid "Last Modified on"
 msgstr "Última modificación en"
@@ -726,6 +748,7 @@ msgstr "Última modificación en"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
@@ -735,6 +758,7 @@ msgstr "Última actualización por"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
@@ -765,6 +789,12 @@ msgstr "Bloqueado"
 msgid "Main Attachment"
 msgstr "Adjuntos principales"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
 msgid "Manage Return Merchandise Authorizations (RMAs)."
@@ -1114,6 +1144,20 @@ msgstr "Reporte de RMA"
 msgid "RMA Split Wizard"
 msgstr "Asistente para dividir RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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 ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_rma_team
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
@@ -1350,6 +1394,11 @@ msgstr ""
 msgid "Returned"
 msgstr "Devuelto"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
 msgid "Rma Count"
@@ -1497,6 +1546,26 @@ msgstr "Movimiento de existencias"
 msgid "Stock Rule"
 msgstr "Regla de Inventario"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__user_id
 msgid "Team Leader"
@@ -1513,6 +1582,11 @@ msgstr "Miembros del equipo"
 msgid "That operation name already exists !"
 msgstr "¡El nombre de operación ya existe!"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
 msgid ""
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index 2b48dd106..298e1c985 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -265,7 +265,9 @@ msgid "Action Needed"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr ""
 
@@ -309,6 +311,11 @@ msgstr ""
 msgid "Aliased Model"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Archived"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Are you sure you want to cancel this RMA"
@@ -368,6 +375,11 @@ msgstr ""
 msgid "Click to add a new RMA."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
 msgid "Commercial Entity"
@@ -421,11 +433,17 @@ msgstr ""
 msgid "Create RMAs"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
 msgid "Created by"
 msgstr ""
@@ -435,6 +453,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_date
 msgid "Created on"
 msgstr ""
@@ -517,6 +536,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
 msgid "Display Name"
 msgstr ""
@@ -599,6 +619,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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
 msgid "ID"
 msgstr ""
@@ -675,6 +696,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
 msgid "Last Modified on"
 msgstr ""
@@ -684,6 +706,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
 msgid "Last Updated by"
 msgstr ""
@@ -693,6 +716,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_date
 msgid "Last Updated on"
 msgstr ""
@@ -723,6 +747,12 @@ msgstr ""
 msgid "Main Attachment"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
 msgid "Manage Return Merchandise Authorizations (RMAs)."
@@ -1059,6 +1089,20 @@ msgstr ""
 msgid "RMA Split Wizard"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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 ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_rma_team
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
@@ -1285,6 +1329,11 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
 msgid "Rma Count"
@@ -1425,6 +1474,26 @@ msgstr ""
 msgid "Stock Rule"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__user_id
 msgid "Team Leader"
@@ -1441,6 +1510,11 @@ msgstr ""
 msgid "That operation name already exists !"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
 msgid ""
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index eead5fb3b..68bff9b76 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -283,7 +283,9 @@ msgid "Action Needed"
 msgstr "Ação Necessária"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr "Ativar/Ativo(a)"
 
@@ -327,6 +329,11 @@ msgstr "Domínio do Alias"
 msgid "Aliased Model"
 msgstr "Modelo do Alias"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Archived"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Are you sure you want to cancel this RMA"
@@ -386,6 +393,11 @@ msgstr "Cancelado(a)"
 msgid "Click to add a new RMA."
 msgstr "Clique para adicionar um novo RMA."
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
 msgid "Commercial Entity"
@@ -439,11 +451,17 @@ msgstr "Contato"
 msgid "Create RMAs"
 msgstr "Criar RMAs"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
 msgid "Created by"
 msgstr "Criado Por"
@@ -453,6 +471,7 @@ msgstr "Criado Por"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_date
 msgid "Created on"
 msgstr "Criado em"
@@ -535,6 +554,7 @@ msgstr "Descrição"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
 msgid "Display Name"
 msgstr "Exibir Nome"
@@ -617,6 +637,7 @@ msgstr "Agrupado Por"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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
 msgid "ID"
 msgstr "ID"
@@ -697,6 +718,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
 msgid "Last Modified on"
 msgstr "Última Modificação Feita em"
@@ -706,6 +728,7 @@ msgstr "Última Modificação Feita em"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
 msgid "Last Updated by"
 msgstr "Última Atualização Feita por"
@@ -715,6 +738,7 @@ msgstr "Última Atualização Feita por"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_date
 msgid "Last Updated on"
 msgstr "Última Atualização Feita em"
@@ -745,6 +769,12 @@ msgstr "Travado"
 msgid "Main Attachment"
 msgstr "Anexo Principal"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
 msgid "Manage Return Merchandise Authorizations (RMAs)."
@@ -1094,6 +1124,20 @@ msgstr "Relatório RMA"
 msgid "RMA Split Wizard"
 msgstr "Assistente para divisão de RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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 ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_rma_team
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
@@ -1329,6 +1373,11 @@ msgstr ""
 msgid "Returned"
 msgstr "Retornado(a)"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
 msgid "Rma Count"
@@ -1475,6 +1524,26 @@ msgstr "Movimentação de Estoque"
 msgid "Stock Rule"
 msgstr "Regra de Estoque"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__user_id
 msgid "Team Leader"
@@ -1491,6 +1560,11 @@ msgstr "Membros da Equipe"
 msgid "That operation name already exists !"
 msgstr "Esse nome de operação já existe!"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
 msgid ""
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index befbd4c9c..f91fa7d9c 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -261,7 +261,9 @@ msgid "Action Needed"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr ""
 
@@ -305,6 +307,11 @@ msgstr ""
 msgid "Aliased Model"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Archived"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Are you sure you want to cancel this RMA"
@@ -364,6 +371,11 @@ msgstr ""
 msgid "Click to add a new RMA."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
 msgid "Commercial Entity"
@@ -417,11 +429,17 @@ msgstr ""
 msgid "Create RMAs"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
 msgid "Created by"
 msgstr ""
@@ -431,6 +449,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_date
 msgid "Created on"
 msgstr ""
@@ -513,6 +532,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
 msgid "Display Name"
 msgstr ""
@@ -595,6 +615,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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
 msgid "ID"
 msgstr ""
@@ -671,6 +692,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
 msgid "Last Modified on"
 msgstr ""
@@ -680,6 +702,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
 msgid "Last Updated by"
 msgstr ""
@@ -689,6 +712,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_date
 msgid "Last Updated on"
 msgstr ""
@@ -719,6 +743,12 @@ msgstr ""
 msgid "Main Attachment"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
 msgid "Manage Return Merchandise Authorizations (RMAs)."
@@ -1055,6 +1085,20 @@ msgstr ""
 msgid "RMA Split Wizard"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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 ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_rma_team
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
@@ -1281,6 +1325,11 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
 msgid "Rma Count"
@@ -1421,6 +1470,26 @@ msgstr ""
 msgid "Stock Rule"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__user_id
 msgid "Team Leader"
@@ -1437,6 +1506,11 @@ msgstr ""
 msgid "That operation name already exists !"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
 msgid ""
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index 4559e852e..4530da6bd 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -302,7 +302,9 @@ msgid "Action Needed"
 msgstr "Acțiune necesară"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr "Activ"
 
@@ -346,6 +348,11 @@ msgstr ""
 msgid "Aliased Model"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Archived"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Are you sure you want to cancel this RMA"
@@ -405,6 +412,11 @@ msgstr "Anulat"
 msgid "Click to add a new RMA."
 msgstr "Faceți clic pentru a adăuga un nou formular de retur."
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
 msgid "Commercial Entity"
@@ -458,11 +470,17 @@ msgstr "Contact"
 msgid "Create RMAs"
 msgstr "Creați cerere retur"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
 msgid "Created by"
 msgstr "Creat de"
@@ -472,6 +490,7 @@ msgstr "Creat de"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_date
 msgid "Created on"
 msgstr "Creat în"
@@ -554,6 +573,7 @@ msgstr "Descriere"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
 msgid "Display Name"
 msgstr "Nume afișat"
@@ -636,6 +656,7 @@ msgstr "Grupează după"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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
 msgid "ID"
 msgstr "ID"
@@ -714,6 +735,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
 msgid "Last Modified on"
 msgstr "Ultima modificare în"
@@ -723,6 +745,7 @@ msgstr "Ultima modificare în"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
 msgid "Last Updated by"
 msgstr "Ultima modificare de"
@@ -732,6 +755,7 @@ msgstr "Ultima modificare de"
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_date
 msgid "Last Updated on"
 msgstr "Ultima modificare în"
@@ -762,6 +786,12 @@ msgstr "Închis"
 msgid "Main Attachment"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
 msgid "Manage Return Merchandise Authorizations (RMAs)."
@@ -1106,6 +1136,20 @@ msgstr "Raport"
 msgid "RMA Split Wizard"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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 ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_rma_team
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
@@ -1335,6 +1379,11 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
 msgid "Rma Count"
@@ -1475,6 +1524,26 @@ msgstr ""
 msgid "Stock Rule"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__user_id
 msgid "Team Leader"
@@ -1491,6 +1560,11 @@ msgstr "Membrii echipei"
 msgid "That operation name already exists !"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
 msgid ""
diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
index 4e956f15c..d9c95a07d 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -267,7 +267,9 @@ msgid "Action Needed"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr ""
 
@@ -311,6 +313,11 @@ msgstr ""
 msgid "Aliased Model"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Archived"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Are you sure you want to cancel this RMA"
@@ -370,6 +377,11 @@ msgstr ""
 msgid "Click to add a new RMA."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
 msgid "Commercial Entity"
@@ -423,11 +435,17 @@ msgstr ""
 msgid "Create RMAs"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
 msgid "Created by"
 msgstr ""
@@ -437,6 +455,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_date
 msgid "Created on"
 msgstr ""
@@ -519,6 +538,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
 msgid "Display Name"
 msgstr ""
@@ -601,6 +621,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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
 msgid "ID"
 msgstr ""
@@ -677,6 +698,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
 msgid "Last Modified on"
 msgstr ""
@@ -686,6 +708,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
 msgid "Last Updated by"
 msgstr ""
@@ -695,6 +718,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_date
 msgid "Last Updated on"
 msgstr ""
@@ -725,6 +749,12 @@ msgstr ""
 msgid "Main Attachment"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
 msgid "Manage Return Merchandise Authorizations (RMAs)."
@@ -1061,6 +1091,20 @@ msgstr ""
 msgid "RMA Split Wizard"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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 ""
+
 #. module: rma
 #: model:ir.model,name:rma.model_rma_team
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
@@ -1287,6 +1331,11 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
 msgid "Rma Count"
@@ -1427,6 +1476,26 @@ msgstr ""
 msgid "Stock Rule"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__user_id
 msgid "Team Leader"
@@ -1443,6 +1512,11 @@ msgstr ""
 msgid "That operation name already exists !"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
 msgid ""
diff --git a/rma/models/__init__.py b/rma/models/__init__.py
index 66a957a61..cc2109239 100644
--- a/rma/models/__init__.py
+++ b/rma/models/__init__.py
@@ -3,6 +3,7 @@
 from . import account_move
 from . import rma
 from . import rma_operation
+from . import rma_tag
 from . import rma_team
 from . import res_company
 from . import res_config_settings
diff --git a/rma/models/rma.py b/rma/models/rma.py
index e2bf8fec6..c125f93d0 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -60,6 +60,7 @@ def _domain_location_id(self):
         index=True,
         states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
     )
+    tag_ids = fields.Many2many(comodel_name="rma.tag", string="Tags")
     company_id = fields.Many2one(
         comodel_name="res.company",
         default=lambda self: self.env.company,
diff --git a/rma/models/rma_tag.py b/rma/models/rma_tag.py
new file mode 100644
index 000000000..9f96059e2
--- /dev/null
+++ b/rma/models/rma_tag.py
@@ -0,0 +1,21 @@
+# Copyright 2021 Tecnativa - David Vidal
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class RmaTag(models.Model):
+    _description = "RMA Tags"
+    _name = "rma.tag"
+    _order = "name"
+
+    active = fields.Boolean(
+        default=True,
+        help="The active field allows you to hide the category without " "removing it.",
+    )
+    name = fields.Char(string="Tag Name", required=True, translate=True, copy=False,)
+    color = fields.Integer(string="Color Index")
+    rma_ids = fields.Many2many(comodel_name="rma")
+
+    _sql_constraints = [
+        ("name_uniq", "unique (name)", "Tag name already exists !"),
+    ]
diff --git a/rma/security/ir.model.access.csv b/rma/security/ir.model.access.csv
index 0afc4d55b..ad209dc75 100644
--- a/rma/security/ir.model.access.csv
+++ b/rma/security/ir.model.access.csv
@@ -6,3 +6,5 @@ access_rma_user_own,rma.user.own,model_rma,rma_group_user_own,1,1,1,0
 access_rma_manager,rma.manager,model_rma,rma_group_manager,1,1,1,1
 access_rma_operation_user_own,rma.operation.user.own,model_rma_operation,rma_group_user_own,1,0,0,0
 access_rma_operation_manager,rma.operation.manager,model_rma_operation,rma_group_manager,1,1,1,1
+access_rma_tag_user_own,rma.tag.user.own,model_rma_tag,rma_group_user_own,1,0,0,0
+access_rma_tag_manager,rma.tag.manager,model_rma_tag,rma_group_manager,1,1,1,1
diff --git a/rma/views/rma_tag_views.xml b/rma/views/rma_tag_views.xml
new file mode 100644
index 000000000..780332118
--- /dev/null
+++ b/rma/views/rma_tag_views.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="rma_tag_view_search" model="ir.ui.view">
+        <field name="model">rma.tag</field>
+        <field name="arch" type="xml">
+            <search string="RMA Tags">
+                <filter
+                    string="Archived"
+                    name="inactive"
+                    domain="[('active','=',False)]"
+                />
+                <filter
+                    string="Active"
+                    name="active"
+                    domain="[('active','!=',False)]"
+                />
+            </search>
+        </field>
+    </record>
+    <record id="view_rma_tag_form" model="ir.ui.view">
+        <field name="name">Rma Tags</field>
+        <field name="model">rma.tag</field>
+        <field name="arch" type="xml">
+            <form string="RMA Tag">
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button
+                            class="oe_stat_button"
+                            type="object"
+                            name="toggle_active"
+                            icon="fa-archive"
+                        >
+                            <field
+                                name="active"
+                                widget="boolean_button"
+                                options='{"terminology": "archive"}'
+                            />
+                        </button>
+                    </div>
+                    <group>
+                        <field name="name" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="view_rma_tag_list" model="ir.ui.view">
+        <field name="name">RMA Tags</field>
+        <field name="model">rma.tag</field>
+        <field eval="6" name="priority" />
+        <field name="arch" type="xml">
+            <tree string="RMA Tags">
+                <field name="name" />
+                <field name="active" />
+            </tree>
+        </field>
+    </record>
+    <record id="action_rma_tag" model="ir.actions.act_window">
+        <field name="name">RMA Tags</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">rma.tag</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+            Create a new RMA tag
+            </p><p>
+            Manage RMA tags to better classify them for tracking and analysis purposes.
+            </p>
+        </field>
+    </record>
+    <menuitem
+        id="rma_configuration_rma_tag_menu"
+        name="RMA Tags"
+        parent="rma_configuration_menu"
+        action="action_rma_tag"
+    />
+</odoo>
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 5ac50e05f..7147dd690 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -9,6 +9,7 @@
             <search>
                 <field name="name" />
                 <field name="user_id" />
+                <field name="tag_ids" />
                 <filter
                     name="draft_filter"
                     string="Draft"
@@ -267,6 +268,12 @@
                             <field name="date" />
                             <field name="user_id" />
                             <field name="team_id" />
+                            <field
+                                name="tag_ids"
+                                widget="many2many_tags"
+                                options="{'color_field': 'color', 'no_create_edit': True}"
+                                placeholder="Tags..."
+                            />
                             <field name="origin" />
                             <field name="operation_id" />
                             <field

From 3f68d80cca587462941e30ccc6cd6f945c5f1814 Mon Sep 17 00:00:00 2001
From: Chafique <chafique.delli@akretion.com>
Date: Sun, 6 Jun 2021 19:21:31 +0200
Subject: [PATCH 025/108] [IMP] rma: black, isort, prettier

---
 rma/__manifest__.py                |   2 +-
 rma/hooks.py                       |   4 +-
 rma/models/account_move.py         |   9 +-
 rma/models/res_config_settings.py  |   6 +-
 rma/models/res_partner.py          |  14 ++-
 rma/models/rma.py                  | 143 +++++++++++++++++++----------
 rma/models/rma_tag.py              |   7 +-
 rma/models/rma_team.py             |   9 +-
 rma/models/stock_move.py           |  20 ++--
 rma/models/stock_picking.py        |  10 +-
 rma/models/stock_warehouse.py      |  15 ++-
 rma/tests/test_rma.py              |  43 ++++++---
 rma/wizard/rma_delivery.py         |  10 +-
 rma/wizard/rma_split.py            |   9 +-
 rma/wizard/stock_picking_return.py |   2 +-
 15 files changed, 209 insertions(+), 94 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 33e9ed8a8..36e6185c3 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "13.0.1.2.0",
+    "version": "14.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/hooks.py b/rma/hooks.py
index dbdbf75ab..9aafcaf0e 100644
--- a/rma/hooks.py
+++ b/rma/hooks.py
@@ -50,7 +50,9 @@ def create_rma_picking_types(whs):
                 picking_sequence = sequence_data[picking_type]
                 sequence = ir_sequence_sudo.create(picking_sequence)
                 values.update(
-                    warehouse_id=whs.id, color=color, sequence_id=sequence.id,
+                    warehouse_id=whs.id,
+                    color=color,
+                    sequence_id=sequence.id,
                 )
                 data[picking_type] = stock_picking_type.create(values).id
 
diff --git a/rma/models/account_move.py b/rma/models/account_move.py
index 7c8d0af83..d71aeca41 100644
--- a/rma/models/account_move.py
+++ b/rma/models/account_move.py
@@ -11,7 +11,7 @@ class AccountMove(models.Model):
 
     def _check_rma_invoice_lines_qty(self):
         """We can't refund a different qty than the stated in the RMA.
-        Extend to change criteria """
+        Extend to change criteria"""
         precision = self.env["decimal.precision"].precision_get(
             "Product Unit of Measure"
         )
@@ -28,7 +28,7 @@ def _check_rma_invoice_lines_qty(self):
         )
 
     def post(self):
-        """ Avoids to validate a refund with less quantity of product than
+        """Avoids to validate a refund with less quantity of product than
         quantity in the linked RMA.
         """
         if self._check_rma_invoice_lines_qty():
@@ -49,4 +49,7 @@ def unlink(self):
 class AccountMoveLine(models.Model):
     _inherit = "account.move.line"
 
-    rma_id = fields.Many2one(comodel_name="rma", string="RMA",)
+    rma_id = fields.Many2one(
+        comodel_name="rma",
+        string="RMA",
+    )
diff --git a/rma/models/res_config_settings.py b/rma/models/res_config_settings.py
index d18ce0448..303044cbf 100644
--- a/rma/models/res_config_settings.py
+++ b/rma/models/res_config_settings.py
@@ -7,8 +7,10 @@ class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
     send_rma_confirmation = fields.Boolean(
-        related="company_id.send_rma_confirmation", readonly=False,
+        related="company_id.send_rma_confirmation",
+        readonly=False,
     )
     rma_mail_confirmation_template_id = fields.Many2one(
-        related="company_id.rma_mail_confirmation_template_id", readonly=False,
+        related="company_id.rma_mail_confirmation_template_id",
+        readonly=False,
     )
diff --git a/rma/models/res_partner.py b/rma/models/res_partner.py
index 45ff8f1bc..d6bed155c 100644
--- a/rma/models/res_partner.py
+++ b/rma/models/res_partner.py
@@ -8,9 +8,14 @@ class ResPartner(models.Model):
     _inherit = "res.partner"
 
     rma_ids = fields.One2many(
-        comodel_name="rma", inverse_name="partner_id", string="RMAs",
+        comodel_name="rma",
+        inverse_name="partner_id",
+        string="RMAs",
+    )
+    rma_count = fields.Integer(
+        string="RMA count",
+        compute="_compute_rma_count",
     )
-    rma_count = fields.Integer(string="RMA count", compute="_compute_rma_count",)
 
     def _compute_rma_count(self):
         rma_data = self.env["rma"].read_group(
@@ -26,7 +31,10 @@ def action_view_rma(self):
         rma = self.rma_ids
         if len(rma) == 1:
             action.update(
-                res_id=rma.id, view_mode="form", view_id=False, views=False,
+                res_id=rma.id,
+                view_mode="form",
+                view_id=False,
+                views=False,
             )
         else:
             action["domain"] = [("partner_id", "in", self.ids)]
diff --git a/rma/models/rma.py b/rma/models/rma.py
index c125f93d0..e4017eca5 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -90,7 +90,8 @@ def _domain_location_id(self):
         help="Refund address for current RMA.",
     )
     commercial_partner_id = fields.Many2one(
-        comodel_name="res.partner", related="partner_id.commercial_partner_id",
+        comodel_name="res.partner",
+        related="partner_id.commercial_partner_id",
     )
     picking_id = fields.Many2one(
         comodel_name="stock.picking",
@@ -114,7 +115,8 @@ def _domain_location_id(self):
         states={"draft": [("readonly", False)]},
     )
     product_id = fields.Many2one(
-        comodel_name="product.product", domain=[("type", "in", ["consu", "product"])],
+        comodel_name="product.product",
+        domain=[("type", "in", ["consu", "product"])],
     )
     product_uom_qty = fields.Float(
         string="Quantity",
@@ -150,7 +152,8 @@ def _domain_location_id(self):
         states={"draft": [("readonly", False)]},
     )
     operation_id = fields.Many2one(
-        comodel_name="rma.operation", string="Requested operation",
+        comodel_name="rma.operation",
+        string="Requested operation",
     )
     state = fields.Selection(
         [
@@ -180,14 +183,21 @@ def _domain_location_id(self):
         states={"draft": [("readonly", False)]},
     )
     warehouse_id = fields.Many2one(
-        comodel_name="stock.warehouse", compute="_compute_warehouse_id", store=True,
+        comodel_name="stock.warehouse",
+        compute="_compute_warehouse_id",
+        store=True,
     )
     reception_move_id = fields.Many2one(
-        comodel_name="stock.move", string="Reception move", copy=False,
+        comodel_name="stock.move",
+        string="Reception move",
+        copy=False,
     )
     # Refund fields
     refund_id = fields.Many2one(
-        comodel_name="account.move", string="Refund", readonly=True, copy=False,
+        comodel_name="account.move",
+        string="Refund",
+        readonly=True,
+        copy=False,
     )
     refund_line_id = fields.Many2one(
         comodel_name="account.move.line",
@@ -205,7 +215,8 @@ def _domain_location_id(self):
         copy=False,
     )
     delivery_picking_count = fields.Integer(
-        string="Delivery count", compute="_compute_delivery_picking_count",
+        string="Delivery count",
+        compute="_compute_delivery_picking_count",
     )
     delivered_qty = fields.Float(
         string="Delivered qty",
@@ -219,9 +230,15 @@ def _domain_location_id(self):
         compute="_compute_delivered_qty",
         compute_sudo=True,
     )
-    can_be_returned = fields.Boolean(compute="_compute_can_be_returned",)
-    can_be_replaced = fields.Boolean(compute="_compute_can_be_replaced",)
-    can_be_locked = fields.Boolean(compute="_compute_can_be_locked",)
+    can_be_returned = fields.Boolean(
+        compute="_compute_can_be_returned",
+    )
+    can_be_replaced = fields.Boolean(
+        compute="_compute_can_be_replaced",
+    )
+    can_be_locked = fields.Boolean(
+        compute="_compute_can_be_locked",
+    )
     remaining_qty = fields.Float(
         string="Remaining delivered qty",
         digits="Product Unit of Measure",
@@ -233,9 +250,14 @@ def _domain_location_id(self):
         compute="_compute_remaining_qty",
     )
     # Split fields
-    can_be_split = fields.Boolean(compute="_compute_can_be_split",)
+    can_be_split = fields.Boolean(
+        compute="_compute_can_be_split",
+    )
     origin_split_rma_id = fields.Many2one(
-        comodel_name="rma", string="Extracted from", readonly=True, copy=False,
+        comodel_name="rma",
+        string="Extracted from",
+        readonly=True,
+        copy=False,
     )
 
     def _compute_delivery_picking_count(self):
@@ -263,7 +285,7 @@ def _compute_delivery_picking_count(self):
         "product_uom",
     )
     def _compute_delivered_qty(self):
-        """ Compute 'delivered_qty' and 'delivered_qty_done' fields.
+        """Compute 'delivered_qty' and 'delivered_qty_done' fields.
 
         delivered_qty: represents the quantity delivery or to be
         delivery. For each move in delivery_move_ids the quantity done
@@ -301,7 +323,7 @@ def _compute_delivered_qty(self):
 
     @api.depends("product_uom_qty", "delivered_qty", "delivered_qty_done")
     def _compute_remaining_qty(self):
-        """ Compute 'remaining_qty' and 'remaining_qty_to_done' fields.
+        """Compute 'remaining_qty' and 'remaining_qty_to_done' fields.
 
         remaining_qty: is used to set a default quantity of replacing
         or returning of product to the customer.
@@ -316,9 +338,11 @@ def _compute_remaining_qty(self):
             r.remaining_qty = r.product_uom_qty - r.delivered_qty
             r.remaining_qty_to_done = r.product_uom_qty - r.delivered_qty_done
 
-    @api.depends("state",)
+    @api.depends(
+        "state",
+    )
     def _compute_can_be_refunded(self):
-        """ Compute 'can_be_refunded'. This field controls the visibility
+        """Compute 'can_be_refunded'. This field controls the visibility
         of 'Refund' button in the rma form view and determinates if
         an rma can be refunded. It is used in rma.action_refund method.
         """
@@ -327,7 +351,7 @@ def _compute_can_be_refunded(self):
 
     @api.depends("remaining_qty", "state")
     def _compute_can_be_returned(self):
-        """ Compute 'can_be_returned'. This field controls the visibility
+        """Compute 'can_be_returned'. This field controls the visibility
         of the 'Return to customer' button in the rma form
         view and determinates if an rma can be returned to the customer.
         This field is used in:
@@ -341,7 +365,7 @@ def _compute_can_be_returned(self):
 
     @api.depends("state")
     def _compute_can_be_replaced(self):
-        """ Compute 'can_be_replaced'. This field controls the visibility
+        """Compute 'can_be_replaced'. This field controls the visibility
         of 'Replace' button in the rma form
         view and determinates if an rma can be replaced.
         This field is used in:
@@ -357,7 +381,7 @@ def _compute_can_be_replaced(self):
 
     @api.depends("product_uom_qty", "state", "remaining_qty", "remaining_qty_to_done")
     def _compute_can_be_split(self):
-        """ Compute 'can_be_split'. This field controls the
+        """Compute 'can_be_split'. This field controls the
         visibility of 'Split' button in the rma form view and
         determinates if an rma can be split.
         This field is used in:
@@ -397,7 +421,7 @@ def _compute_access_url(self):
         "state", "partner_id", "partner_shipping_id", "partner_invoice_id", "product_id"
     )
     def _check_required_after_draft(self):
-        """ Check that RMAs are being created or edited with the
+        """Check that RMAs are being created or edited with the
         necessary fields filled out. Only applies to 'Draft' and
         'Cancelled' states.
         """
@@ -576,7 +600,8 @@ def action_refund(self):
             origin = ", ".join(rmas.mapped("name"))
             invoice_form = Form(
                 self.env["account.move"].with_context(
-                    default_type="out_refund", company_id=rmas[0].company_id.id,
+                    default_type="out_refund",
+                    company_id=rmas[0].company_id.id,
                 ),
                 "account.view_move_form",
             )
@@ -621,7 +646,9 @@ def action_replace(self):
         action["name"] = "Replace product(s)"
         action["context"] = dict(self.env.context)
         action["context"].update(
-            active_id=self.id, active_ids=self.ids, rma_delivery_type="replace",
+            active_id=self.id,
+            active_ids=self.ids,
+            rma_delivery_type="replace",
         )
         return action
 
@@ -640,7 +667,9 @@ def action_return(self):
         )
         action["context"] = dict(self.env.context)
         action["context"].update(
-            active_id=self.id, active_ids=self.ids, rma_delivery_type="return",
+            active_id=self.id,
+            active_ids=self.ids,
+            rma_delivery_type="return",
         )
         return action
 
@@ -729,13 +758,16 @@ def action_view_delivery(self):
             action["domain"] = [("id", "in", picking.ids)]
         elif picking:
             action.update(
-                res_id=picking.id, view_mode="form", view_id=False, views=False,
+                res_id=picking.id,
+                view_mode="form",
+                view_id=False,
+                views=False,
             )
         return action
 
     # Validation business methods
     def _ensure_required_fields(self):
-        """ This method is used to ensure the following fields are not empty:
+        """This method is used to ensure the following fields are not empty:
         [
             'partner_id', 'partner_invoice_id', 'partner_shipping_id',
             'product_id', 'location_id'
@@ -762,7 +794,7 @@ def _ensure_required_fields(self):
                 raise ValidationError(_("Required field(s):%s") % desc)
 
     def _ensure_can_be_returned(self):
-        """ This method is intended to be invoked after user click on
+        """This method is intended to be invoked after user click on
         'Replace' or 'Return to customer' button (before the delivery wizard
         is launched) and after confirm the wizard.
 
@@ -779,7 +811,7 @@ def _ensure_can_be_returned(self):
             raise ValidationError(_("None of the selected RMAs can perform a return."))
 
     def _ensure_can_be_replaced(self):
-        """ This method is intended to be invoked after user click on
+        """This method is intended to be invoked after user click on
         'Replace' button (before the delivery wizard
         is launched) and after confirm the wizard.
 
@@ -806,7 +838,7 @@ def _ensure_can_be_split(self):
             raise ValidationError(_("This RMA cannot be split."))
 
     def _ensure_qty_to_return(self, qty=None, uom=None):
-        """ This method is intended to be invoked after confirm the wizard.
+        """This method is intended to be invoked after confirm the wizard.
         invoked by: rma.create_return
         """
         if qty and uom:
@@ -818,7 +850,7 @@ def _ensure_qty_to_return(self, qty=None, uom=None):
                 )
 
     def _ensure_qty_to_extract(self, qty, uom):
-        """ This method is intended to be invoked after confirm the wizard.
+        """This method is intended to be invoked after confirm the wizard.
         invoked by: rma.extract_quantity
         """
         to_split_uom_qty = qty
@@ -839,11 +871,15 @@ def _create_receptions_from_picking(self):
         create_vals = {}
         if self.location_id:
             create_vals.update(
-                location_id=self.location_id.id, picking_id=self.picking_id.id,
+                location_id=self.location_id.id,
+                picking_id=self.picking_id.id,
             )
         return_wizard = (
             self.env["stock.return.picking"]
-            .with_context(active_id=self.picking_id.id, active_ids=self.picking_id.ids,)
+            .with_context(
+                active_id=self.picking_id.id,
+                active_ids=self.picking_id.ids,
+            )
             .create(create_vals)
         )
         return_wizard._onchange_picking_id()
@@ -924,13 +960,16 @@ def extract_quantity(self, qty, uom):
                 'Split: <a href="#" data-oe-model="rma" '
                 'data-oe-id="%d">%s</a> has been created.'
             )
-            % (extracted_rma.id, extracted_rma.name,)
+            % (
+                extracted_rma.id,
+                extracted_rma.name,
+            )
         )
         return extracted_rma
 
     # Refund business methods
     def _prepare_refund(self, invoice_form, origin):
-        """ Hook method for preparing the refund Form.
+        """Hook method for preparing the refund Form.
 
         This method could be override in order to add new custom field
         values in the refund creation.
@@ -942,7 +981,7 @@ def _prepare_refund(self, invoice_form, origin):
         invoice_form.partner_id = self.partner_invoice_id
 
     def _prepare_refund_line(self, line_form):
-        """ Hook method for preparing a refund line Form.
+        """Hook method for preparing a refund line Form.
 
         This method could be override in order to add new custom field
         values in the refund line creation.
@@ -965,7 +1004,7 @@ def _get_refund_line_product(self):
 
     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 """
+        in case a kit is linked with the rma"""
         return (self.product_uom_qty, self.product_uom)
 
     def _get_refund_line_price_unit(self):
@@ -1088,9 +1127,14 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
             self.state = "waiting_replacement"
 
     def _action_launch_stock_rule(
-        self, scheduled_date, warehouse, product, qty, uom,
+        self,
+        scheduled_date,
+        warehouse,
+        product,
+        qty,
+        uom,
     ):
-        """ Creates a delivery picking and launch stock rule. It is invoked by:
+        """Creates a delivery picking and launch stock rule. It is invoked by:
         rma.create_replace
         """
         self.ensure_one()
@@ -1125,7 +1169,10 @@ def _action_launch_stock_rule(
         return True
 
     def _prepare_procurement_values(
-        self, group_id, scheduled_date, warehouse,
+        self,
+        group_id,
+        scheduled_date,
+        warehouse,
     ):
         self.ensure_one()
         return {
@@ -1189,7 +1236,7 @@ def message_new(self, msg_dict, custom_values=None):
 
     @api.returns("mail.message", lambda value: value.id)
     def message_post(self, **kwargs):
-        """ Set 'sent' field to True when an email is sent from rma form
+        """Set 'sent' field to True when an email is sent from rma form
         view. This field (sent) is used to set the appropriate style to the
         'Send by Email' button in the rma form view.
         """
@@ -1218,20 +1265,20 @@ def _get_report_base_filename(self):
 
     # Other business methods
     def update_received_state(self):
-        """ Invoked by:
-         [stock.move].unlink
-         [stock.move]._action_cancel
-         """
+        """Invoked by:
+        [stock.move].unlink
+        [stock.move]._action_cancel
+        """
         rma = self.filtered(lambda r: r.delivered_qty == 0)
         if rma:
             rma.write({"state": "received"})
 
     def update_replaced_state(self):
-        """ Invoked by:
-         [stock.move]._action_done
-         [stock.move].unlink
-         [stock.move]._action_cancel
-         """
+        """Invoked by:
+        [stock.move]._action_done
+        [stock.move].unlink
+        [stock.move]._action_cancel
+        """
         rma = self.filtered(
             lambda r: (
                 r.state == "waiting_replacement"
diff --git a/rma/models/rma_tag.py b/rma/models/rma_tag.py
index 9f96059e2..12960025d 100644
--- a/rma/models/rma_tag.py
+++ b/rma/models/rma_tag.py
@@ -12,7 +12,12 @@ class RmaTag(models.Model):
         default=True,
         help="The active field allows you to hide the category without " "removing it.",
     )
-    name = fields.Char(string="Tag Name", required=True, translate=True, copy=False,)
+    name = fields.Char(
+        string="Tag Name",
+        required=True,
+        translate=True,
+        copy=False,
+    )
     color = fields.Integer(string="Color Index")
     rma_ids = fields.Many2many(comodel_name="rma")
 
diff --git a/rma/models/rma_team.py b/rma/models/rma_team.py
index 4bb2e7d72..f46b3d4b1 100644
--- a/rma/models/rma_team.py
+++ b/rma/models/rma_team.py
@@ -11,7 +11,10 @@ class RmaTeam(models.Model):
     _order = "sequence, name"
 
     sequence = fields.Integer()
-    name = fields.Char(required=True, translate=True,)
+    name = fields.Char(
+        required=True,
+        translate=True,
+    )
     active = fields.Boolean(
         default=True,
         help="If the active field is set to false, it will allow you "
@@ -29,7 +32,9 @@ class RmaTeam(models.Model):
         default=lambda self: self.env.user,
     )
     member_ids = fields.One2many(
-        comodel_name="res.users", inverse_name="rma_team_id", string="Team Members",
+        comodel_name="res.users",
+        inverse_name="rma_team_id",
+        string="Team Members",
     )
 
     def copy(self, default=None):
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index ade29234b..e6ca9df39 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -10,7 +10,10 @@ class StockMove(models.Model):
 
     # RMAs that were created from the delivery move
     rma_ids = fields.One2many(
-        comodel_name="rma", inverse_name="move_id", string="RMAs", copy=False,
+        comodel_name="rma",
+        inverse_name="move_id",
+        string="RMAs",
+        copy=False,
     )
     # RMAs linked to the incoming movement from client
     rma_receiver_ids = fields.One2many(
@@ -20,7 +23,11 @@ class StockMove(models.Model):
         copy=False,
     )
     # RMA that create the delivery movement to the customer
-    rma_id = fields.Many2one(comodel_name="rma", string="RMA return", copy=False,)
+    rma_id = fields.Many2one(
+        comodel_name="rma",
+        string="RMA return",
+        copy=False,
+    )
 
     def unlink(self):
         # A stock user could have no RMA permissions, so the ids wouldn't
@@ -44,7 +51,7 @@ def _action_cancel(self):
         return res
 
     def _action_done(self, cancel_backorder=False):
-        """ Avoids to validate stock.move with less quantity than the
+        """Avoids to validate stock.move with less quantity than the
         quantity in the linked receiver RMA. It also set the appropriated
         linked RMA to 'received' or 'delivered'.
         """
@@ -76,13 +83,13 @@ def _action_done(self, cancel_backorder=False):
 
     @api.model
     def _prepare_merge_moves_distinct_fields(self):
-        """ The main use is that launched delivery RMAs doesn't merge
+        """The main use is that launched delivery RMAs doesn't merge
         two moves if they are linked to a different RMAs.
         """
         return super()._prepare_merge_moves_distinct_fields() + ["rma_id"]
 
     def _prepare_move_split_vals(self, qty):
-        """ Intended to the backport of picking linked to RMAs propagates the
+        """Intended to the backport of picking linked to RMAs propagates the
         RMA link id.
         """
         res = super()._prepare_move_split_vals(qty)
@@ -90,8 +97,7 @@ def _prepare_move_split_vals(self, qty):
         return res
 
     def _prepare_return_rma_vals(self, original_picking):
-        """ hook method for preparing an RMA from the 'return picking wizard'.
-        """
+        """hook method for preparing an RMA from the 'return picking wizard'."""
         self.ensure_one()
         partner = original_picking.partner_id
         if hasattr(original_picking, "sale_id") and original_picking.sale_id:
diff --git a/rma/models/stock_picking.py b/rma/models/stock_picking.py
index e343ae3a2..8b5b76830 100644
--- a/rma/models/stock_picking.py
+++ b/rma/models/stock_picking.py
@@ -7,7 +7,10 @@
 class StockPicking(models.Model):
     _inherit = "stock.picking"
 
-    rma_count = fields.Integer(string="RMA count", compute="_compute_rma_count",)
+    rma_count = fields.Integer(
+        string="RMA count",
+        compute="_compute_rma_count",
+    )
 
     def _compute_rma_count(self):
         for rec in self:
@@ -30,7 +33,10 @@ def action_view_rma(self):
         rma = self.move_lines.mapped("rma_ids")
         if len(rma) == 1:
             action.update(
-                res_id=rma.id, view_mode="form", view_id=False, views=False,
+                res_id=rma.id,
+                view_mode="form",
+                view_id=False,
+                views=False,
             )
         else:
             action["domain"] = [("id", "in", rma.ids)]
diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py
index 0b1c30916..1398faecb 100644
--- a/rma/models/stock_warehouse.py
+++ b/rma/models/stock_warehouse.py
@@ -16,16 +16,21 @@ class StockWarehouse(models.Model):
         help="RMA related products can be stored in this warehouse.",
     )
     rma_in_type_id = fields.Many2one(
-        comodel_name="stock.picking.type", string="RMA In Type",
+        comodel_name="stock.picking.type",
+        string="RMA In Type",
     )
     rma_out_type_id = fields.Many2one(
-        comodel_name="stock.picking.type", string="RMA Out Type",
+        comodel_name="stock.picking.type",
+        string="RMA Out Type",
+    )
+    rma_loc_id = fields.Many2one(
+        comodel_name="stock.location",
+        string="RMA Location",
     )
-    rma_loc_id = fields.Many2one(comodel_name="stock.location", string="RMA Location",)
 
     @api.model_create_multi
     def create(self, vals_list):
-        """ To create an RMA location and link it with a new warehouse,
+        """To create an RMA location and link it with a new warehouse,
         this method is overridden instead of '_get_locations_values'
         method because the locations that are created with the
         values ​​returned by that method are forced to be children
@@ -39,7 +44,7 @@ def create(self, vals_list):
         return res
 
     def _get_rma_location_values(self):
-        """ this method is intended to be used by 'create' method
+        """this method is intended to be used by 'create' method
         to create a new RMA location to be linked to a new warehouse.
         """
         return {
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 1f07b7be7..7857eaae1 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -327,17 +327,20 @@ def test_mass_refund(self):
         # One refund per partner
         self.assertNotEqual(refund_1.partner_id, refund_2.partner_id)
         self.assertEqual(
-            refund_1.partner_id, (rma_1 | rma_2 | rma_3).mapped("partner_invoice_id"),
+            refund_1.partner_id,
+            (rma_1 | rma_2 | rma_3).mapped("partner_invoice_id"),
         )
         self.assertEqual(refund_2.partner_id, rma_4.partner_invoice_id)
         # Each RMA (rma_1, rma_2 and rma_3) is linked with a different
         # line of refund_1
         self.assertEqual(len(refund_1.invoice_line_ids), 3)
         self.assertEqual(
-            refund_1.invoice_line_ids.mapped("rma_id"), (rma_1 | rma_2 | rma_3),
+            refund_1.invoice_line_ids.mapped("rma_id"),
+            (rma_1 | rma_2 | rma_3),
         )
         self.assertEqual(
-            (rma_1 | rma_2 | rma_3).mapped("refund_line_id"), refund_1.invoice_line_ids,
+            (rma_1 | rma_2 | rma_3).mapped("refund_line_id"),
+            refund_1.invoice_line_ids,
         )
         # rma_4 is linked with the unique line of refund_2
         self.assertEqual(len(refund_2.invoice_line_ids), 1)
@@ -369,7 +372,8 @@ def test_replace(self):
         )
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
-                active_ids=rma.ids, rma_delivery_type="replace",
+                active_ids=rma.ids,
+                rma_delivery_type="replace",
             )
         )
         delivery_form.product_id = product_2
@@ -396,7 +400,8 @@ def test_replace(self):
         )
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
-                active_ids=rma.ids, rma_delivery_type="replace",
+                active_ids=rma.ids,
+                rma_delivery_type="replace",
             )
         )
         delivery_form.product_id = product_3
@@ -439,7 +444,8 @@ def test_return_to_customer(self):
         # Return the same product with quantity 2 to the customer.
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
-                active_ids=rma.ids, rma_delivery_type="return",
+                active_ids=rma.ids,
+                rma_delivery_type="return",
             )
         )
         delivery_form.product_uom_qty = 2
@@ -471,7 +477,8 @@ def test_return_to_customer(self):
         # Return the remaining quantity to the customer
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
-                active_ids=rma.ids, rma_delivery_type="return",
+                active_ids=rma.ids,
+                rma_delivery_type="return",
             )
         )
         delivery_wizard = delivery_form.save()
@@ -538,17 +545,20 @@ def test_mass_return_to_customer(self):
         # One picking per partner
         self.assertNotEqual(pick_1.partner_id, pick_2.partner_id)
         self.assertEqual(
-            pick_1.partner_id, (rma_1 | rma_2 | rma_3).mapped("partner_shipping_id"),
+            pick_1.partner_id,
+            (rma_1 | rma_2 | rma_3).mapped("partner_shipping_id"),
         )
         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(
-            pick_1.move_lines.mapped("rma_id"), (rma_1 | rma_2 | rma_3),
+            pick_1.move_lines.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,
+            (rma_1 | rma_2 | rma_3).mapped("delivery_move_ids"),
+            pick_1.move_lines,
         )
         # rma_4 is linked with the unique move of pick_2
         self.assertEqual(len(pick_2.move_lines), 1)
@@ -569,7 +579,10 @@ def test_rma_from_picking_return(self):
         origin_delivery = self._create_delivery()
         return_wizard = (
             self.env["stock.return.picking"]
-            .with_context(active_id=origin_delivery.id, active_ids=origin_delivery.ids,)
+            .with_context(
+                active_id=origin_delivery.id,
+                active_ids=origin_delivery.ids,
+            )
             .create({"create_rma": True, "picking_id": origin_delivery.id})
         )
         return_wizard._onchange_picking_id()
@@ -607,7 +620,8 @@ def test_split(self):
         # Return quantity 4 of the same product to the customer
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
-                active_ids=rma.ids, rma_delivery_type="return",
+                active_ids=rma.ids,
+                rma_delivery_type="return",
             )
         )
         delivery_form.product_uom_qty = 4
@@ -620,7 +634,10 @@ def test_split(self):
         self.assertTrue(rma.can_be_split)
         split_wizard = (
             self.env["rma.split.wizard"]
-            .with_context(active_id=rma.id, active_ids=rma.ids,)
+            .with_context(
+                active_id=rma.id,
+                active_ids=rma.ids,
+            )
             .create({})
         )
         action = split_wizard.action_split()
diff --git a/rma/wizard/rma_delivery.py b/rma/wizard/rma_delivery.py
index ae7c0f429..251e73e4d 100644
--- a/rma/wizard/rma_delivery.py
+++ b/rma/wizard/rma_delivery.py
@@ -16,15 +16,19 @@ class RmaReDeliveryWizard(models.TransientModel):
         required=True,
     )
     product_id = fields.Many2one(
-        comodel_name="product.product", string="Replace Product",
+        comodel_name="product.product",
+        string="Replace Product",
     )
     product_uom_qty = fields.Float(
-        string="Product qty", digits="Product Unit of Measure",
+        string="Product qty",
+        digits="Product Unit of Measure",
     )
     product_uom = fields.Many2one(comodel_name="uom.uom", string="Unit of measure")
     scheduled_date = fields.Datetime(required=True, default=fields.Datetime.now())
     warehouse_id = fields.Many2one(
-        comodel_name="stock.warehouse", string="Warehouse", required=True,
+        comodel_name="stock.warehouse",
+        string="Warehouse",
+        required=True,
     )
 
     @api.constrains("product_uom_qty")
diff --git a/rma/wizard/rma_split.py b/rma/wizard/rma_split.py
index 1ac646a95..e30d204c4 100644
--- a/rma/wizard/rma_split.py
+++ b/rma/wizard/rma_split.py
@@ -8,7 +8,10 @@ class RmaReSplitWizard(models.TransientModel):
     _name = "rma.split.wizard"
     _description = "RMA Split Wizard"
 
-    rma_id = fields.Many2one(comodel_name="rma", string="RMA",)
+    rma_id = fields.Many2one(
+        comodel_name="rma",
+        string="RMA",
+    )
     product_uom_qty = fields.Float(
         string="Quantity to extract",
         digits="Product Unit of Measure",
@@ -16,7 +19,9 @@ class RmaReSplitWizard(models.TransientModel):
         help="Quantity to extract to a new RMA.",
     )
     product_uom = fields.Many2one(
-        comodel_name="uom.uom", string="Unit of measure", required=True,
+        comodel_name="uom.uom",
+        string="Unit of measure",
+        required=True,
     )
 
     _sql_constraints = [
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
index b337e73ab..a331c288a 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -51,7 +51,7 @@ def _onchange_create_rma(self):
         return {"domain": {"location_id": rma_loc_domain}}
 
     def create_returns(self):
-        """ Override create_returns method for creating one or more
+        """Override create_returns method for creating one or more
         'confirmed' RMAs after return a delivery picking in case
         'Create RMAs' checkbox is checked in this wizard.
         New RMAs will be linked to the delivery picking as the origin

From 2a9fc0f5ba36e56ead8676e8ee1a7a29931ca960 Mon Sep 17 00:00:00 2001
From: Chafique <chafique.delli@akretion.com>
Date: Fri, 4 Dec 2020 15:49:35 +0100
Subject: [PATCH 026/108] [MIG] rma: Migration to 14.0

---
 rma/README.rst                     | 12 +++++++-----
 rma/controllers/main.py            |  4 +---
 rma/data/mail_data.xml             |  1 -
 rma/models/account_move.py         |  4 ++--
 rma/models/rma.py                  | 18 +++++++-----------
 rma/models/rma_team.py             | 16 ++++++++++------
 rma/readme/CONTRIBUTORS.rst        |  2 ++
 rma/report/report.xml              | 19 ++++++++-----------
 rma/security/ir.model.access.csv   |  2 ++
 rma/tests/test_rma.py              | 28 +++++++++++-----------------
 rma/views/rma_tag_views.xml        |  1 +
 rma/views/rma_views.xml            |  7 ++++++-
 rma/wizard/rma_delivery.py         |  6 +-----
 rma/wizard/rma_delivery_views.xml  | 22 ++++++++++++----------
 rma/wizard/stock_picking_return.py | 11 +----------
 15 files changed, 71 insertions(+), 82 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index abdfda0aa..855d4bf96 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -14,13 +14,13 @@ 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/13.0/rma
+    :target: https://github.com/OCA/rma/tree/14.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-13-0/rma-13-0-rma
+    :target: https://translation.odoo-community.org/projects/rma-14-0/rma-14-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/13.0
+    :target: https://runbot.odoo-community.org/runbot/145/14.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -120,7 +120,7 @@ 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:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2014.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.
 
@@ -141,6 +141,8 @@ Contributors
   * Pedro M. Baeza
   * David Vidal
 
+* Chafique Delli <chafique.delli@akretion.com>
+
 Maintainers
 ~~~~~~~~~~~
 
@@ -162,6 +164,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-ernestotejeda| 
 
-This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/13.0/rma>`_ project on GitHub.
+This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/14.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/controllers/main.py b/rma/controllers/main.py
index a262f83aa..07f98862d 100644
--- a/rma/controllers/main.py
+++ b/rma/controllers/main.py
@@ -46,7 +46,6 @@ def portal_my_rmas(self, page=1, date_begin=None, date_end=None, sortby=None, **
         if not sortby:
             sortby = "date"
         order = searchbar_sortings[sortby]["order"]
-        archive_groups = self._get_archive_groups("rma", domain)
         if date_begin and date_end:
             domain += [
                 ("create_date", ">", date_begin),
@@ -77,7 +76,6 @@ def portal_my_rmas(self, page=1, date_begin=None, date_end=None, sortby=None, **
                 "rmas": rmas,
                 "page_name": "RMA",
                 "pager": pager,
-                "archive_groups": archive_groups,
                 "default_url": "/my/rmas",
                 "searchbar_sortings": searchbar_sortings,
                 "sortby": sortby,
@@ -118,7 +116,7 @@ def portal_my_rma_picking_report(self, rma_id, picking_id, access_token=None, **
         except exceptions.AccessError:
             return request.redirect("/my")
         report_sudo = request.env.ref("stock.action_report_delivery").sudo()
-        pdf = report_sudo.render_qweb_pdf([picking_sudo.id])[0]
+        pdf = report_sudo._render_qweb_pdf([picking_sudo.id])[0]
         pdfhttpheaders = [
             ("Content-Type", "application/pdf"),
             ("Content-Length", len(pdf)),
diff --git a/rma/data/mail_data.xml b/rma/data/mail_data.xml
index 175d44364..b30d4b3ad 100644
--- a/rma/data/mail_data.xml
+++ b/rma/data/mail_data.xml
@@ -42,7 +42,6 @@
         <field name="report_template" ref="report_rma_action" />
         <field name="report_name">${(object.name or '')}</field>
         <field name="lang">${object.partner_id.lang}</field>
-        <field name="user_signature" eval="True" />
         <field name="auto_delete" eval="True" />
         <field name="body_html" type="html">
             <div style="margin: 0px; padding: 0px;">
diff --git a/rma/models/account_move.py b/rma/models/account_move.py
index d71aeca41..251f2ff13 100644
--- a/rma/models/account_move.py
+++ b/rma/models/account_move.py
@@ -27,7 +27,7 @@ def _check_rma_invoice_lines_qty(self):
             )
         )
 
-    def post(self):
+    def action_post(self):
         """Avoids to validate a refund with less quantity of product than
         quantity in the linked RMA.
         """
@@ -38,7 +38,7 @@ def post(self):
                     "less than the quantity specified in its linked RMA."
                 )
             )
-        return super().post()
+        return super().action_post()
 
     def unlink(self):
         rma = self.mapped("invoice_line_ids.rma_id")
diff --git a/rma/models/rma.py b/rma/models/rma.py
index e4017eca5..e59bf9f8a 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -249,6 +249,7 @@ def _domain_location_id(self):
         digits="Product Unit of Measure",
         compute="_compute_remaining_qty",
     )
+    uom_category_id = fields.Many2one(related="product_id.uom_id.category_id")
     # Split fields
     can_be_split = fields.Boolean(
         compute="_compute_can_be_split",
@@ -481,12 +482,8 @@ def _onchange_move_id(self):
 
     @api.onchange("product_id")
     def _onchange_product_id(self):
-        domain_product_uom = []
         if self.product_id:
-            # Set UoM and UoM domain (product_uom)
-            domain_product_uom = [
-                ("category_id", "=", self.product_id.uom_id.category_id.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)
@@ -501,7 +498,6 @@ def _onchange_product_id(self):
                     [("company_id", "=", company.id)], limit=1
                 )
                 self.location_id = warehouse.rma_loc_id.id
-        return {"domain": {"product_uom": domain_product_uom}}
 
     # CRUD methods (ORM overrides)
     @api.model_create_multi
@@ -510,9 +506,7 @@ def create(self, vals_list):
             if vals.get("name", _("New")) == _("New"):
                 ir_sequence = self.env["ir.sequence"]
                 if "company_id" in vals:
-                    ir_sequence = ir_sequence.with_context(
-                        force_company=vals["company_id"]
-                    )
+                    ir_sequence = ir_sequence.with_company(vals["company_id"])
                 vals["name"] = ir_sequence.next_by_code("rma")
             # Assign a default team_id which will be the first in the sequence
             if "team_id" not in vals:
@@ -600,7 +594,7 @@ def action_refund(self):
             origin = ", ".join(rmas.mapped("name"))
             invoice_form = Form(
                 self.env["account.move"].with_context(
-                    default_type="out_refund",
+                    default_move_type="out_refund",
                     company_id=rmas[0].company_id.id,
                 ),
                 "account.view_move_form",
@@ -1056,6 +1050,8 @@ def create_return(self, scheduled_date, qty=None, uom=None):
                     move_orig_ids=[(4, rma.reception_move_id.id)],
                     company_id=picking.company_id.id,
                 )
+                if "product_qty" in move_vals:
+                    move_vals.pop("product_qty")
                 self.env["stock.move"].sudo().create(move_vals)
                 rma.message_post(
                     body=_(
@@ -1084,7 +1080,7 @@ def _prepare_returning_move(
         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_expected = scheduled_date
+        move_form.date = scheduled_date
 
     # Replacing business methods
     def create_replace(self, scheduled_date, warehouse, product, qty, uom):
diff --git a/rma/models/rma_team.py b/rma/models/rma_team.py
index f46b3d4b1..fd624f60a 100644
--- a/rma/models/rma_team.py
+++ b/rma/models/rma_team.py
@@ -1,6 +1,8 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+import ast
+
 from odoo import _, fields, models
 
 
@@ -51,10 +53,12 @@ def copy(self, default=None):
             )
         return team
 
-    def get_alias_model_name(self, vals):
-        return vals.get("alias_model", "rma")
-
-    def get_alias_values(self):
-        values = super().get_alias_values()
-        values["alias_defaults"] = {"team_id": self.id}
+    def _alias_get_creation_values(self):
+        values = super()._alias_get_creation_values()
+        values["alias_model_id"] = self.env.ref("rma.model_rma").id
+        if self.id:
+            values["alias_defaults"] = defaults = ast.literal_eval(
+                self.alias_defaults or "{}"
+            )
+            defaults["team_id"] = self.id
         return values
diff --git a/rma/readme/CONTRIBUTORS.rst b/rma/readme/CONTRIBUTORS.rst
index d40522718..49a9884e5 100644
--- a/rma/readme/CONTRIBUTORS.rst
+++ b/rma/readme/CONTRIBUTORS.rst
@@ -3,3 +3,5 @@
   * Ernesto Tejeda
   * Pedro M. Baeza
   * David Vidal
+
+* Chafique Delli <chafique.delli@akretion.com>
diff --git a/rma/report/report.xml b/rma/report/report.xml
index 5816ab294..3840534dc 100644
--- a/rma/report/report.xml
+++ b/rma/report/report.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-    <data>
-        <report
-            id="report_rma_action"
-            string="RMA Report"
-            model="rma"
-            report_type="qweb-pdf"
-            file="rma.report_rma"
-            name="rma.report_rma"
-            print_report_name="object._get_report_base_filename()"
-        />
-    </data>
+    <record id="report_rma_action" model="ir.actions.report">
+        <field name="name">RMA Report</field>
+        <field name="model">rma</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">rma.report_rma</field>
+        <field name="report_file">rma.report_rma</field>
+        <field name="print_report_name">(object._get_report_base_filename())</field>
+    </record>
 </odoo>
diff --git a/rma/security/ir.model.access.csv b/rma/security/ir.model.access.csv
index ad209dc75..911c8d53f 100644
--- a/rma/security/ir.model.access.csv
+++ b/rma/security/ir.model.access.csv
@@ -8,3 +8,5 @@ access_rma_operation_user_own,rma.operation.user.own,model_rma_operation,rma_gro
 access_rma_operation_manager,rma.operation.manager,model_rma_operation,rma_group_manager,1,1,1,1
 access_rma_tag_user_own,rma.tag.user.own,model_rma_tag,rma_group_user_own,1,0,0,0
 access_rma_tag_manager,rma.tag.manager,model_rma_tag,rma_group_manager,1,1,1,1
+access_rma_delivery_wizard_user_all,rma.delivery.wizard.user.all,model_rma_delivery_wizard,rma_group_user_all,1,1,1,1
+access_rma_split_wizard_user_all,rma.split.wizard.user.all,model_rma_split_wizard,rma_group_user_all,1,1,1,1
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 7857eaae1..d0680ce27 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -69,7 +69,7 @@ def _create_confirm_receive(
         rma = self._create_rma(partner, product, qty, location)
         rma.action_confirm()
         rma.reception_move_id.quantity_done = rma.product_uom_qty
-        rma.reception_move_id.picking_id.action_done()
+        rma.reception_move_id.picking_id._action_done()
         return rma
 
     def _test_readonly_fields(self, rma):
@@ -161,7 +161,7 @@ def test_onchange(self):
             move.product_uom_qty = 15
             move.product_uom = uom_ten
         picking = picking_form.save()
-        picking.action_done()
+        picking._action_done()
         rma_form.picking_id = picking
         rma_form.move_id = picking.move_lines
         self.assertEqual(rma_form.product_id, product_2)
@@ -174,12 +174,6 @@ def test_onchange(self):
         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 = rma_form.save()
-        # If product changes, unit of measure domain should also change
-        domain = rma._onchange_product_id()["domain"]["product_uom"]
-        self.assertListEqual(
-            domain, [("category_id", "=", self.product.uom_id.category_id.id)]
-        )
 
     def test_ensure_required_fields_on_confirm(self):
         rma = self._create_rma()
@@ -212,9 +206,9 @@ def test_confirm_and_receive(self):
         self._test_readonly_fields(rma)
         rma.reception_move_id.quantity_done = 9
         with self.assertRaises(ValidationError):
-            rma.reception_move_id.picking_id.action_done()
+            rma.reception_move_id.picking_id._action_done()
         rma.reception_move_id.quantity_done = 10
-        rma.reception_move_id.picking_id.action_done()
+        rma.reception_move_id.picking_id._action_done()
         self.assertEqual(rma.reception_move_id.picking_id.state, "done")
         self.assertEqual(rma.reception_move_id.quantity_done, 10)
         self.assertEqual(rma.state, "received")
@@ -260,7 +254,7 @@ def test_action_refund(self):
         self.assertTrue(rma.can_be_returned)
         self.assertTrue(rma.can_be_replaced)
         rma.action_refund()
-        self.assertEqual(rma.refund_id.type, "out_refund")
+        self.assertEqual(rma.refund_id.move_type, "out_refund")
         self.assertEqual(rma.refund_id.state, "draft")
         self.assertEqual(rma.refund_line_id.product_id, rma.product_id)
         self.assertEqual(rma.refund_line_id.quantity, 10)
@@ -273,11 +267,11 @@ def test_action_refund(self):
             with refund_form.invoice_line_ids.edit(0) as refund_line:
                 refund_line.quantity = 9
         with self.assertRaises(ValidationError):
-            rma.refund_id.post()
+            rma.refund_id.action_post()
         with Form(rma.refund_line_id.move_id) as refund_form:
             with refund_form.invoice_line_ids.edit(0) as refund_line:
                 refund_line.quantity = 10
-        rma.refund_id.post()
+        rma.refund_id.action_post()
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
@@ -356,12 +350,12 @@ def test_mass_refund(self):
             with refund_form.invoice_line_ids.edit(1) as refund_line:
                 refund_line.quantity = 14
         with self.assertRaises(ValidationError):
-            refund_1.post()
+            refund_1.action_post()
         with Form(rma_2.refund_line_id.move_id) as refund_form:
             with refund_form.invoice_line_ids.edit(1) as refund_line:
                 refund_line.quantity = 15
-        refund_1.post()
-        refund_2.post()
+        refund_1.action_post()
+        refund_2.action_post()
 
     def test_replace(self):
         # Create, confirm and receive an RMA
@@ -616,7 +610,7 @@ def test_split(self):
         rma = rma_form.save()
         rma.action_confirm()
         rma.reception_move_id.quantity_done = 10
-        rma.reception_move_id.picking_id.action_done()
+        rma.reception_move_id.picking_id._action_done()
         # Return quantity 4 of the same product to the customer
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
diff --git a/rma/views/rma_tag_views.xml b/rma/views/rma_tag_views.xml
index 780332118..1d0e119cb 100644
--- a/rma/views/rma_tag_views.xml
+++ b/rma/views/rma_tag_views.xml
@@ -4,6 +4,7 @@
         <field name="model">rma.tag</field>
         <field name="arch" type="xml">
             <search string="RMA Tags">
+                <field name="name" />
                 <filter
                     string="Archived"
                     name="inactive"
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 7147dd690..4f8496c04 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -254,10 +254,15 @@
                                 force_save="1"
                                 attrs="{'readonly': ['|', ('picking_id', '!=', False), ('state', '!=', 'draft')]}"
                             />
+                            <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" groups="uom.group_uom" />
+                                <field
+                                    name="product_uom"
+                                    groups="uom.group_uom"
+                                    domain="[('category_id', '=', uom_category_id)]"
+                                />
                             </div>
                             <field
                                 name="delivered_qty"
diff --git a/rma/wizard/rma_delivery.py b/rma/wizard/rma_delivery.py
index 251e73e4d..e23d9d758 100644
--- a/rma/wizard/rma_delivery.py
+++ b/rma/wizard/rma_delivery.py
@@ -30,6 +30,7 @@ class RmaReDeliveryWizard(models.TransientModel):
         string="Warehouse",
         required=True,
     )
+    uom_category_id = fields.Many2one(related="product_id.uom_id.category_id")
 
     @api.constrains("product_uom_qty")
     def _check_product_uom_qty(self):
@@ -66,14 +67,9 @@ def default_get(self, fields_list):
 
     @api.onchange("product_id")
     def _onchange_product_id(self):
-        domain_product_uom = []
         if self.product_id:
-            domain_product_uom = [
-                ("category_id", "=", self.product_id.uom_id.category_id.id)
-            ]
             if not self.product_uom or self.product_id.uom_id.id != self.product_uom.id:
                 self.product_uom = self.product_id.uom_id
-        return {"domain": {"product_uom": domain_product_uom}}
 
     def action_deliver(self):
         self.ensure_one()
diff --git a/rma/wizard/rma_delivery_views.xml b/rma/wizard/rma_delivery_views.xml
index ae3ace93f..877bb1db8 100644
--- a/rma/wizard/rma_delivery_views.xml
+++ b/rma/wizard/rma_delivery_views.xml
@@ -16,6 +16,7 @@
                         />
                     </group>
                     <group>
+                        <field name="uom_category_id" invisible="1" />
                         <field
                             name="product_id"
                             attrs="{'invisible': ['|', ('type', '!=', 'replace'), ('rma_count', '>', 1)], 'required': [('type', '=', 'replace'), ('rma_count', '=', 1)]}"
@@ -36,6 +37,7 @@
                                 name="product_uom"
                                 groups="uom.group_uom"
                                 attrs="{'required': [('rma_count', '=', 1)]}"
+                                domain="[('category_id', '=', uom_category_id)]"
                             />
                         </div>
                     </group>
@@ -54,14 +56,14 @@
             </form>
         </field>
     </record>
-    <act_window
-        id="rma_delivery_wizard_action"
-        name="Return to customer"
-        binding_model="rma"
-        binding_views="list"
-        res_model="rma.delivery.wizard"
-        view_mode="form"
-        target="new"
-        context="{'rma_delivery_type': 'return'}"
-    />
+
+    <record id="rma_delivery_wizard_action" model="ir.actions.act_window">
+        <field name="name">Return to customer</field>
+        <field name="res_model">rma.delivery.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="binding_model_id" ref="rma.model_rma" />
+        <field name="binding_view_types">list</field>
+        <field name="target">new</field>
+        <field name="context">{'rma_delivery_type': 'return'}</field>
+    </record>
 </odoo>
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
index a331c288a..786795626 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -9,16 +9,7 @@ class ReturnPicking(models.TransientModel):
     _inherit = "stock.return.picking"
 
     create_rma = fields.Boolean(string="Create RMAs")
-    picking_type_code = fields.Selection(
-        selection=[
-            ("incoming", "Vendors"),
-            ("outgoing", "Customers"),
-            ("internal", "Internal"),
-        ],
-        related="picking_id.picking_type_id.code",
-        store=True,
-        readonly=True,
-    )
+    picking_type_code = fields.Selection(related="picking_id.picking_type_id.code")
 
     @api.onchange("create_rma")
     def _onchange_create_rma(self):

From 36456049426ed32c00a4a1c9bff7df7d4c8b16b6 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Wed, 19 May 2021 14:49:54 +0200
Subject: [PATCH 027/108] [IMP] rma: notify reception to customer

Now we can configure if an automatic notification should be sent when we
receive the goods from an RMA in our warehouse

If we've got `rma_sale` or `website_rma` we can also configure draft
notifications so when the customer places an RMA from the portal the
receive an acknowledge email.

TT29595
---
 rma/data/mail_data.xml                  | 60 ++++++++++++++++++-
 rma/models/res_company.py               | 35 ++++++++++++
 rma/models/res_config_settings.py       | 16 ++++++
 rma/models/rma.py                       | 40 ++++++++++++-
 rma/models/stock_move.py                |  2 +-
 rma/tests/test_rma.py                   | 47 ++++++++++++---
 rma/views/res_config_settings_views.xml | 76 +++++++++++++++++++++++++
 7 files changed, 265 insertions(+), 11 deletions(-)

diff --git a/rma/data/mail_data.xml b/rma/data/mail_data.xml
index b30d4b3ad..4293a84b7 100644
--- a/rma/data/mail_data.xml
+++ b/rma/data/mail_data.xml
@@ -8,7 +8,7 @@
         <field name="description">RMA in draft state</field>
     </record>
     <record id="mt_rma_notification" model="mail.message.subtype">
-        <field name="name">RMA Notificatoin</field>
+        <field name="name">RMA Notification</field>
         <field name="res_model">rma</field>
         <field name="default" eval="False" />
         <field name="description">RMA automatic customer notifications</field>
@@ -58,4 +58,62 @@
             </div>
         </field>
     </record>
+    <!--RMA receipt confirmation email template -->
+    <record id="mail_template_rma_receipt_notification" model="mail.template">
+        <field name="name">RMA Receipt Notification</field>
+        <field name="model_id" ref="model_rma" />
+        <field name="email_from">${object.user_id.email_formatted |safe}</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_template" ref="report_rma_action" />
+        <field name="report_name">${(object.name or '')}</field>
+        <field name="lang">${object.partner_id.lang}</field>
+        <field name="auto_delete" eval="True" />
+        <field name="body_html" type="html">
+<div style="margin: 0px; padding: 0px;">
+<p style="margin: 0px; padding: 0px; font-size: 13px;">
+    Dear ${object.partner_id.name}
+    % if object.partner_id.parent_id:
+        (${object.partner_id.parent_id.name})
+    % endif
+    <br /><br />
+    The products for your RMA <strong>${object.name}</strong>
+    from ${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="name">RMA Draft Notification</field>
+        <field name="model_id" ref="model_rma" />
+        <field name="email_from">${object.user_id.email_formatted |safe}</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_template" ref="report_rma_action" />
+        <field name="report_name">${(object.name or '')}</field>
+        <field name="lang">${object.partner_id.lang}</field>
+        <field name="auto_delete" eval="True" />
+        <field name="body_html" type="html">
+<div style="margin: 0px; padding: 0px;">
+<p style="margin: 0px; padding: 0px; font-size: 13px;">
+    Dear ${object.partner_id.name}
+    % if object.partner_id.parent_id:
+        (${object.partner_id.parent_id.name})
+    % endif
+    <br /><br />
+    You've succesfully placed your RMA <strong>${object.name}</strong>
+    on ${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>
 </data>
diff --git a/rma/models/res_company.py b/rma/models/res_company.py
index 0a270769d..479e7e7c5 100644
--- a/rma/models/res_company.py
+++ b/rma/models/res_company.py
@@ -13,11 +13,32 @@ def _default_rma_mail_confirmation_template(self):
         except ValueError:
             return False
 
+    def _default_rma_mail_receipt_template(self):
+        try:
+            return self.env.ref("rma.mail_template_rma_receipt_notification").id
+        except ValueError:
+            return False
+
+    def _default_rma_mail_draft_template(self):
+        try:
+            return self.env.ref("rma.mail_template_rma_draft_notification").id
+        except ValueError:
+            return False
+
     send_rma_confirmation = fields.Boolean(
         string="Send RMA Confirmation",
         help="When the delivery is confirmed, send a confirmation email "
         "to the customer.",
     )
+    send_rma_receipt_confirmation = fields.Boolean(
+        string="Send RMA Receipt Confirmation",
+        help="When the RMA receipt is confirmed, send a confirmation email "
+        "to the customer.",
+    )
+    send_rma_draft_confirmation = fields.Boolean(
+        string="Send RMA draft Confirmation",
+        help="When a customer places an RMA, send a notification with it",
+    )
     rma_mail_confirmation_template_id = fields.Many2one(
         comodel_name="mail.template",
         string="Email Template confirmation for RMA",
@@ -25,6 +46,20 @@ def _default_rma_mail_confirmation_template(self):
         default=_default_rma_mail_confirmation_template,
         help="Email sent to the customer once the RMA is confirmed.",
     )
+    rma_mail_receipt_confirmation_template_id = fields.Many2one(
+        comodel_name="mail.template",
+        string="Email Template receipt confirmation for RMA",
+        domain="[('model', '=', 'rma')]",
+        default=_default_rma_mail_receipt_template,
+        help="Email sent to the customer once the RMA products are received.",
+    )
+    rma_mail_draft_confirmation_template_id = fields.Many2one(
+        comodel_name="mail.template",
+        string="Email Template draft notification for RMA",
+        domain="[('model', '=', 'rma')]",
+        default=_default_rma_mail_draft_template,
+        help="Email sent to the customer when they place " "an RMA from the portal",
+    )
 
     @api.model
     def create(self, vals):
diff --git a/rma/models/res_config_settings.py b/rma/models/res_config_settings.py
index 303044cbf..c48d324ed 100644
--- a/rma/models/res_config_settings.py
+++ b/rma/models/res_config_settings.py
@@ -14,3 +14,19 @@ class ResConfigSettings(models.TransientModel):
         related="company_id.rma_mail_confirmation_template_id",
         readonly=False,
     )
+    send_rma_receipt_confirmation = fields.Boolean(
+        related="company_id.send_rma_receipt_confirmation",
+        readonly=False,
+    )
+    rma_mail_receipt_confirmation_template_id = fields.Many2one(
+        related="company_id.rma_mail_receipt_confirmation_template_id",
+        readonly=False,
+    )
+    send_rma_draft_confirmation = fields.Boolean(
+        related="company_id.send_rma_draft_confirmation",
+        readonly=False,
+    )
+    rma_mail_draft_confirmation_template_id = fields.Many2one(
+        related="company_id.rma_mail_draft_confirmation_template_id",
+        readonly=False,
+    )
diff --git a/rma/models/rma.py b/rma/models/rma.py
index e59bf9f8a..b825c5763 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -511,7 +511,13 @@ def create(self, vals_list):
             # Assign a default team_id which will be the first in the sequence
             if "team_id" not in vals:
                 vals["team_id"] = self.env["rma.team"].search([], limit=1).id
-        return super().create(vals_list)
+        rmas = super().create(vals_list)
+        # Send acknowledge when the RMA is created from the portal and the
+        # company has the proper setting active. This context is set by the
+        # `rma_sale` module.
+        if self.env.context.get("from_portal"):
+            rmas._send_draft_email()
+        return rmas
 
     def copy(self, default=None):
         team = super().copy(default)
@@ -529,6 +535,16 @@ def unlink(self):
             )
         return super().unlink()
 
+    def _send_draft_email(self):
+        """Send customer notifications they place the RMA from the portal"""
+        for rma in self.filtered("company_id.send_rma_draft_confirmation"):
+            rma_template_id = rma.company_id.rma_mail_draft_confirmation_template_id.id
+            rma.with_context(
+                force_send=True,
+                mark_rma_as_sent=True,
+                default_subtype_id=self.env.ref("rma.mt_rma_notification").id,
+            ).message_post_with_template(rma_template_id)
+
     def _send_confirmation_email(self):
         """Auto send notifications"""
         for rma in self.filtered(lambda p: p.company_id.send_rma_confirmation):
@@ -539,6 +555,18 @@ def _send_confirmation_email(self):
                 default_subtype_id=self.env.ref("rma.mt_rma_notification").id,
             ).message_post_with_template(rma_template_id)
 
+    def _send_receipt_confirmation_email(self):
+        """Send customer notifications when the products are received"""
+        for rma in self.filtered("company_id.send_rma_receipt_confirmation"):
+            rma_template_id = (
+                rma.company_id.rma_mail_receipt_confirmation_template_id.id
+            )
+            rma.with_context(
+                force_send=True,
+                mark_rma_as_sent=True,
+                default_subtype_id=self.env.ref("rma.mt_rma_notification").id,
+            ).message_post_with_template(rma_template_id)
+
     # Action methods
     def action_rma_send(self):
         self.ensure_one()
@@ -1260,6 +1288,16 @@ def _get_report_base_filename(self):
         return "RMA Report - %s" % self.name
 
     # Other business methods
+
+    def update_received_state_on_reception(self):
+        """Invoked by:
+        [stock.move]._action_done
+        Here we can attach methods to trigger when the customer products
+        are received on the RMA location, such as automatic notifications
+        """
+        self.write({"state": "received"})
+        self._send_receipt_confirmation_email()
+
     def update_received_state(self):
         """Invoked by:
         [stock.move].unlink
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index e6ca9df39..fc22806b1 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -75,7 +75,7 @@ def _action_done(self, cancel_backorder=False):
             .mapped("rma_receiver_ids")
             .filtered(lambda r: r.state == "confirmed")
         )
-        to_be_received.write({"state": "received"})
+        to_be_received.update_received_state_on_reception()
         # Set RMAs as delivered
         move_done.mapped("rma_id").update_replaced_state()
         move_done.mapped("rma_id").update_returned_state()
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index d0680ce27..d38cd3e1f 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -676,19 +676,50 @@ def test_quantities_on_hand(self):
         self.assertEqual(rma.product_id.qty_available, 0)
 
     def test_autoconfirm_email(self):
-        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
-        rma.company_id.send_rma_confirmation = True
-        rma.company_id.rma_mail_confirmation_template_id = self.env.ref(
+        self.company.send_rma_confirmation = True
+        self.company.send_rma_receipt_confirmation = True
+        self.company.send_rma_draft_confirmation = True
+        self.company.rma_mail_confirmation_template_id = self.env.ref(
             "rma.mail_template_rma_notification"
         )
+        self.company.rma_mail_receipt_confirmation_template_id = self.env.ref(
+            "rma.mail_template_rma_receipt_notification"
+        )
+        self.company.rma_mail_draft_confirmation_template_id = self.env.ref(
+            "rma.mail_template_rma_draft_notification"
+        )
         previous_mails = self.env["mail.mail"].search(
             [("partner_ids", "in", self.partner.ids)]
         )
         self.assertFalse(previous_mails)
-        rma.action_confirm()
-        mail = self.env["mail.message"].search(
+        # Force the context to mock an RMA created from the portal, which is
+        # feature that we get on `rma_sale`. We drop it after the RMA creation
+        # to avoid uncontrolled side effects
+        ctx = self.env.context
+        self.env.context = dict(ctx, from_portal=True)
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        self.env.context = ctx
+        mail_draft = self.env["mail.message"].search(
             [("partner_ids", "in", self.partner.ids)]
         )
-        self.assertTrue(rma.name in mail.subject)
-        self.assertTrue(rma.name in mail.body)
-        self.assertEqual(self.env.ref("rma.mt_rma_notification"), mail.subtype_id)
+        rma.action_confirm()
+        mail_confirm = (
+            self.env["mail.message"].search([("partner_ids", "in", self.partner.ids)])
+            - mail_draft
+        )
+        self.assertTrue(rma.name in mail_confirm.subject)
+        self.assertTrue(rma.name in mail_confirm.body)
+        self.assertEqual(
+            self.env.ref("rma.mt_rma_notification"), mail_confirm.subtype_id
+        )
+        # Now we'll confirm the incoming goods picking and the automatic
+        # reception notification should be sent
+        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.picking_id.button_validate()
+        mail_receipt = (
+            self.env["mail.message"].search([("partner_ids", "in", self.partner.ids)])
+            - mail_draft
+            - mail_confirm
+        )
+        self.assertTrue(rma.name in mail_receipt.subject)
+        self.assertTrue("products received" in mail_receipt.subject)
diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index 744da02bd..423dff2dd 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -46,6 +46,82 @@
                         </div>
                     </div>
                 </div>
+                <div
+                    class="col-12 col-lg-6 o_setting_box"
+                    title="Send automatic RMA products reception notification to customer"
+                >
+                    <div class="o_setting_left_pane">
+                        <field name="send_rma_receipt_confirmation" />
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label
+                            for="send_rma_receipt_confirmation"
+                            string="RMA Receipt Confirmation Email"
+                        />
+                        <span
+                            class="fa fa-lg fa-building-o"
+                            title="Values set here are company-specific."
+                            groups="base.group_multi_company"
+                        />
+                        <div class="text-muted">
+                            When the RMA products are received, send an automatic information email.
+                        </div>
+                        <div
+                            class="row mt16"
+                            attrs="{'invisible': [('send_rma_receipt_confirmation', '=', False)]}"
+                        >
+                            <label
+                                for="rma_mail_receipt_confirmation_template_id"
+                                string="Email Template"
+                                class="col-lg-4 o_light_label"
+                            />
+                            <field
+                                name="rma_mail_receipt_confirmation_template_id"
+                                class="oe_inline"
+                                attrs="{'required': [('send_rma_receipt_confirmation', '=', True)]}"
+                                context="{'default_model': 'rma'}"
+                            />
+                        </div>
+                    </div>
+                </div>
+                <div
+                    class="col-12 col-lg-6 o_setting_box"
+                    title="Send automatic notification when the customer places an RMA"
+                >
+                    <div class="o_setting_left_pane">
+                        <field name="send_rma_draft_confirmation" />
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label
+                            for="send_rma_draft_confirmation"
+                            string="RMA draft notification Email"
+                        />
+                        <span
+                            class="fa fa-lg fa-building-o"
+                            title="Values set here are company-specific."
+                            groups="base.group_multi_company"
+                        />
+                        <div class="text-muted">
+                            When customers themselves place an RMA from the portal, send an automatic notification acknowleging it.
+                        </div>
+                        <div
+                            class="row mt16"
+                            attrs="{'invisible': [('send_rma_draft_confirmation', '=', False)]}"
+                        >
+                            <label
+                                for="rma_mail_draft_confirmation_template_id"
+                                string="Email Template"
+                                class="col-lg-4 o_light_label"
+                            />
+                            <field
+                                name="rma_mail_draft_confirmation_template_id"
+                                class="oe_inline"
+                                attrs="{'required': [('send_rma_draft_confirmation', '=', True)]}"
+                                context="{'default_model': 'rma'}"
+                            />
+                        </div>
+                    </div>
+                </div>
             </xpath>
         </field>
     </record>

From 8820d72af493882517ef75d4607e3704a25d6459 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Tue, 25 May 2021 12:01:54 +0200
Subject: [PATCH 028/108] [IMP] rma: public tags

Now we can decide which tags are visible for the customer. This way, we
can use them as pseudo-states

TT29594
---
 rma/models/rma_tag.py              |  4 ++++
 rma/views/rma_portal_templates.xml | 12 ++++++++++++
 rma/views/rma_tag_views.xml        |  2 ++
 3 files changed, 18 insertions(+)

diff --git a/rma/models/rma_tag.py b/rma/models/rma_tag.py
index 12960025d..5afab00d9 100644
--- a/rma/models/rma_tag.py
+++ b/rma/models/rma_tag.py
@@ -18,6 +18,10 @@ class RmaTag(models.Model):
         translate=True,
         copy=False,
     )
+    is_public = fields.Boolean(
+        string="Public Tag",
+        help="The tag is visible in the portal view",
+    )
     color = fields.Integer(string="Color Index")
     rma_ids = fields.Many2many(comodel_name="rma")
 
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index 002a5c805..a102f80df 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -115,6 +115,18 @@
                             </a>
                         </span>
                         <span class="float-right">
+                            <!-- Tags -->
+                            <t
+                                t-set="tags"
+                                t-value="rma.tag_ids.filtered('is_public')"
+                            />
+                            <!-- We don't have the color o_tag_color_# classes available in the frontend -->
+                            <t t-foreach="tags" t-as="tag">
+                                <span
+                                    class="badge badge-pill badge-info label-text-align"
+                                    t-esc="tag.name"
+                                />
+                            </t>
                             <t t-if="rma.state in ['refunded', 'returned', 'replaced']">
                                 <span
                                     class="small text-success orders_label_text_align"
diff --git a/rma/views/rma_tag_views.xml b/rma/views/rma_tag_views.xml
index 1d0e119cb..32182a3fe 100644
--- a/rma/views/rma_tag_views.xml
+++ b/rma/views/rma_tag_views.xml
@@ -40,6 +40,7 @@
                     </div>
                     <group>
                         <field name="name" />
+                        <field name="is_public" />
                     </group>
                 </sheet>
             </form>
@@ -52,6 +53,7 @@
         <field name="arch" type="xml">
             <tree string="RMA Tags">
                 <field name="name" />
+                <field name="is_public" />
                 <field name="active" />
             </tree>
         </field>

From d04e53ce03856557fc5a3ac565a1caa83d75d7da Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Wed, 14 Jul 2021 08:23:31 +0200
Subject: [PATCH 029/108] [IMP] rma: allow to archive operation types

TT30985
---
 rma/models/rma_operation.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rma/models/rma_operation.py b/rma/models/rma_operation.py
index 616dc55e0..cb4c08bb0 100644
--- a/rma/models/rma_operation.py
+++ b/rma/models/rma_operation.py
@@ -8,6 +8,7 @@ class RmaOperation(models.Model):
     _name = "rma.operation"
     _description = "RMA requested operation"
 
+    active = fields.Boolean(default=True)
     name = fields.Char(required=True, translate=True)
 
     _sql_constraints = [

From 38d2a01231f075f7b79bca313f82de404d2a30de Mon Sep 17 00:00:00 2001
From: Florian <florian.dacosta@akretion.com>
Date: Thu, 29 Jul 2021 10:41:17 +0200
Subject: [PATCH 030/108] Remove useless archive/unarchive button on form views

Co-authored-by: Ernesto Tejeda <ernesto.tejeda87@gmail.com>
---
 rma/static/description/index.html |  7 ++++---
 rma/views/rma_tag_views.xml       | 14 --------------
 rma/views/rma_team_views.xml      | 14 --------------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index f99fdcdeb..2fbf341ff 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/13.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-13-0/rma-13-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/13.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" 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/14.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-14-0/rma-14-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/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-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
@@ -477,7 +477,7 @@ <h1><a class="toc-backref" href="#id4">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:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2014.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">
@@ -497,6 +497,7 @@ <h2><a class="toc-backref" href="#id7">Contributors</a></h2>
 <li>David Vidal</li>
 </ul>
 </li>
+<li>Chafique Delli &lt;<a class="reference external" href="mailto:chafique.delli&#64;akretion.com">chafique.delli&#64;akretion.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -508,7 +509,7 @@ <h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
 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/13.0/rma">OCA/rma</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/14.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/views/rma_tag_views.xml b/rma/views/rma_tag_views.xml
index 32182a3fe..d7166b65c 100644
--- a/rma/views/rma_tag_views.xml
+++ b/rma/views/rma_tag_views.xml
@@ -24,20 +24,6 @@
         <field name="arch" type="xml">
             <form string="RMA Tag">
                 <sheet>
-                    <div class="oe_button_box" name="button_box">
-                        <button
-                            class="oe_stat_button"
-                            type="object"
-                            name="toggle_active"
-                            icon="fa-archive"
-                        >
-                            <field
-                                name="active"
-                                widget="boolean_button"
-                                options='{"terminology": "archive"}'
-                            />
-                        </button>
-                    </div>
                     <group>
                         <field name="name" />
                         <field name="is_public" />
diff --git a/rma/views/rma_team_views.xml b/rma/views/rma_team_views.xml
index 5ca01b821..100b5e660 100644
--- a/rma/views/rma_team_views.xml
+++ b/rma/views/rma_team_views.xml
@@ -19,20 +19,6 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
-                    <div class="oe_button_box" name="button_box">
-                        <button
-                            name="toggle_active"
-                            type="object"
-                            class="oe_stat_button"
-                            icon="fa-archive"
-                        >
-                            <field
-                                name="active"
-                                widget="boolean_button"
-                                options='{"terminology": "archive"}'
-                            />
-                        </button>
-                    </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only" string="RMA Team" />
                         <h1>

From 000e4af9b3df466af606b43d023d625c70beb59d Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Sun, 19 Sep 2021 17:22:19 +0200
Subject: [PATCH 031/108] [FIX] rma: Propagate cancel_backorder argument

Respect inheritance.
---
 rma/__manifest__.py      | 2 +-
 rma/models/stock_move.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 36e6185c3..265e42730 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.1.0.0",
+    "version": "14.0.1.0.1",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index fc22806b1..635db5d6c 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -66,7 +66,7 @@ def _action_done(self, cancel_backorder=False):
                     )
                     % (move.product_id.name, move.rma_receiver_ids.name)
                 )
-        res = super()._action_done()
+        res = super()._action_done(cancel_backorder=cancel_backorder)
         move_done = self.filtered(lambda r: r.state == "done").sudo()
         # Set RMAs as received. We sudo so we can grant the operation even
         # if the stock user has no RMA permissions.

From dc839392e9de94539ead2e88cd5c762eda83d4d9 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Thu, 23 Sep 2021 16:32:21 +0200
Subject: [PATCH 032/108] [FIX] rma: default team and responsible

Having a default responsible value as it was defined doesn't behave
right when the user it's a portal one or the petition comes from a
sudo().

Also, by design it was expected to have a default team if it wasn't
defined, but as it was implemented that wasn't possible.

TT32056
---
 rma/models/rma.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index b825c5763..d6d35a248 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -50,7 +50,6 @@ def _domain_location_id(self):
         comodel_name="res.users",
         string="Responsible",
         index=True,
-        default=lambda self: self.env.user,
         tracking=True,
         states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
     )
@@ -509,7 +508,7 @@ def create(self, vals_list):
                     ir_sequence = ir_sequence.with_company(vals["company_id"])
                 vals["name"] = ir_sequence.next_by_code("rma")
             # Assign a default team_id which will be the first in the sequence
-            if "team_id" not in vals:
+            if not vals.get("team_id"):
                 vals["team_id"] = self.env["rma.team"].search([], limit=1).id
         rmas = super().create(vals_list)
         # Send acknowledge when the RMA is created from the portal and the

From 87653b62f8353822bd2da09328b62a331729f188 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Mon, 6 Sep 2021 08:39:53 +0200
Subject: [PATCH 033/108] [FIX] rma: Use Form to avoid UoM change invalid check

Since odoo/odoo#75823, the wizard lines have the field uom_id related to
move.product_uom and readonly=False, so if you call directly to
wiz.onchage_picking_id a write in stock move is executed and the warning raises,
although we don't really do any UoM change.

We avoid it using the `Form` to perform the wizard update.
---
 rma/models/rma.py     | 11 +++++------
 rma/tests/test_rma.py | 12 ++++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index d6d35a248..129ff2109 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -895,15 +895,14 @@ def _create_receptions_from_picking(self):
                 location_id=self.location_id.id,
                 picking_id=self.picking_id.id,
             )
-        return_wizard = (
-            self.env["stock.return.picking"]
-            .with_context(
-                active_id=self.picking_id.id,
+        stock_return_picking_form = Form(
+            self.env["stock.return.picking"].with_context(
                 active_ids=self.picking_id.ids,
+                active_id=self.picking_id.id,
+                active_model="stock.picking",
             )
-            .create(create_vals)
         )
-        return_wizard._onchange_picking_id()
+        return_wizard = stock_return_picking_form.save()
         return_wizard.product_return_moves.filtered(
             lambda r: r.move_id != self.move_id
         ).unlink()
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index d38cd3e1f..ab0ca6dad 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -571,15 +571,15 @@ def test_mass_return_to_customer(self):
     def test_rma_from_picking_return(self):
         # Create a return from a delivery picking
         origin_delivery = self._create_delivery()
-        return_wizard = (
-            self.env["stock.return.picking"]
-            .with_context(
-                active_id=origin_delivery.id,
+        stock_return_picking_form = Form(
+            self.env["stock.return.picking"].with_context(
                 active_ids=origin_delivery.ids,
+                active_id=origin_delivery.id,
+                active_model="stock.picking",
             )
-            .create({"create_rma": True, "picking_id": origin_delivery.id})
         )
-        return_wizard._onchange_picking_id()
+        stock_return_picking_form.create_rma = True
+        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

From 11ea6bbceb05f01f0b3502d4a882c3460460b7fd Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Thu, 23 Sep 2021 11:56:25 +0200
Subject: [PATCH 034/108] [FIX] rma: return location

The new implementation wasn't getting the value set in the wizard.

TT32046
---
 rma/__manifest__.py |   2 +-
 rma/i18n/es.po      | 264 +++++++++++++++++++++++++++++++++++++++-----
 rma/i18n/nl.po      | 258 ++++++++++++++++++++++++++++++++++++++-----
 rma/i18n/pt_BR.po   | 264 +++++++++++++++++++++++++++++++++++++++-----
 rma/i18n/rma.pot    | 263 ++++++++++++++++++++++++++++++++++++++-----
 rma/i18n/ro.po      | 264 +++++++++++++++++++++++++++++++++++++++-----
 rma/i18n/zh_CN.po   | 258 ++++++++++++++++++++++++++++++++++++++-----
 rma/models/rma.py   |   8 +-
 8 files changed, 1422 insertions(+), 159 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 265e42730..9159646cb 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.1.0.1",
+    "version": "14.0.1.0.2",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 272cc72a0..378bc2773 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -18,7 +18,9 @@ msgstr ""
 "X-Generator: Poedit 2.0.6\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 '')}"
 
@@ -27,12 +29,31 @@ 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' })"
 
+#. 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
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copia)"
 
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "(object._get_report_base_filename())"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
@@ -75,6 +96,45 @@ msgstr ""
 "</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"
+"        "
+msgstr ""
+
+#. 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"
+"        "
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
@@ -303,6 +363,7 @@ msgid "Action Needed"
 msgstr "Acción Necesaria"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
@@ -324,6 +385,11 @@ msgstr ""
 msgid "Activity State"
 msgstr "Estado de la actividad"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
 msgid "Alias"
@@ -407,6 +473,12 @@ msgstr "Cancelar"
 msgid "Canceled"
 msgstr "Cancelado"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
@@ -466,6 +538,14 @@ msgstr "Confirmado"
 msgid "Contact"
 msgstr "Contacto"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
 msgid "Create RMAs"
@@ -496,6 +576,11 @@ msgstr "Creado por"
 msgid "Created on"
 msgstr "Creado el"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
@@ -570,12 +655,23 @@ msgid "Description"
 msgstr "Descripción"
 
 #. 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_operation__display_name
 #: 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 "Nombre mostrado"
 
@@ -612,12 +708,36 @@ msgstr ""
 msgid "Email Template confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email sent to the customer once the RMA is confirmed."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -647,18 +767,34 @@ msgstr "Seguidores (Canales)"
 msgid "Followers (Partners)"
 msgstr "Seguidores (Empresas)"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Group By"
 msgstr "Agrupar por"
 
 #. 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__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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"
 
@@ -697,6 +833,13 @@ msgstr "Si está marcado, hay nuevos mensajes que requieren su atención."
 msgid "If checked, some messages have a delivery error."
 msgstr "Si se encuentra marcado, algunos mensajes tienen error de envío."
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
 msgid ""
@@ -725,7 +868,7 @@ msgstr "Es un seguidor"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
-msgid "Journal Entries"
+msgid "Journal Entry"
 msgstr ""
 
 #. module: rma
@@ -734,12 +877,23 @@ 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_operation____last_update
 #: 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 modificación en"
 
@@ -817,6 +971,11 @@ msgstr "Error de Envío de Mensaje"
 msgid "Messages"
 msgstr "Mensajes"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
@@ -860,15 +1019,10 @@ msgid "None of the selected RMAs can perform a return."
 msgstr "Ninguno de los RMAs seleccionados puede realizar una devolución."
 
 #. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
-msgid "Not urgent"
-msgstr "No Urgente"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
@@ -1007,6 +1161,11 @@ msgstr "Producto"
 msgid "Product qty"
 msgstr "Cantidad"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -1102,15 +1261,11 @@ msgid "RMA Location"
 msgstr "Ubicación de RMA"
 
 #. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
-#. module: rma
-#: model:mail.message.subtype,name:rma.mt_rma_notification
-msgid "RMA Notificatoin"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1128,6 +1283,11 @@ msgstr "Órdenes de RMA"
 msgid "RMA Out Type"
 msgstr "Tipo de operación para entrega de RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Receipt Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
@@ -1183,6 +1343,11 @@ msgstr ""
 msgid "RMA count"
 msgstr "Cantidad de RMAs"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1261,8 +1426,8 @@ msgstr "Referencia al documento que generó este RMA."
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #, python-format
 msgid "Refund"
 msgstr "Factura rectificativa"
@@ -1299,8 +1464,8 @@ msgstr "Reparar"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Replace"
 msgstr "Reemplazar"
 
@@ -1427,11 +1592,33 @@ msgstr "Token de seguridad"
 msgid "Send RMA Confirmation"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA info to customer"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1637,6 +1824,11 @@ msgstr ""
 msgid "The quantity to return is greater than remaining quantity."
 msgstr "La cantidad a devolver es mayor que la cantidad restante del RMA."
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+msgid "The tag is visible in the portal view"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/account_move.py:0
 #, python-format
@@ -1730,7 +1922,7 @@ msgid "UoM"
 msgstr "UdM"
 
 #. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
 msgid "Urgent"
 msgstr "Urgente"
 
@@ -1749,11 +1941,6 @@ msgstr "Usuario: Solo mostrar documentos propios"
 msgid "Users"
 msgstr "Usuarios"
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__3
-msgid "Very Urgent"
-msgstr "Muy Urgente"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -1783,11 +1970,37 @@ msgstr "Mensajes del sitio web"
 msgid "Website communication history"
 msgstr "Historial de comunicaciones del sitio web"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. 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."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
@@ -1811,11 +2024,6 @@ msgstr ""
 "Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los "
 "RMAs serán creados"
 
-#. module: rma
-#: model:ir.actions.report,print_report_name:rma.report_rma_action
-msgid "object._get_report_base_filename()"
-msgstr ""
-
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
 msgid ""
@@ -1837,6 +2045,12 @@ msgstr ""
 "El usuario tendrá acceso a la configuración de RMA y a los informes "
 "estadísticos."
 
+#~ msgid "Not urgent"
+#~ msgstr "No Urgente"
+
+#~ msgid "Very Urgent"
+#~ msgstr "Muy Urgente"
+
 #~ msgid "If checked new messages require your attention."
 #~ msgstr "Si está marcado, hay nuevos mensajes que requieren su atención."
 
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index 298e1c985..b664eab6d 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -15,7 +15,9 @@ 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 ""
 
@@ -24,12 +26,31 @@ msgstr ""
 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
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "(object._get_report_base_filename())"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
@@ -55,6 +76,45 @@ msgid ""
 "        "
 msgstr ""
 
+#. 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"
+"        "
+msgstr ""
+
+#. 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"
+"        "
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
@@ -265,6 +325,7 @@ msgid "Action Needed"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
@@ -286,6 +347,11 @@ msgstr ""
 msgid "Activity State"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
 msgid "Alias"
@@ -369,6 +435,12 @@ msgstr ""
 msgid "Canceled"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
@@ -428,6 +500,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
 msgid "Create RMAs"
@@ -458,6 +538,11 @@ msgstr ""
 msgid "Created on"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
@@ -532,12 +617,23 @@ 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_operation__display_name
 #: 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 ""
 
@@ -574,12 +670,36 @@ msgstr ""
 msgid "Email Template confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email sent to the customer once the RMA is confirmed."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -609,18 +729,34 @@ msgstr ""
 msgid "Followers (Partners)"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Group By"
 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__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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 ""
 
@@ -657,6 +793,13 @@ msgstr ""
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
 msgid ""
@@ -683,7 +826,7 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
-msgid "Journal Entries"
+msgid "Journal Entry"
 msgstr ""
 
 #. module: rma
@@ -692,12 +835,23 @@ 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_operation____last_update
 #: 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 ""
 
@@ -775,6 +929,11 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
@@ -817,14 +976,9 @@ msgstr ""
 msgid "None of the selected RMAs can perform a return."
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
-msgid "Normal"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
-msgid "Not urgent"
+msgid "Normal"
 msgstr ""
 
 #. module: rma
@@ -954,6 +1108,11 @@ msgstr ""
 msgid "Product qty"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -1047,15 +1206,11 @@ msgid "RMA Location"
 msgstr ""
 
 #. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
-#. module: rma
-#: model:mail.message.subtype,name:rma.mt_rma_notification
-msgid "RMA Notificatoin"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1073,6 +1228,11 @@ msgstr ""
 msgid "RMA Out Type"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Receipt Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
@@ -1128,6 +1288,11 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1205,8 +1370,8 @@ msgstr ""
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #, python-format
 msgid "Refund"
 msgstr ""
@@ -1243,8 +1408,8 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Replace"
 msgstr ""
 
@@ -1361,11 +1526,33 @@ msgstr ""
 msgid "Send RMA Confirmation"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA info to customer"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1553,6 +1740,11 @@ msgstr ""
 msgid "The quantity to return is greater than remaining quantity."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+msgid "The tag is visible in the portal view"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/account_move.py:0
 #, python-format
@@ -1644,7 +1836,7 @@ msgid "UoM"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
 msgid "Urgent"
 msgstr ""
 
@@ -1663,11 +1855,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__3
-msgid "Very Urgent"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -1697,11 +1884,37 @@ msgstr ""
 msgid "Website communication history"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. 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."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
@@ -1723,11 +1936,6 @@ msgid ""
 "be created"
 msgstr ""
 
-#. module: rma
-#: model:ir.actions.report,print_report_name:rma.report_rma_action
-msgid "object._get_report_base_filename()"
-msgstr ""
-
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
 msgid ""
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 68bff9b76..9cbc2f72b 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -17,7 +17,9 @@ 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 '')}"
 
@@ -26,12 +28,31 @@ 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' })"
 
+#. 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
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (Cópia)"
 
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "(object._get_report_base_filename())"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
@@ -57,6 +78,45 @@ msgid ""
 "        "
 msgstr ""
 
+#. 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"
+"        "
+msgstr ""
+
+#. 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"
+"        "
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
@@ -283,6 +343,7 @@ msgid "Action Needed"
 msgstr "Ação Necessária"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
@@ -304,6 +365,11 @@ msgstr ""
 msgid "Activity State"
 msgstr "Situação da Atividade"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
 msgid "Alias"
@@ -387,6 +453,12 @@ msgstr "Cancelar"
 msgid "Canceled"
 msgstr "Cancelado(a)"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
@@ -446,6 +518,14 @@ msgstr "Confirmado(a)"
 msgid "Contact"
 msgstr "Contato"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
 msgid "Create RMAs"
@@ -476,6 +556,11 @@ msgstr "Criado Por"
 msgid "Created on"
 msgstr "Criado em"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
@@ -550,12 +635,23 @@ 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_operation__display_name
 #: 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"
 
@@ -592,12 +688,36 @@ msgstr ""
 msgid "Email Template confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email sent to the customer once the RMA is confirmed."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -627,18 +747,34 @@ msgstr "Seguidores (Canais)"
 msgid "Followers (Partners)"
 msgstr "Seguidores (Parceiros)"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Group By"
 msgstr "Agrupado Por"
 
 #. 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__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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"
 
@@ -677,6 +813,13 @@ msgstr "Se marcada, novas mensagens requerem sua atenção."
 msgid "If checked, some messages have a delivery error."
 msgstr "Se marcada, algumas mensagens apresentam um erro de entrega."
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
 msgid ""
@@ -705,7 +848,7 @@ msgstr "É Seguidor"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
-msgid "Journal Entries"
+msgid "Journal Entry"
 msgstr ""
 
 #. module: rma
@@ -714,12 +857,23 @@ 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_operation____last_update
 #: 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"
 
@@ -797,6 +951,11 @@ msgstr "Erro de Entrega de Mensagem"
 msgid "Messages"
 msgstr "Mensagens"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
@@ -840,15 +999,10 @@ msgid "None of the selected RMAs can perform a return."
 msgstr "Nenhum dos RMAs selecionados pode executar uma devolução."
 
 #. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
-msgid "Not urgent"
-msgstr "Não é urgente"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
@@ -987,6 +1141,11 @@ msgstr "Produto"
 msgid "Product qty"
 msgstr "Quantidade de Produto"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -1082,15 +1241,11 @@ msgid "RMA Location"
 msgstr "Localização RMA"
 
 #. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
-#. module: rma
-#: model:mail.message.subtype,name:rma.mt_rma_notification
-msgid "RMA Notificatoin"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1108,6 +1263,11 @@ msgstr "Pedidos RMA"
 msgid "RMA Out Type"
 msgstr "Tipo Saída RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Receipt Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
@@ -1163,6 +1323,11 @@ msgstr ""
 msgid "RMA count"
 msgstr "Contagem de RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1240,8 +1405,8 @@ msgstr "Referência do documento que gerou este RMA."
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #, python-format
 msgid "Refund"
 msgstr "Restituição"
@@ -1278,8 +1443,8 @@ msgstr "Reparo"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Replace"
 msgstr "Substituir"
 
@@ -1405,11 +1570,33 @@ msgstr "Token de Segurança"
 msgid "Send RMA Confirmation"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA info to customer"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1614,6 +1801,11 @@ msgstr ""
 msgid "The quantity to return is greater than remaining quantity."
 msgstr "A quantidade a retornar é maior que a quantidade restante."
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+msgid "The tag is visible in the portal view"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/account_move.py:0
 #, python-format
@@ -1707,7 +1899,7 @@ msgid "UoM"
 msgstr "Unidade de Medida"
 
 #. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
 msgid "Urgent"
 msgstr "Urgente"
 
@@ -1726,11 +1918,6 @@ msgstr "Usuário: Somente Seus Documentos"
 msgid "Users"
 msgstr "Usuários"
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__3
-msgid "Very Urgent"
-msgstr "Muito Urgente"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -1760,11 +1947,37 @@ msgstr "Mensagens do Site"
 msgid "Website communication history"
 msgstr "Histórico de Comunicação Através do Site"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. 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."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
@@ -1788,11 +2001,6 @@ msgstr ""
 "Você deve especificar o 'Cliente' na 'Seleção de estoque' a partir do qual "
 "as RMAs serão criadas"
 
-#. module: rma
-#: model:ir.actions.report,print_report_name:rma.report_rma_action
-msgid "object._get_report_base_filename()"
-msgstr ""
-
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
 msgid ""
@@ -1813,6 +2021,12 @@ msgstr ""
 "o usuário terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
 
+#~ msgid "Not urgent"
+#~ msgstr "Não é urgente"
+
+#~ msgid "Very Urgent"
+#~ msgstr "Muito Urgente"
+
 #~ msgid ""
 #~ "<div style=\"margin: 0px; padding: 0px;\">\n"
 #~ "<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index f91fa7d9c..c95c10f70 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 13.0\n"
+"Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -14,7 +14,9 @@ msgstr ""
 "Plural-Forms: \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 ""
 
@@ -23,12 +25,31 @@ msgstr ""
 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
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "(object._get_report_base_filename())"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
@@ -53,6 +74,45 @@ msgid ""
 "        "
 msgstr ""
 
+#. 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"
+"        "
+msgstr ""
+
+#. 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"
+"        "
+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\"/>"
@@ -261,6 +321,7 @@ msgid "Action Needed"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
@@ -282,6 +343,11 @@ msgstr ""
 msgid "Activity State"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
 msgid "Alias"
@@ -365,6 +431,12 @@ msgstr ""
 msgid "Canceled"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
@@ -424,6 +496,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
 msgid "Create RMAs"
@@ -454,6 +534,11 @@ msgstr ""
 msgid "Created on"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
@@ -528,12 +613,23 @@ 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_operation__display_name
 #: 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 ""
 
@@ -570,12 +666,36 @@ msgstr ""
 msgid "Email Template confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email sent to the customer once the RMA is confirmed."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -605,18 +725,34 @@ msgstr ""
 msgid "Followers (Partners)"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Group By"
 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__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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 ""
 
@@ -653,6 +789,13 @@ msgstr ""
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
 msgid ""
@@ -679,7 +822,7 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
-msgid "Journal Entries"
+msgid "Journal Entry"
 msgstr ""
 
 #. module: rma
@@ -688,12 +831,23 @@ 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_operation____last_update
 #: 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 ""
 
@@ -771,6 +925,11 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
@@ -782,7 +941,7 @@ 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 code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
 msgstr ""
@@ -814,14 +973,9 @@ msgstr ""
 msgid "None of the selected RMAs can perform a return."
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
-msgid "Normal"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
-msgid "Not urgent"
+msgid "Normal"
 msgstr ""
 
 #. module: rma
@@ -950,6 +1104,11 @@ msgstr ""
 msgid "Product qty"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -1043,15 +1202,11 @@ msgid "RMA Location"
 msgstr ""
 
 #. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
-#. module: rma
-#: model:mail.message.subtype,name:rma.mt_rma_notification
-msgid "RMA Notificatoin"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1069,6 +1224,11 @@ msgstr ""
 msgid "RMA Out Type"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Receipt Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
@@ -1124,6 +1284,11 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1201,8 +1366,8 @@ msgstr ""
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #, python-format
 msgid "Refund"
 msgstr ""
@@ -1239,8 +1404,8 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Replace"
 msgstr ""
 
@@ -1357,11 +1522,33 @@ msgstr ""
 msgid "Send RMA Confirmation"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA info to customer"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1549,6 +1736,11 @@ msgstr ""
 msgid "The quantity to return is greater than remaining quantity."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+msgid "The tag is visible in the portal view"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/account_move.py:0
 #, python-format
@@ -1640,7 +1832,7 @@ msgid "UoM"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
 msgid "Urgent"
 msgstr ""
 
@@ -1659,11 +1851,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__3
-msgid "Very Urgent"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -1693,11 +1880,38 @@ msgstr ""
 msgid "Website communication history"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. 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."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
@@ -1719,11 +1933,6 @@ msgid ""
 "be created"
 msgstr ""
 
-#. module: rma
-#: model:ir.actions.report,print_report_name:rma.report_rma_action
-msgid "object._get_report_base_filename()"
-msgstr ""
-
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
 msgid ""
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index 4530da6bd..4103c6ad5 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -18,7 +18,9 @@ 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 '')}"
 
@@ -27,12 +29,31 @@ 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' })"
 
+#. 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
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (copie)"
 
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "(object._get_report_base_filename())"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
@@ -72,6 +93,45 @@ msgstr ""
 "            </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"
+"        "
+msgstr ""
+
+#. 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"
+"        "
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
@@ -302,6 +362,7 @@ msgid "Action Needed"
 msgstr "Acțiune necesară"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
@@ -323,6 +384,11 @@ msgstr ""
 msgid "Activity State"
 msgstr "Status activitate"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
 msgid "Alias"
@@ -406,6 +472,12 @@ msgstr ""
 msgid "Canceled"
 msgstr "Anulat"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
@@ -465,6 +537,14 @@ msgstr "Confirmat"
 msgid "Contact"
 msgstr "Contact"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
 msgid "Create RMAs"
@@ -495,6 +575,11 @@ msgstr "Creat de"
 msgid "Created on"
 msgstr "Creat în"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
@@ -569,12 +654,23 @@ 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_operation__display_name
 #: 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"
 
@@ -611,12 +707,36 @@ msgstr ""
 msgid "Email Template confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email sent to the customer once the RMA is confirmed."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -646,18 +766,34 @@ msgstr "Urmăritori (Canale)"
 msgid "Followers (Partners)"
 msgstr "Urmăritori (Parteneri)"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Group By"
 msgstr "Grupează după"
 
 #. 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__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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"
 
@@ -694,6 +830,13 @@ msgstr "Dacă este bifat, mesajele noi necesită atenție."
 msgid "If checked, some messages have a delivery error."
 msgstr "Dacă este bifat, unele mesaje au o eroare de livrare."
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
 msgid ""
@@ -722,7 +865,7 @@ msgstr "Este Urmăritor"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
-msgid "Journal Entries"
+msgid "Journal Entry"
 msgstr ""
 
 #. module: rma
@@ -731,12 +874,23 @@ 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_operation____last_update
 #: 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"
 
@@ -814,6 +968,11 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
@@ -859,15 +1018,10 @@ msgstr ""
 "La niciuna dintre cererile de retur selectate nu poate efectua un retur."
 
 #. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
 msgid "Normal"
 msgstr "Normal"
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
-msgid "Not urgent"
-msgstr "Nu e urgent"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
@@ -999,6 +1153,11 @@ msgstr "Produs"
 msgid "Product qty"
 msgstr "Cantitate produs"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -1094,15 +1253,11 @@ msgid "RMA Location"
 msgstr "Locație"
 
 #. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
-#. module: rma
-#: model:mail.message.subtype,name:rma.mt_rma_notification
-msgid "RMA Notificatoin"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1120,6 +1275,11 @@ msgstr "Comenzi retur"
 msgid "RMA Out Type"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Receipt Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
@@ -1175,6 +1335,11 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1252,8 +1417,8 @@ msgstr ""
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #, python-format
 msgid "Refund"
 msgstr "Ramburs"
@@ -1290,8 +1455,8 @@ msgstr "Reparație"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Replace"
 msgstr "Înlocuire"
 
@@ -1411,11 +1576,33 @@ msgstr ""
 msgid "Send RMA Confirmation"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA info to customer"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1608,6 +1795,11 @@ msgstr ""
 msgid "The quantity to return is greater than remaining quantity."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+msgid "The tag is visible in the portal view"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/account_move.py:0
 #, python-format
@@ -1700,7 +1892,7 @@ msgid "UoM"
 msgstr "UM"
 
 #. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
 msgid "Urgent"
 msgstr ""
 
@@ -1719,11 +1911,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__3
-msgid "Very Urgent"
-msgstr "Forate urgent"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -1753,11 +1940,37 @@ msgstr ""
 msgid "Website communication history"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. 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."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
@@ -1781,11 +1994,6 @@ msgstr ""
 "Trebuie să specificați „Clientul” în „Transferurile” din care vor fi create "
 "RMA-uri"
 
-#. module: rma
-#: model:ir.actions.report,print_report_name:rma.report_rma_action
-msgid "object._get_report_base_filename()"
-msgstr ""
-
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
 msgid ""
@@ -1803,3 +2011,9 @@ msgid ""
 "the user will have an access to the RMA configuration as well as statistic "
 "reports."
 msgstr ""
+
+#~ msgid "Not urgent"
+#~ msgstr "Nu e urgent"
+
+#~ msgid "Very Urgent"
+#~ msgstr "Forate urgent"
diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
index d9c95a07d..7b25f28b3 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -17,7 +17,9 @@ 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 ""
 
@@ -26,12 +28,31 @@ msgstr ""
 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
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
 msgstr ""
 
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "(object._get_report_base_filename())"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
@@ -57,6 +78,45 @@ msgid ""
 "        "
 msgstr ""
 
+#. 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"
+"        "
+msgstr ""
+
+#. 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"
+"        "
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
@@ -267,6 +327,7 @@ msgid "Action Needed"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
@@ -288,6 +349,11 @@ msgstr ""
 msgid "Activity State"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
 msgid "Alias"
@@ -371,6 +437,12 @@ msgstr ""
 msgid "Canceled"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
@@ -430,6 +502,14 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
 msgid "Create RMAs"
@@ -460,6 +540,11 @@ msgstr ""
 msgid "Created on"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
@@ -534,12 +619,23 @@ 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_operation__display_name
 #: 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 ""
 
@@ -576,12 +672,36 @@ msgstr ""
 msgid "Email Template confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email sent to the customer once the RMA is confirmed."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
@@ -611,18 +731,34 @@ msgstr ""
 msgid "Followers (Partners)"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Group By"
 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__id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: 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 ""
 
@@ -659,6 +795,13 @@ msgstr ""
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
 msgid ""
@@ -685,7 +828,7 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
-msgid "Journal Entries"
+msgid "Journal Entry"
 msgstr ""
 
 #. module: rma
@@ -694,12 +837,23 @@ 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_operation____last_update
 #: 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 ""
 
@@ -777,6 +931,11 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/controllers/main.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__name
@@ -819,14 +978,9 @@ msgstr ""
 msgid "None of the selected RMAs can perform a return."
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
-msgid "Normal"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
-msgid "Not urgent"
+msgid "Normal"
 msgstr ""
 
 #. module: rma
@@ -956,6 +1110,11 @@ msgstr ""
 msgid "Product qty"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -1049,15 +1208,11 @@ msgid "RMA Location"
 msgstr ""
 
 #. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
 msgid "RMA Notification"
 msgstr ""
 
-#. module: rma
-#: model:mail.message.subtype,name:rma.mt_rma_notification
-msgid "RMA Notificatoin"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
@@ -1075,6 +1230,11 @@ msgstr ""
 msgid "RMA Out Type"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Receipt Confirmation Email"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
@@ -1130,6 +1290,11 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1207,8 +1372,8 @@ msgstr ""
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__refund_id
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_refund
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #, python-format
 msgid "Refund"
 msgstr "退货"
@@ -1245,8 +1410,8 @@ msgstr "维修"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
-#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Replace"
 msgstr "换货"
 
@@ -1363,11 +1528,33 @@ msgstr ""
 msgid "Send RMA Confirmation"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA info to customer"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
@@ -1555,6 +1742,11 @@ msgstr ""
 msgid "The quantity to return is greater than remaining quantity."
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+msgid "The tag is visible in the portal view"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/account_move.py:0
 #, python-format
@@ -1646,7 +1838,7 @@ msgid "UoM"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__2
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
 msgid "Urgent"
 msgstr ""
 
@@ -1665,11 +1857,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields.selection,name:rma.selection__rma__priority__3
-msgid "Very Urgent"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -1699,11 +1886,37 @@ msgstr ""
 msgid "Website communication history"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. 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."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
@@ -1725,11 +1938,6 @@ msgid ""
 "be created"
 msgstr ""
 
-#. module: rma
-#: model:ir.actions.report,print_report_name:rma.report_rma_action
-msgid "object._get_report_base_filename()"
-msgstr ""
-
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
 msgid ""
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 129ff2109..8277c7b78 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -889,12 +889,6 @@ def _ensure_qty_to_extract(self, qty, uom):
     # Reception business methods
     def _create_receptions_from_picking(self):
         self.ensure_one()
-        create_vals = {}
-        if self.location_id:
-            create_vals.update(
-                location_id=self.location_id.id,
-                picking_id=self.picking_id.id,
-            )
         stock_return_picking_form = Form(
             self.env["stock.return.picking"].with_context(
                 active_ids=self.picking_id.ids,
@@ -902,6 +896,8 @@ def _create_receptions_from_picking(self):
                 active_model="stock.picking",
             )
         )
+        if self.location_id:
+            stock_return_picking_form.location_id = self.location_id
         return_wizard = stock_return_picking_form.save()
         return_wizard.product_return_moves.filtered(
             lambda r: r.move_id != self.move_id

From 55ef86205f0ae3a5e9986900d14bd6ed1e9bfdff Mon Sep 17 00:00:00 2001
From: Pedro Castro Silva <pedrocs@exo.pt>
Date: Thu, 28 Oct 2021 00:09:47 +0000
Subject: [PATCH 035/108] Added translation using Weblate (Portuguese)

Translated using Weblate (Portuguese)

Currently translated at 83.8% (269 of 321 strings)

Translation: rma-14.0/rma-14.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-14-0/rma-14-0-rma/pt/
---
 rma/i18n/pt.po | 2025 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2025 insertions(+)
 create mode 100644 rma/i18n/pt.po

diff --git a/rma/i18n/pt.po b/rma/i18n/pt.po
new file mode 100644
index 000000000..e154ba278
--- /dev/null
+++ b/rma/i18n/pt.po
@@ -0,0 +1,2025 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2021-10-28 02:35+0000\n"
+"Last-Translator: Pedro Castro Silva <pedrocs@exo.pt>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"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
+#: code:addons/rma/models/rma_team.py:0
+#, python-format
+msgid "%s (copy)"
+msgstr "%s (cópia)"
+
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "(object._get_report_base_filename())"
+msgstr ""
+
+#. module: rma
+#: 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 ""
+
+#. 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"
+"            </div>\n"
+"        "
+msgstr ""
+
+#. 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"
+"        "
+msgstr ""
+
+#. 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"
+"        "
+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\"/>"
+msgstr ""
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
+"\"Download\"/>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
+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 ""
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Descarregar"
+"\" title=\"Descarregar\"/>"
+
+#. 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 ""
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Descarregar\" title="
+"\"Descarregar\"/>"
+
+#. 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>"
+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>"
+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>"
+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>"
+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
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Estes valores são específicos "
+"por empresa.\" groups=\"base.group_multi_company\"/>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr "<strong class=\"d-block mb-1\">Entrega</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr "<strong class=\"d-block mb-1\">Receção</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr "<strong class=\"d-block mb-1\">Reembolso</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr "<strong>Cliente:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr "<strong>Data:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr "<strong>Prazo Final:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr "<strong>Prazo Final</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr "<strong>Quantidade Enviada:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr "<strong>Quantidade Enviada</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Invoicing address:</strong>"
+msgstr "<strong>Endereço de Cobrança:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr "<strong>Movimentação:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr "<strong> Origem da Entrega: </strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin delivery</strong>"
+msgstr "<strong>Origem da Entrega</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr "<strong>Origem:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr "<strong>Origem</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr "<strong>Produto:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr "<strong>Produto</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr "<strong>Quantidade:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr "<strong>Quantidade</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr "<strong>Data da RMA</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr "<strong>Nota da RMA:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr "<strong>Responsável:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr "<strong>Situação:</strong>"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+"Um dicionário Python que será avaliado para fornecer valores padrão ao criar "
+"novos registros para esse alias."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Accept Emails From"
+msgstr "Aceitar e-mails de"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr "Aviso de acesso"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr "Ação Necessária"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Active"
+msgstr "Ativo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr "Atividades"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr "Estado da Atividade"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr "Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr "Segurança do Contato de Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr "Nome do Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr "Domínio do Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr "Modelo do Alias"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Archived"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr "Tem a certeza de que quer cancelar esta RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr "Número de Anexos"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr "Avatar"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr "Pode ser Trancado"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr "Pode Ser Reembolsado"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr "Pode Ser Substituído"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr "Pode Ser Devolvido"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr "Pode Ser Dividido"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
+msgid "Canceled"
+msgstr "Cancelado(a)"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr "Clique para adicionar uma nova RMA."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr "Entidade Comercial"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr "Comunicação"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr "Empresa"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr "Parâmetros de Configuração"
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr "Configuração"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Confirmed"
+msgstr "Confirmado(a)"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr "Contato"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr "Criar RMAs"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr "Criado Por"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr "Criado em"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr "URL do Portal do Cliente"
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr "Data"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr "Data:"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr "Prazo Final"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr "Valores Padrão"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr "Entrega"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered qty"
+msgstr "Quantidade Enviada"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered qty done"
+msgstr "Quantidade Envidada Concluída"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr "Envio"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr "Contagem de Envios"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr "Reserva de Envio"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+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_operation__display_name
+#: 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"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr "Rascunho da RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr "Email"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr "Alias do Email"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr "Modelo de E-mail"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr "Modelo de E-mail Confirmação de RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr "E-mail enviado ao cliente assim que a RMA é confirmada."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/rma_split.py:0
+#, python-format
+msgid "Extracted RMA"
+msgstr "RMA Extraído"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr "Extraído de"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+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
+msgid "Followers (Partners)"
+msgstr "Seguidores (Parceiros)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+msgstr "Agrupado Por"
+
+#. 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__id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_operation__id
+#: 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"
+
+#. 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)"
+msgstr ""
+"ID do registo ascendente que contém o alias (exemplo: projeto que contém o "
+"alias de criação da tarefa)"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+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."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
+msgstr ""
+"Se o campo ativo estiver definido como falso, permitirá ocultar a Equipe de "
+"RMA sem a remover."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Incoming e-mail"
+msgstr "E-mail recebido"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr "Endereço de Fatura"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr "É Seguidor"
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entry"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move_line
+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_operation____last_update
+#: 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"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr "Última Atualiz. por"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr "Última Atualiz. em"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr "RMAs atrasadas"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr "Localização"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr "Bloquear"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
+msgid "Locked"
+msgstr "Bloqueada"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr "Anexo Principal"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr "Gerir Autorizações de Devolução de Mercadoria (RMAs)."
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr "Gestor"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr "Erro de Entrega de Mensagem"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+msgid "Name"
+msgstr "Nome"
+
+#. 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
+#, python-format
+msgid "New"
+msgstr "Novo(a)"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "Prazo Final da Próxima Atividade"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr "Resumo da Próxima Atividade"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+msgid "Next Activity Type"
+msgstr "Tipo da Próxima Atividade"
+
+#. module: rma
+#: 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
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a return."
+msgstr "Nenhuma das RMAs selecionadas pode executar uma devolução."
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr "Número de Ações"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of errors"
+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"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+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 ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+"Identificador opcional de um tópico (registo) ao qual todas as mensagens "
+"recebidas serão anexadas, mesmo que elas não sejam respostas a este. Se "
+"definido, isto irá desativar completamente a criação de novos registos."
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr "Pedidos"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr "Origem da Entrega"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr "Origem da Movimentação"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr "Outra Informação"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr "Proprietário"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr "Modelo Ascendente"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+msgstr "Id da Thread do Registo Ascendente"
+
+#. 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) and task (model))"
+msgstr ""
+"Modelo pai que contém o alias. O modelo que contém a referência de alias não "
+"é necessariamente o modelo fornecido pelo alias_model_id (exemplo: projeto "
+"(pai_modelo) e tarefa (modelo))"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+msgstr ""
+"Política para publicar uma mensagem no documento usando o mail gateway.\n"
+"- todos: todos podem postar\n"
+"- parceiros: apenas parceiros autenticados\n"
+"- seguidores: apenas seguidores do documento relacionado ou membros dos "
+"seguintes canais\n"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr "URL de Acesso ao Portal"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr "Pré-visualização"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr "Prioridade"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr "Grupo de Aprovisionamento"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr "Produto"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr "Quantidade de Produto"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Quantity"
+msgstr "Quantidade"
+
+#. module: rma
+#: 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
+msgid "Quantity must be greater than 0."
+msgstr "A quantidade deve ser maior do que 0."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract"
+msgstr "Quantidade a extrair"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, 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)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr "Quantidade a extrair para uma nova RMA."
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr "RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr "RMA #"
+
+#. module: rma
+#: code:addons/rma/models/res_company.py:0
+#, python-format
+msgid "RMA Code"
+msgstr "Código RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr "E-mail de Confirmação da RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr "Data da RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr "Prazo da RMA"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr "Pedidos de Entrega RMA"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+msgid "RMA Delivery Wizard"
+msgstr "Assistente de Entrega RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr "Tipo Entrada RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr "Localização RMA"
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+msgid "RMA Notification"
+msgstr "Notificação de RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr "Pedido RMA -"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr "Pedidos RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr "Tipo Saída RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Receipt Confirmation Email"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Receipts"
+msgstr "Receções RMA"
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr "Relatório RMA"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr "Assistente de Divisão de RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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 ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr "Equipa RMA"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr "Equipa de RMA da qual o utilizador é membro."
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr "Notificações automáticas a clientes de RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr "Contagem de RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr "RMA em estado de rascunho"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr "Destinatários RMA"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr "Os produtos relacionados ao RMA podem ser armazenados neste armazém."
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr "Operação solicitada pelo RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr "Devolução RMA"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr "Equipa RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr "RMAs"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr "RMAs cujo prazo já passou"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr "RMAs não totalmente processados"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr "Recebimento"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Received"
+msgstr "Recebido"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr "Recebimento de Movimentação"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr "Id da Thread do Registo"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+msgid "Reference of the document that generated this RMA."
+msgstr "Referência do documento que gerou este RMA."
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#, python-format
+msgid "Refund"
+msgstr "Reembolso"
+
+#. 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"
+msgstr "Reembolsado"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr "Quantidade Entregue Restante"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr "Qtd. restante entregue a fazer"
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr "Reparar"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
+#: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Replace"
+msgstr "Substituir"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr "Substituir Produto"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
+msgid "Replaced"
+msgstr "Substituído"
+
+#. module: rma
+#: 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."
+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
+#: 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."
+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
+msgid "Reporting"
+msgstr "Comunicando"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+msgid "Requested operation"
+msgstr "Operação Solicitada"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Required field(s):%s"
+msgstr "Campo(s) Solicitado(s):%s"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr "Responsável"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+msgid "Responsible User"
+msgstr "Utilizador Responsável"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking
+msgid "Return Picking"
+msgstr "Operação de Devolução"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Return to customer"
+msgstr "Devolver ao cliente"
+
+#. module: rma
+#: 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."
+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
+msgid "Returned"
+msgstr "Devolvido"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
+msgid "Scheduled Date"
+msgstr "Data Programada"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr "Token de Segurança"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr "Enviar Confirmação da RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr "Enviar informações automáticas de RMA ao cliente"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr "Enviado por Email"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr "Enviado(a) por Correio"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr "Enviado(a)"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA in"
+msgstr "Sequência de Entrada RMA"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA out"
+msgstr "Sequência de Saída RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr "Definir como Rascunho"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr "Compartilhar"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr "Endereço de Envio"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr "Endereço de envio para a RMA atual."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr "Documento Fonte"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr "Dividir"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+msgid "Split RMA"
+msgstr "Dividir RMA"
+
+#. module: rma
+#: 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."
+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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "State"
+msgstr "Situação"
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:0
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#, python-format
+msgid "Status"
+msgstr "Estado"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+"Estado com base nas atividades\n"
+"Em atraso: A data limite foi ultrapassada\n"
+"Hoje: A data da atividade é a atual\n"
+"Planeado: Atividades futuras."
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr "Movimento do Stock"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr "Regra de Stock"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr "Líder da Equipa"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr "Membros da Equipa"
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
+msgid "That operation name already exists !"
+msgstr "Esse nome de operação já existe!"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+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)"
+msgstr ""
+"Modelo (tipo de documento Odoo) ao qual esse alias corresponde. Qualquer e-"
+"mail recebido que não responda a um registo existente causará a criação de "
+"um novo registo desse modelo (por exemplo, uma tarefa do projeto)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
+msgstr ""
+"O nome do alias do email, por exemplo 'jobs' se você deseja receber e-mails "
+"de <jobs@example.odoo.com>"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+"O proprietário dos registos criados ao receber emails nesse alias. Se esse "
+"campo não estiver definido, o sistema tentará encontrar o proprietário certo "
+"com base no endereço do remetente (De) ou usará a conta de Administrador se "
+"nenhum utilizador do sistema for encontrado para esse endereço."
+
+#. module: rma
+#: 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)."
+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
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "The quantity to return is greater than remaining quantity."
+msgstr "A quantidade a retornar é maior que a quantidade restante."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+msgid "The tag is visible in the portal view"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+"Há pelo menos uma linha de fatura cuja quantidade é menor que a quantidade "
+"especificada na sua RMA vinculada."
+
+#. module: rma
+#: 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
+#: 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
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a return."
+msgstr "Este RMA não pode executar uma devolução."
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr "Para Reembolso"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+msgid "Transfer"
+msgstr "Transferir"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr "Tipo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr "Tipo de Operação"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr "RMAs não atribuídos"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr "Unidade de Medida"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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"
+msgstr "RMAs não resolvidos"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr "Unidade de Medida"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+msgid "Urgent"
+msgstr "Urgente"
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_all
+msgid "User: All Documents"
+msgstr "Utilizador: Todos os Documentos"
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+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"
+msgstr "À espera de substituição"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
+msgid "Waiting for return"
+msgstr "À espera de devolução"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr "Armazém"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr "Mensagens do Website"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr "Histórico de Comunicação do Website"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr "Quando a RMA é confirmada, enviar um e-mail automático de informação."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+msgstr ""
+"Quando a entrega é confirmada, enviar um e-mail de confirmação ao cliente."
+
+#. module: rma
+#: 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
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
+msgstr ""
+"Você deve especificar o 'Cliente' na 'Operação de Stock' a partir do qual as "
+"RMAs serão criadas"
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+"o utilizador terá acesso a todos os registos de toda a gente na aplicação "
+"RMA."
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr "o utilizador terá acesso aos seus próprios dados na aplicação RMA."
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+msgid ""
+"the user will have an access to the RMA configuration as well as statistic "
+"reports."
+msgstr ""
+"o utilizador terá acesso à configuração RMA, bem como aos relatórios "
+"estatísticos."

From dd093984552521b95379b2cb43ac567d32d45424 Mon Sep 17 00:00:00 2001
From: Francesco Foresti <francesco.foresti@ooops404.com>
Date: Tue, 23 Nov 2021 16:53:37 +0000
Subject: [PATCH 036/108] Added translation using Weblate (Italian)

---
 rma/i18n/it.po | 1953 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1953 insertions(+)
 create mode 100644 rma/i18n/it.po

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
new file mode 100644
index 000000000..aed17df62
--- /dev/null
+++ b/rma/i18n/it.po
@@ -0,0 +1,1953 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"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
+#: code:addons/rma/models/rma_team.py:0
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "(object._get_report_base_filename())"
+msgstr ""
+
+#. module: rma
+#: 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 ""
+
+#. 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"
+"            </div>\n"
+"        "
+msgstr ""
+
+#. 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"
+"        "
+msgstr ""
+
+#. 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"
+"        "
+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\"/>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
+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\" "
+"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\"><i class=\"fa fa-fw fa-"
+"times\"/> Cancelled</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>"
+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>"
+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>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Invoicing address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin delivery</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Accept Emails From"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Active"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Archived"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
+msgid "Canceled"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Confirmed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered qty done"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+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_operation__display_name
+#: 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 ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Draft"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/rma_split.py:0
+#, python-format
+msgid "Extracted RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+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
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+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__id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_operation__id
+#: 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 ""
+
+#. 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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+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 ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Incoming e-mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entry"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move_line
+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_operation____last_update
+#: 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 ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
+msgid "Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+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
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a return."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
+msgid "Normal"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of errors"
+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 ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+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 ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+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) and task (model))"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Quantity"
+msgstr ""
+
+#. module: rma
+#: 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
+msgid "Quantity must be greater than 0."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid ""
+"Quantity to extract cannot be greater than remaining delivery quantity (%s "
+"%s)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/res_company.py:0
+#, python-format
+msgid "RMA Code"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+msgid "RMA Delivery Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_notification
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
+msgid "RMA Notification"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Receipt Confirmation Email"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Receipts"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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 ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Received"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+msgid "Reference of the document that generated this RMA."
+msgstr ""
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#, python-format
+msgid "Refund"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
+msgid "Refund address for current RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund line"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
+msgid "Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr ""
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
+#: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Replace"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
+msgid "Replaced"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_reporting_menu
+msgid "Reporting"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+msgid "Requested operation"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Required field(s):%s"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Return to customer"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
+msgid "Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA in"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA out"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+msgid "Split RMA"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__state
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "State"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:0
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#, python-format
+msgid "Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
+msgid "That operation name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+
+#. module: rma
+#: 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)."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "The quantity to return is greater than remaining quantity."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+msgid "The tag is visible in the portal view"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot be split."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a return."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+msgid "Urgent"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_all
+msgid "User: All Documents"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
+msgid "Waiting for return"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "You cannot delete RMAs that are not in draft state"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+msgid ""
+"the user will have an access to the RMA configuration as well as statistic "
+"reports."
+msgstr ""

From 884944d57702f1fbf421dc651f224d5d51513ee0 Mon Sep 17 00:00:00 2001
From: Florian da Costa <florian.dacosta@akretion.com>
Date: Wed, 1 Dec 2021 12:14:52 +0100
Subject: [PATCH 037/108] [FIX] multi company error on rma location choice

---
 rma/__manifest__.py | 2 +-
 rma/models/rma.py   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 9159646cb..978c45ac1 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.1.0.2",
+    "version": "14.0.1.0.3",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 8277c7b78..b204e25c1 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -18,7 +18,14 @@ class Rma(models.Model):
     _inherit = ["mail.thread", "portal.mixin", "mail.activity.mixin"]
 
     def _domain_location_id(self):
-        rma_loc = self.env["stock.warehouse"].search([]).mapped("rma_loc_id")
+        # this is done with sudo, intercompany rules are not applied by default so we
+        # add company in domain explicitly to avoid multi-company rule error when
+        # the user will try to choose a location
+        rma_loc = (
+            self.env["stock.warehouse"]
+            .search([("company_id", "in", self.env.companies.ids)])
+            .mapped("rma_loc_id")
+        )
         return [("id", "child_of", rma_loc.ids)]
 
     # General fields

From 0b1609722080ea695a1641d0c7d452eab19086aa Mon Sep 17 00:00:00 2001
From: Samuele Mariani <samuele@ooops404.com>
Date: Fri, 3 Dec 2021 17:49:56 +0000
Subject: [PATCH 038/108] Translated using Weblate (Italian)

Currently translated at 96.5% (310 of 321 strings)

Translation: rma-14.0/rma-14.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-14-0/rma-14-0-rma/it/
---
 rma/i18n/it.po | 627 +++++++++++++++++++++++++++----------------------
 1 file changed, 349 insertions(+), 278 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index aed17df62..de90d348c 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,25 +6,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2021-12-03 20:36+0000\n"
+"Last-Translator: Samuele Mariani <samuele@ooops404.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"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 ""
+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 ""
+msgstr "${object.company_id.name} RMA (Rif ${object.name or 'n/a' })"
 
 #. module: rma
 #: model:mail.template,subject:rma.mail_template_rma_receipt_notification
@@ -44,18 +46,18 @@ msgstr ""
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copia)"
 
 #. module: rma
 #: model:ir.actions.report,print_report_name:rma.report_rma_action
 msgid "(object._get_report_base_filename())"
-msgstr ""
+msgstr "(object._get_report_base_filename())"
 
 #. module: rma
 #: 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 ""
+msgstr "<b>Soggetto E-mail:</b> %s<br/><br/><b>Corpo E-mail:</b><br/>%s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
@@ -118,6 +120,8 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 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\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -125,6 +129,8 @@ msgid ""
 "<i class=\"fa fa-fw fa-check\"/>\n"
 "                                <b>Paid</b>"
 msgstr ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Pagato</b>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -132,6 +138,8 @@ msgid ""
 "<i class=\"fa fa-fw fa-clock-o\"/>\n"
 "                                <b>Waiting Payment</b>"
 msgstr ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>In attesa del pagamento</b>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -139,6 +147,8 @@ msgid ""
 "<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\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -146,6 +156,8 @@ msgid ""
 "<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\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -153,6 +165,8 @@ 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>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -160,6 +174,8 @@ 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>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -167,6 +183,8 @@ 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>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -174,6 +192,8 @@ 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>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -185,118 +205,118 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
-msgstr ""
+msgstr "<strong class=\"d-block mb-1\">Consegna</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Reception</strong>"
-msgstr ""
+msgstr "<strong class=\"d-block mb-1\">Ricezione</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Refund</strong>"
-msgstr ""
+msgstr "<strong class=\"d-block mb-1\">Rimborso</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong>Customer:</strong>"
-msgstr ""
+msgstr "<strong>Cliente:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Date:</strong>"
-msgstr ""
+msgstr "<strong>Data:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Deadline:</strong>"
-msgstr ""
+msgstr "<strong>Scadenza:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong>Deadline</strong>"
-msgstr ""
+msgstr "<strong>Scadenza</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Delivered qty:</strong>"
-msgstr ""
+msgstr "<strong>Quantità consegnata:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong>Delivered quantity</strong>"
-msgstr ""
+msgstr "<strong>Quantità consegnata</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Invoicing address:</strong>"
-msgstr ""
+msgstr "<strong>Indirizzo di fatturazione:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Move:</strong>"
-msgstr ""
+msgstr "<strong>Trasferimento:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Origin delivery:</strong>"
-msgstr ""
+msgstr "<strong>Consegna originale:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong>Origin delivery</strong>"
-msgstr ""
+msgstr "<strong>Consegna originale</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Origin:</strong>"
-msgstr ""
+msgstr "<strong>Origine:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong>Origin</strong>"
-msgstr ""
+msgstr "<strong>Origine</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Product:</strong>"
-msgstr ""
+msgstr "<strong>Prodotto:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong>Product</strong>"
-msgstr ""
+msgstr "<strong>Prodotto</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Quantity:</strong>"
-msgstr ""
+msgstr "<strong>Quantità:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong>Quantity</strong>"
-msgstr ""
+msgstr "<strong>Quantità</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong>RMA Date</strong>"
-msgstr ""
+msgstr "<strong>Data RMA</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>RMA Note:</strong>"
-msgstr ""
+msgstr "<strong>Note RMA:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Responsible:</strong>"
-msgstr ""
+msgstr "<strong>Responsabile:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>State:</strong>"
-msgstr ""
+msgstr "<strong>Stato:</strong>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
@@ -304,22 +324,24 @@ msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
 msgstr ""
+"Un dizionario Python che verrà valutato per fornire valori predefiniti "
+"durante la creazione di nuovi record per questo alias."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Accept Emails From"
-msgstr ""
+msgstr "Accetta Email da"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_warning
 msgid "Access warning"
-msgstr ""
+msgstr "Avviso accesso"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_needaction
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
 msgid "Action Needed"
-msgstr ""
+msgstr "Azione Necessaria"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_operation__active
@@ -327,175 +349,175 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
-msgstr ""
+msgstr "Attivo"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_ids
 msgid "Activities"
-msgstr ""
+msgstr "Attività"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
 msgid "Activity Exception Decoration"
-msgstr ""
+msgstr "Decorazione Eccezione Attività"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_state
 msgid "Activity State"
-msgstr ""
+msgstr "Stato Attività"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
 msgid "Activity Type Icon"
-msgstr ""
+msgstr "Icona tipo attività"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
 msgid "Alias Contact Security"
-msgstr ""
+msgstr "Contatto di Sicurezza Alias"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
-msgstr ""
+msgstr "Nome Alias"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
 msgid "Alias domain"
-msgstr ""
+msgstr "Dominio alias"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
 msgid "Aliased Model"
-msgstr ""
+msgstr "Modello con alias"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Archived"
-msgstr ""
+msgstr "Archiviato"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Are you sure you want to cancel this RMA"
-msgstr ""
+msgstr "Sei sicuro di voler cancellare questo RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
 msgid "Attachment Count"
-msgstr ""
+msgstr "Conteggio Allegati"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Avatar"
-msgstr ""
+msgstr "Avatar"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
 msgid "Can Be Locked"
-msgstr ""
+msgstr "Può essere Bloccato"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
 msgid "Can Be Refunded"
-msgstr ""
+msgstr "Può essere Rimborsato"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
 msgid "Can Be Replaced"
-msgstr ""
+msgstr "Può essere Sostituito"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
 msgid "Can Be Returned"
-msgstr ""
+msgstr "Può essere Reso"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_split
 msgid "Can Be Split"
-msgstr ""
+msgstr "Può essere Diviso"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
 msgid "Canceled"
-msgstr ""
+msgstr "Annullato"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
 msgid "Click to add a new RMA."
-msgstr ""
+msgstr "Fai click per aggiungere un nuovo RMA."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__color
 msgid "Color Index"
-msgstr ""
+msgstr "Indice Colore"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
 msgid "Commercial Entity"
-msgstr ""
+msgstr "Entità Commerciale"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "Communication"
-msgstr ""
+msgstr "Comunicazione"
 
 #. module: rma
 #: model:ir.model,name:rma.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Aziende"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__company_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__company_id
 msgid "Company"
-msgstr ""
+msgstr "Azienda"
 
 #. module: rma
 #: model:ir.model,name:rma.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Impostazioni di Configurazione"
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_configuration_menu
 msgid "Configuration"
-msgstr ""
+msgstr "Configurazione"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Confirm"
-msgstr ""
+msgstr "Conferma"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Confirmed"
-msgstr ""
+msgstr "Confermato"
 
 #. module: rma
 #: model:ir.model,name:rma.model_res_partner
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "Contact"
-msgstr ""
+msgstr "Contatto"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__uom_category_id
@@ -504,16 +526,18 @@ msgid ""
 "Conversion between Units of Measure can only occur if they belong to the "
 "same category. The conversion will be made based on the ratios."
 msgstr ""
+"La conversione tra Unità di Misura può avvenire solo se appartengono alla "
+"stessa categoria. La conversione sarà effettuata in base ai rapporti."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
 msgid "Create RMAs"
-msgstr ""
+msgstr "Crea RMA"
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid "Create a new RMA tag"
-msgstr ""
+msgstr "Crea una nuova Etichetta RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
@@ -523,7 +547,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
 msgid "Created by"
-msgstr ""
+msgstr "Creato da"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_date
@@ -533,24 +557,24 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__create_date
 msgid "Created on"
-msgstr ""
+msgstr "Creato il"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
 msgid "Custom Bounced Message"
-msgstr ""
+msgstr "Messaggio rimbalzato personalizzato"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #: model:ir.model.fields,field_description:rma.field_rma__partner_id
 #, python-format
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__access_url
 msgid "Customer Portal URL"
-msgstr ""
+msgstr "URL Portale Cliente"
 
 #. module: rma
 #: code:addons/rma/controllers/main.py:0
@@ -559,59 +583,59 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 #, python-format
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "Date:"
-msgstr ""
+msgstr "Data:"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__deadline
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Deadline"
-msgstr ""
+msgstr "Scadenza"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
 msgid "Default Values"
-msgstr ""
+msgstr "Valori Predefiniti"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
 msgid "Deliver"
-msgstr ""
+msgstr "Consegna"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
 msgid "Delivered qty"
-msgstr ""
+msgstr "Quantità Consegnata"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
 msgid "Delivered qty done"
-msgstr ""
+msgstr "Quantità consegnata fatta"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
-msgstr ""
+msgstr "Consegna"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
 msgid "Delivery count"
-msgstr ""
+msgstr "Conteggio consegne"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
 msgid "Delivery reservation"
-msgstr ""
+msgstr "Prenotazione consegna"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__description
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_account_move__display_name
@@ -632,99 +656,100 @@ msgstr ""
 #: 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 ""
+msgstr "Nome Visualizzato"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Draft"
-msgstr ""
+msgstr "Bozza"
 
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_draft
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
 msgid "Draft RMA"
-msgstr ""
+msgstr "Bozza RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
-msgstr ""
+msgstr "Alias Email"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Email Template"
-msgstr ""
+msgstr "Modello Email"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email Template confirmation for RMA"
-msgstr ""
+msgstr "Conferma del modello di email per RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
 msgid "Email Template draft notification for RMA"
-msgstr ""
+msgstr "Modello di email di notifica della bozza per RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
 msgid "Email Template receipt confirmation for RMA"
-msgstr ""
+msgstr "Modello di email di conferma della ricezione per RMA"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email sent to the customer once the RMA is confirmed."
 msgstr ""
+"l' Email sarà inviata al cliente una volta che l'RMA è stato confermato."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
 msgid "Email sent to the customer once the RMA products are received."
-msgstr ""
+msgstr "l'Email sarà inviata al cliente una volta ricevuti i prodotti RMA."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
 msgid "Email sent to the customer when they place an RMA from the portal"
-msgstr ""
+msgstr "l'Email sarà inviata al cliente quando si inserisce un RMA dal portale"
 
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
-msgstr ""
+msgstr "RMA Estratto"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
 msgid "Extracted from"
-msgstr ""
+msgstr "Estratto da"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
 msgid "Followers"
-msgstr ""
+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 ""
+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
 msgid "Followers (Partners)"
-msgstr ""
+msgstr "Seguito da (Clienti)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_type_icon
@@ -734,7 +759,7 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Group By"
-msgstr ""
+msgstr "Raggruppa per"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_account_move__id
@@ -755,7 +780,7 @@ msgstr ""
 #: 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 ""
+msgstr "ID"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_thread_id
@@ -763,16 +788,18 @@ msgid ""
 "ID of the parent record holding the alias (example: project holding the task"
 " creation alias)"
 msgstr ""
+"ID del record padre che contiene l'alias (esempio: progetto che contiene "
+"l'alias di creazione dell'attività)"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
 msgid "Icon"
-msgstr ""
+msgstr "Icona"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
 msgid "Icon to indicate an exception activity."
-msgstr ""
+msgstr "Icona per indicare un'attività di eccezione."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
@@ -780,7 +807,7 @@ msgstr ""
 #: 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 ""
+msgstr "Se attivo, nuovi messaggi richiedono la tua attenzione."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
@@ -788,7 +815,7 @@ msgstr ""
 #: 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 ""
+msgstr "Se attivo, alcuni messaggi hanno un errore di consegna."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
@@ -796,6 +823,8 @@ msgid ""
 "If set, this content will automatically be sent out to unauthorized users "
 "instead of the default message."
 msgstr ""
+"Se impostato, questo contenuto verrà inviato automaticamente agli utenti non "
+"autorizzati invece del messaggio predefinito."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
@@ -803,33 +832,35 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the RMA Team "
 "without removing it."
 msgstr ""
+"Se il campo \"attivo\" è impostato a falso, ti permette di nascondere il "
+"Team RMA senza rimuoverlo."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
-msgstr ""
+msgstr "Email in arrivo"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
 msgid "Invoice Address"
-msgstr ""
+msgstr "Indirizzo di Fatturazione"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
 msgid "Is Follower"
-msgstr ""
+msgstr "E' un follower"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
 msgid "Journal Entry"
-msgstr ""
+msgstr "Registrazione Contabile"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move_line
 msgid "Journal Item"
-msgstr ""
+msgstr "Oggetto Registro"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_account_move____last_update
@@ -850,7 +881,7 @@ msgstr ""
 #: 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 ""
+msgstr "Ultima modifica il"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
@@ -860,7 +891,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "Ultimo aggiornamento di"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_date
@@ -870,66 +901,68 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "Ultimo aggiornamento il"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Late RMAs"
-msgstr ""
+msgstr "RMA in ritardo"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
-msgstr ""
+msgstr "Ubicazione"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Lock"
-msgstr ""
+msgstr "Blocca"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
 msgid "Locked"
-msgstr ""
+msgstr "Bloccato"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
 msgid "Main Attachment"
-msgstr ""
+msgstr "Allegato Principale"
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid ""
 "Manage RMA tags to better classify them for tracking and analysis purposes."
 msgstr ""
+"Gestisci i tag RMA per classificarli meglio ai fini del monitoraggio e "
+"dell'analisi."
 
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
 msgid "Manage Return Merchandise Authorizations (RMAs)."
-msgstr ""
+msgstr "Gestisci Autorizzazioni Reso Merce (RMA)."
 
 #. module: rma
 #: model:res.groups,name:rma.rma_group_manager
 msgid "Manager"
-msgstr ""
+msgstr "Responsabile"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_has_error
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
 msgid "Message Delivery error"
-msgstr ""
+msgstr "Messaggio di Errore Consegna"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
 msgid "Messages"
-msgstr ""
+msgstr "Messaggi"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
 msgid "My Activity Deadline"
-msgstr ""
+msgstr "Scadenza della mia attività"
 
 #. module: rma
 #: code:addons/rma/controllers/main.py:0
@@ -938,76 +971,76 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_team__name
 #, python-format
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. 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
 #, python-format
 msgid "New"
-msgstr ""
+msgstr "Nuovo"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
 msgid "Next Activity Deadline"
-msgstr ""
+msgstr "Scadenza prossima attività"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_summary
 msgid "Next Activity Summary"
-msgstr ""
+msgstr "Riepilogo prossima attività"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Tipo prossima attività"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
-msgstr ""
+msgstr "Nessun RMA selezionato è adatto per una sostituzione."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
-msgstr ""
+msgstr "Nessun RMA selezionato è adatto per un reso."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
 msgid "Normal"
-msgstr ""
+msgstr "Normale"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
 msgid "Number of Actions"
-msgstr ""
+msgstr "Numero di Azioni"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
 msgid "Number of errors"
-msgstr ""
+msgstr "Numero di Errore"
 
 #. 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 ""
+msgstr "Numero di messaggi che richiedono una azione"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
 msgid "Number of messages with delivery error"
-msgstr ""
+msgstr "Numero di messaggi con errori 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 ""
+msgstr "Numero di messaggi non letti"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
@@ -1016,41 +1049,44 @@ msgid ""
 "attached, even if they did not reply to it. If set, this will disable the "
 "creation of new records completely."
 msgstr ""
+"ID facoltativo di un filo (record) a cui verranno allegati tutti i messaggi "
+"in arrivo, anche se non hanno risposto. Se impostato, disabiliterà "
+"completamente la creazione di nuovi record."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_orders_menu
 msgid "Orders"
-msgstr ""
+msgstr "Ordini"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__picking_id
 msgid "Origin Delivery"
-msgstr ""
+msgstr "Origine consegna"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__move_id
 msgid "Origin move"
-msgstr ""
+msgstr "Trasferimento originale"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Other Information"
-msgstr ""
+msgstr "Altre informazioni"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
 msgid "Owner"
-msgstr ""
+msgstr "Proprietario"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
-msgstr ""
+msgstr "Modello padre"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
 msgid "Parent Record Thread ID"
-msgstr ""
+msgstr "ID Filo Record Padre"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_model_id
@@ -1059,11 +1095,14 @@ msgid ""
 " necessarily the model given by alias_model_id (example: project "
 "(parent_model) and task (model))"
 msgstr ""
+"Modello genitore che detiene l'alias. Il modello che contiene il riferimento "
+"alias non è necessariamente il modello fornito da alias_model_id (esempio: "
+"progetto (parent_model) e task (model))"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_contact
@@ -1077,56 +1116,56 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_url
 msgid "Portal Access URL"
-msgstr ""
+msgstr "URL Accesso Portale"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Preview"
-msgstr ""
+msgstr "Anteprima"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__priority
 msgid "Priority"
-msgstr ""
+msgstr "Priorità"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
 msgid "Procurement group"
-msgstr ""
+msgstr "Gruppo di approvvigionamento"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_id
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 msgid "Product"
-msgstr ""
+msgstr "Prodotto"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
 msgid "Product qty"
-msgstr ""
+msgstr "Quantità Prodotto"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
 msgid "Public Tag"
-msgstr ""
+msgstr "Etichetta Pubblica"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 msgid "Quantity"
-msgstr ""
+msgstr "Quantità"
 
 #. module: rma
 #: 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
 msgid "Quantity must be greater than 0."
-msgstr ""
+msgstr "La quantità dev'essere maggiore di zero."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
 msgid "Quantity to extract"
-msgstr ""
+msgstr "Quantità da prelevare"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1135,11 +1174,13 @@ 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)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
 msgid "Quantity to extract to a new RMA."
-msgstr ""
+msgstr "Quantità da prelevare in un nuovo RMA."
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_action
@@ -1152,104 +1193,104 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.view_partner_form
 #: model_terms:ir.ui.view,arch_db:rma.view_picking_form
 msgid "RMA"
-msgstr ""
+msgstr "RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "RMA #"
-msgstr ""
+msgstr "# RMA"
 
 #. module: rma
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
-msgstr ""
+msgstr "Codice RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA Confirmation Email"
-msgstr ""
+msgstr "Email di Conferma RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
-msgstr ""
+msgstr "Data RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Deadline"
-msgstr ""
+msgstr "Scadenza RMA"
 
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
-msgstr ""
+msgstr "Ordini di consegna RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_delivery_wizard
 msgid "RMA Delivery Wizard"
-msgstr ""
+msgstr "Wizard Consegna RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
 msgid "RMA In Type"
-msgstr ""
+msgstr "RMA nel tipo"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
 msgid "RMA Location"
-msgstr ""
+msgstr "Ubicazione RMA"
 
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
 msgid "RMA Notification"
-msgstr ""
+msgstr "Notifica RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "RMA Order -"
-msgstr ""
+msgstr "Ordine RMA -"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 msgid "RMA Orders"
-msgstr ""
+msgstr "Ordini RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
 msgid "RMA Out Type"
-msgstr ""
+msgstr "Tipo RMA in uscita"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA Receipt Confirmation Email"
-msgstr ""
+msgstr "E-mail di conferma ricevuta RMA"
 
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
-msgstr ""
+msgstr "Ricevute RMA"
 
 #. module: rma
 #: model:ir.actions.report,name:rma.report_rma_action
 msgid "RMA Report"
-msgstr ""
+msgstr "Resoconto RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_split_wizard
 msgid "RMA Split Wizard"
-msgstr ""
+msgstr "Wizard divisione RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
 msgid "RMA Tag"
-msgstr ""
+msgstr "Etichetta RMA"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.action_rma_tag
@@ -1258,7 +1299,7 @@ msgstr ""
 #: 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 ""
+msgstr "Etichette RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_team
@@ -1266,103 +1307,103 @@ msgstr ""
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "RMA Team"
-msgstr ""
+msgstr "Team RMA"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_users__rma_team_id
 msgid "RMA Team the user is member of."
-msgstr ""
+msgstr "Team RMA di cui l'utente è membro."
 
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_notification
 msgid "RMA automatic customer notifications"
-msgstr ""
+msgstr "Notifiche automatiche ai clienti RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_count
 #: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
 msgid "RMA count"
-msgstr ""
+msgstr "Conteggio RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA draft notification Email"
-msgstr ""
+msgstr "E-mail di notifica bozza RMA"
 
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
-msgstr ""
+msgstr "RMA in stato bozza"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
-msgstr ""
+msgstr "Ricevitori RMA"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_stock_warehouse__rma
 msgid "RMA related products can be stored in this warehouse."
-msgstr ""
+msgstr "Prodotti relativi all'RMA possono essere tenuti in questo magazzino."
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_operation
 msgid "RMA requested operation"
-msgstr ""
+msgstr "Operazione richiesta RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
 msgid "RMA return"
-msgstr ""
+msgstr "Reso RMA"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_team_action
 #: model:ir.model.fields,field_description:rma.field_rma__team_id
 msgid "RMA team"
-msgstr ""
+msgstr "Team RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
 msgid "RMAs"
-msgstr ""
+msgstr "RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMAs which deadline has passed"
-msgstr ""
+msgstr "RMA scaduti"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMAs yet to be fully processed"
-msgstr ""
+msgstr "RMA ancora da processare completamente"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
-msgstr ""
+msgstr "Ricevuta"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__received
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Received"
-msgstr ""
+msgstr "Ricevuto"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
 msgid "Reception move"
-msgstr ""
+msgstr "Trasferimento di ricezione"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
 msgid "Record Thread ID"
-msgstr ""
+msgstr "ID record filo"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__origin
 msgid "Reference of the document that generated this RMA."
-msgstr ""
+msgstr "Riferimento del documento che ha generato questo RMA."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1371,54 +1412,54 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #, python-format
 msgid "Refund"
-msgstr ""
+msgstr "Rimborso"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
 msgid "Refund address for current RMA."
-msgstr ""
+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 ""
+msgstr "Riga rimborso"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
 msgid "Refunded"
-msgstr ""
+msgstr "Rimborsato"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
 msgid "Remaining delivered qty"
-msgstr ""
+msgstr "Quantità da consegnare rimanenti"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
 msgid "Remaining delivered qty to done"
-msgstr ""
+msgstr "Quantità consegnata rimanente da fare"
 
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
-msgstr ""
+msgstr "Riparazione"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
 #: model:rma.operation,name:rma.rma_operation_replace
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Replace"
-msgstr ""
+msgstr "Sostituzione"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
 msgid "Replace Product"
-msgstr ""
+msgstr "Sostituisci Prodotto"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
 msgid "Replaced"
-msgstr ""
+msgstr "Sostituito"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1428,6 +1469,9 @@ msgid ""
 "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."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1438,45 +1482,49 @@ msgid ""
 "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
 msgid "Reporting"
-msgstr ""
+msgstr "Reporting"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__operation_id
 msgid "Requested operation"
-msgstr ""
+msgstr "Operazione Richiesta"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
-msgstr ""
+msgstr "Campi richiesti:%s"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__user_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Responsible"
-msgstr ""
+msgstr "Responsabile"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
 msgid "Responsible User"
-msgstr ""
+msgstr "Utente Responsabile"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
-msgstr ""
+msgstr "Picking Reso"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Return to customer"
-msgstr ""
+msgstr "Rendi al cliente"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1485,138 +1533,141 @@ 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."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
 msgid "Returned"
-msgstr ""
+msgstr "Restituito"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
-msgstr ""
+msgstr "Rma"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
 msgid "Rma Count"
-msgstr ""
+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 ""
+msgstr "SMS Errore Consegna"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Data Prevista"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_token
 msgid "Security Token"
-msgstr ""
+msgstr "Token di Sicurezza"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
 msgid "Send RMA Confirmation"
-msgstr ""
+msgstr "Invia conferma RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
 msgid "Send RMA Receipt Confirmation"
-msgstr ""
+msgstr "Invia conferma ricevuta RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
 msgid "Send RMA draft Confirmation"
-msgstr ""
+msgstr "Invia conferma bozza RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA info to customer"
-msgstr ""
+msgstr "Invio automatico informazioni RMA al cliente"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA products reception notification to customer"
 msgstr ""
+"Invio automatico di una notifica di ricezione dei prodotti RMA al cliente"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
+msgstr "Invia una notifica automatica quando il cliente inserisce un RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
-msgstr ""
+msgstr "Invia per Email"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Mail"
-msgstr ""
+msgstr "Invia per mail"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__sent
 msgid "Sent"
-msgstr ""
+msgstr "Inviato"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__sequence
 msgid "Sequence"
-msgstr ""
+msgstr "Sequenza"
 
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
-msgstr ""
+msgstr "Sequenza RMA in ingresso"
 
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
-msgstr ""
+msgstr "Sequenza RMA in uscita"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Set to draft"
-msgstr ""
+msgstr "Imposta a bozza"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Share"
-msgstr ""
+msgstr "Condividi"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
 msgid "Shipping Address"
-msgstr ""
+msgstr "Indirizzo di Spedizione"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
 msgid "Shipping address for current RMA."
-msgstr ""
+msgstr "Indirizzo spedizione per questo RMA."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
 msgid "Source Document"
-msgstr ""
+msgstr "Documento di Origine"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Split"
-msgstr ""
+msgstr "Dividi"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_split_wizard_action
 msgid "Split RMA"
-msgstr ""
+msgstr "Dividi RMA"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1625,19 +1676,21 @@ 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."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "State"
-msgstr ""
+msgstr "Stato"
 
 #. module: rma
 #: code:addons/rma/controllers/main.py:0
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
-msgstr ""
+msgstr "Stato"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_state
@@ -1647,57 +1700,61 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Stato basato sulle attività\n"
+"Scaduto: la data di scadenza è già passata\n"
+"Oggi: la data dell'attività è oggi\n"
+"Pianificato: attività future."
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Movimento di Magazzino"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_rule
 msgid "Stock Rule"
-msgstr ""
+msgstr "Regola di Magazzino"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__name
 msgid "Tag Name"
-msgstr ""
+msgstr "Nome Etichetta"
 
 #. module: rma
 #: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
 msgid "Tag name already exists !"
-msgstr ""
+msgstr "Nome Etichetta già Esiste!"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__tag_ids
 msgid "Tags"
-msgstr ""
+msgstr "Etichette"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Tags..."
-msgstr ""
+msgstr "Etichette..."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__user_id
 msgid "Team Leader"
-msgstr ""
+msgstr "Team Leader"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Team Members"
-msgstr ""
+msgstr "Membri del Team"
 
 #. module: rma
 #: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
 msgid "That operation name already exists !"
-msgstr ""
+msgstr "Questo nome operazione esiste già!"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_tag__active
 msgid "The active field allows you to hide the category without removing it."
-msgstr ""
+msgstr "Il campo attivo permette di nascondere la categoria senza rimuoverla."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
@@ -1730,17 +1787,19 @@ 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)."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
-msgstr ""
+msgstr "La quantità da restituire è maggiore della quantità restante."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_tag__is_public
 msgid "The tag is visible in the portal view"
-msgstr ""
+msgstr "L'etichetta è visibile nella vista del portale"
 
 #. module: rma
 #: code:addons/rma/models/account_move.py:0
@@ -1749,143 +1808,145 @@ msgid ""
 "There is at least one invoice lines whose quantity is less than the quantity"
 " specified in its linked RMA."
 msgstr ""
+"C'è almeno una riga di fatturazione con una quantità minore della quantità "
+"specificata nella riga dell'RMA collegato."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
-msgstr ""
+msgstr "Questo RMA non può essere diviso."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
-msgstr ""
+msgstr "Questo RMA non può eseguire una sostituzione."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
-msgstr ""
+msgstr "Questo RMA non può eseguire un reso."
 
 #. module: rma
 #: model:ir.actions.server,name:rma.rma_refund_action_server
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "To Refund"
-msgstr ""
+msgstr "Da Rimborsare"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_picking
 msgid "Transfer"
-msgstr ""
+msgstr "Trasferimento"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
 msgid "Type of Operation"
-msgstr ""
+msgstr "Tipo di operazione"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
 msgid "Type of the exception activity on record."
-msgstr ""
+msgstr "Tipo di attività di eccezione nel record."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unassigned RMAs"
-msgstr ""
+msgstr "RMA non assegnati"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
 msgid "Unit of measure"
-msgstr ""
+msgstr "Unità di misura"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Unlock"
-msgstr ""
+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 ""
+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 ""
+msgstr "Conteggio messaggi non letti"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
-msgstr ""
+msgstr "RMA non completati"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
 msgid "Urgent"
-msgstr ""
+msgstr "Urgente"
 
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
-msgstr ""
+msgstr "Utente: Tutti i documenti"
 
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_own
 msgid "User: Own Documents Only"
-msgstr ""
+msgstr "Utente: solo i propri documenti"
 
 #. module: rma
 #: model:ir.model,name:rma.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
-msgstr ""
+msgstr "In attesa di sostituzione"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
 msgid "Waiting for return"
-msgstr ""
+msgstr "In attesa di reso"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_warehouse
 #: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
 msgid "Warehouse"
-msgstr ""
+msgstr "Magazzino"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
 msgid "Website Messages"
-msgstr ""
+msgstr "Messaggi sito web"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__website_message_ids
 #: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
 msgid "Website communication history"
-msgstr ""
+msgstr "Storico comunicazioni sito web"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
 msgid "When a customer places an RMA, send a notification with it"
-msgstr ""
+msgstr "Quando un cliente inserisce un RMA, invia una notifica con esso"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -1893,17 +1954,21 @@ msgid ""
 "When customers themselves place an RMA from the portal, send an automatic "
 "notification acknowleging it."
 msgstr ""
+"Quando i clienti stessi inseriscono un RMA dal portale, invia una notifica "
+"automatica di conferma."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
-msgstr ""
+msgstr "Quando l'RMA è confermato, inviare un'e-mail informativa automatica."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
 "When the RMA products are received, send an automatic information email."
 msgstr ""
+"Quando i prodotti RMA sono ricevuti, inviare un'e-mail informativa "
+"automatica."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_receipt_confirmation
@@ -1912,6 +1977,8 @@ msgid ""
 "When the RMA receipt is confirmed, send a confirmation email to the "
 "customer."
 msgstr ""
+"Quando la ricevuta RMA è confermata, inviare un'e-mail di conferma al "
+"cliente."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
@@ -1919,12 +1986,13 @@ msgstr ""
 msgid ""
 "When the delivery is confirmed, send a confirmation email to the customer."
 msgstr ""
+"Quando la consegna è confermata, invia un'e-mail di conferma al cliente."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
-msgstr ""
+msgstr "Non puoi eliminare RMA che non sono in stato \"bozza\""
 
 #. module: rma
 #: code:addons/rma/wizard/stock_picking_return.py:0
@@ -1933,21 +2001,24 @@ msgid ""
 "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
 "be created"
 msgstr ""
+"Devi specificare il cliente nel picking dal quale gli RMA verranno creati"
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
 msgid ""
 "the user will have access to all records of everyone in the RMA application."
 msgstr ""
+"l'utente avrà accesso a tutti i record di tutti gli utenti nell'applicazione "
+"RMA."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_own
 msgid "the user will have access to his own data in the RMA application."
-msgstr ""
+msgstr "l'utente avrà accesso ai propri dati nell'applicazione RMA."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_manager
 msgid ""
 "the user will have an access to the RMA configuration as well as statistic "
 "reports."
-msgstr ""
+msgstr "l'utente avrà accesso alla configurazione RMA e ai report statistici."

From 2a27f65498ff019c85dfc0916820ab3c75a8f456 Mon Sep 17 00:00:00 2001
From: Francesco Foresti <francesco.foresti@ooops404.com>
Date: Fri, 10 Dec 2021 15:32:15 +0000
Subject: [PATCH 039/108] Translated using Weblate (Italian)

Currently translated at 98.7% (317 of 321 strings)

Translation: rma-14.0/rma-14.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-14-0/rma-14-0-rma/it/
---
 rma/i18n/it.po | 55 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index de90d348c..ef51529fc 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-12-03 20:36+0000\n"
-"Last-Translator: Samuele Mariani <samuele@ooops404.com>\n"
+"PO-Revision-Date: 2021-12-10 17:39+0000\n"
+"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,8 @@ 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
@@ -41,6 +43,8 @@ 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
 #: code:addons/rma/models/rma_team.py:0
@@ -76,6 +80,20 @@ msgid ""
 "            </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
@@ -95,6 +113,20 @@ msgid ""
 "</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
@@ -115,6 +147,21 @@ msgid ""
 "</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
@@ -201,6 +248,8 @@ msgid ""
 "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
 "specific.\" groups=\"base.group_multi_company\"/>"
 msgstr ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati sono "
+"specifici per Azienda.\" groups=\"base.group_multi_company\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -754,7 +803,7 @@ msgstr "Seguito da (Clienti)"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_type_icon
 msgid "Font awesome icon e.g. fa-tasks"
-msgstr ""
+msgstr "Font awesome icon e.g. fa-tasks"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search

From 406355bab447355441e9ed215f35f9be5411b0eb Mon Sep 17 00:00:00 2001
From: Kev-Roche <kevin.roche@akretion.com>
Date: Sun, 16 Jan 2022 14:11:35 +0100
Subject: [PATCH 040/108] [FIX] duplicate labels (category_id, uom_category_id)
 of rma())

---
 rma/__manifest__.py |  2 +-
 rma/i18n/es.po      |  6 +++-
 rma/i18n/it.po      | 70 ++++++++++++++++++++++++---------------------
 rma/i18n/nl.po      |  6 +++-
 rma/i18n/pt.po      | 66 +++++++++++++++++++++++-------------------
 rma/i18n/pt_BR.po   |  6 +++-
 rma/i18n/rma.pot    |  6 +++-
 rma/i18n/ro.po      |  6 +++-
 rma/i18n/zh_CN.po   |  6 +++-
 rma/models/rma.py   |  4 ++-
 10 files changed, 108 insertions(+), 70 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 978c45ac1..8d6f0745f 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.1.0.3",
+    "version": "14.0.1.1.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 378bc2773..429ee95d8 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -474,11 +474,15 @@ msgid "Canceled"
 msgstr "Cancelado"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
 msgid "Category"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index ef51529fc..4d8692643 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -43,8 +43,8 @@ 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' })"
+"${object.company_id.name} Il tuo RMA è stato creato correttamente (Ref "
+"${object.name or 'n/a' })"
 
 #. module: rma
 #: code:addons/rma/models/rma_team.py:0
@@ -73,7 +73,8 @@ msgid ""
 "        (${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"
+"    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"
@@ -165,7 +166,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 ""
 "<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
 "\"Download\"/>"
@@ -191,8 +194,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\"/>"
@@ -200,8 +203,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\"/>"
@@ -504,11 +507,15 @@ msgid "Canceled"
 msgstr "Annullato"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
 msgid "Category"
 msgstr "Categoria"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
@@ -834,8 +841,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 del record padre che contiene l'alias (esempio: progetto che contiene "
 "l'alias di creazione dell'attività)"
@@ -1023,8 +1030,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. 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
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
 msgstr "Nuovo"
@@ -1140,8 +1146,8 @@ msgstr "ID Filo Record Padre"
 #. 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 ""
 "Modello genitore che detiene l'alias. Il modello che contiene il riferimento "
@@ -1159,7 +1165,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
@@ -1514,13 +1521,13 @@ msgstr "Sostituito"
 #: 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=\"%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."
+"data-oe-id=\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking"
+"\" data-oe-id=\"%d\">%s</a>) è stato creato."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1579,8 +1586,8 @@ msgstr "Rendi al cliente"
 #: 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=\"%d\">%s</"
+"a> has been created."
 msgstr ""
 "Reso: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a> "
 "è stato creato."
@@ -1722,8 +1729,8 @@ msgstr "Dividi RMA"
 #: 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=\"%d\">%s</a> has been "
+"created."
 msgstr ""
 "Divisione: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> è "
 "stato creato."
@@ -1808,9 +1815,9 @@ msgstr "Il campo attivo permette di nascondere la categoria senza rimuoverla."
 #. 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
@@ -1854,8 +1861,8 @@ msgstr "L'etichetta è visibile nella vista del portale"
 #: 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 ""
 "C'è almeno una riga di fatturazione con una quantità minore della quantità "
 "specificata nella riga dell'RMA collegato."
@@ -2023,8 +2030,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 ""
 "Quando la ricevuta RMA è confermata, inviare un'e-mail di conferma al "
 "cliente."
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index b664eab6d..937c9de46 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -436,11 +436,15 @@ msgid "Canceled"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
 msgid "Category"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
diff --git a/rma/i18n/pt.po b/rma/i18n/pt.po
index e154ba278..ddb97db38 100644
--- a/rma/i18n/pt.po
+++ b/rma/i18n/pt.po
@@ -69,7 +69,8 @@ msgid ""
 "        (${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"
+"    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"
@@ -118,7 +119,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 ""
 "<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
 "\"Download\"/>"
@@ -140,8 +143,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=\"Descarregar"
 "\" title=\"Descarregar\"/>"
@@ -149,8 +152,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=\"Descarregar\" title="
 "\"Descarregar\"/>"
@@ -453,11 +456,15 @@ msgid "Canceled"
 msgstr "Cancelado(a)"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
 msgid "Category"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
@@ -780,8 +787,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 do registo ascendente que contém o alias (exemplo: projeto que contém o "
 "alias de criação da tarefa)"
@@ -965,8 +972,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. 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
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
 msgstr "Novo(a)"
@@ -1082,8 +1088,8 @@ msgstr "Id da Thread do Registo Ascendente"
 #. 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 ""
 "Modelo pai que contém o alias. O modelo que contém a referência de alias não "
@@ -1101,7 +1107,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 ""
 "Política para publicar uma mensagem no documento usando o mail gateway.\n"
 "- todos: todos podem postar\n"
@@ -1461,9 +1468,9 @@ msgstr "Substituído"
 #: 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=\"%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\" "
@@ -1526,11 +1533,11 @@ msgstr "Devolver ao cliente"
 #: 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=\"%d\">%s</"
+"a> has been created."
 msgstr ""
-"Devolução: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\""
-">%s</a> foi criada."
+"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
@@ -1668,8 +1675,8 @@ msgstr "Dividir RMA"
 #: 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=\"%d\">%s</a> has been "
+"created."
 msgstr ""
 "Divisão: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> foi "
 "criada."
@@ -1754,9 +1761,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 ""
 "Modelo (tipo de documento Odoo) ao qual esse alias corresponde. Qualquer e-"
 "mail recebido que não responda a um registo existente causará a criação de "
@@ -1809,8 +1816,8 @@ msgstr ""
 #: 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 ""
 "Há pelo menos uma linha de fatura cuja quantidade é menor que a quantidade "
 "especificada na sua RMA vinculada."
@@ -1974,8 +1981,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
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 9cbc2f72b..c36a6bbef 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -454,11 +454,15 @@ msgid "Canceled"
 msgstr "Cancelado(a)"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
 msgid "Category"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index c95c10f70..366dd5791 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -432,11 +432,15 @@ msgid "Canceled"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
 msgid "Category"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index 4103c6ad5..eeb7d371a 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -473,11 +473,15 @@ msgid "Canceled"
 msgstr "Anulat"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
 msgid "Category"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
index 7b25f28b3..0a8357e94 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -438,11 +438,15 @@ msgid "Canceled"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
 msgid "Category"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
 #: model_terms:ir.actions.act_window,help:rma.rma_team_action
diff --git a/rma/models/rma.py b/rma/models/rma.py
index b204e25c1..ee79e08d8 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -255,7 +255,9 @@ def _domain_location_id(self):
         digits="Product Unit of Measure",
         compute="_compute_remaining_qty",
     )
-    uom_category_id = fields.Many2one(related="product_id.uom_id.category_id")
+    uom_category_id = fields.Many2one(
+        related="product_id.uom_id.category_id", string="Category UoM"
+    )
     # Split fields
     can_be_split = fields.Boolean(
         compute="_compute_can_be_split",

From 5356d69aa6d7e780c0d0866094540432514cf186 Mon Sep 17 00:00:00 2001
From: xavigutipujol <jgutierrez@pyming.com>
Date: Mon, 17 Jan 2022 09:54:05 +0000
Subject: [PATCH 041/108] Translated using Weblate (Spanish)

Currently translated at 79.8% (257 of 322 strings)

Translation: rma-14.0/rma-14.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-14-0/rma-14-0-rma/es/
---
 rma/i18n/es.po | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 429ee95d8..f4ccbcbd0 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-10-23 20:11+0000\n"
-"PO-Revision-Date: 2020-10-23 16:21-0400\n"
-"Last-Translator: David Vidal <david.vidal@tecnativa.com>\n"
+"PO-Revision-Date: 2022-01-17 12:39+0000\n"
+"Last-Translator: xavigutipujol <jgutierrez@pyming.com>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Weblate 4.3.2\n"
 
 #. module: rma
 #: model:mail.template,report_name:rma.mail_template_rma_draft_notification
@@ -31,10 +31,13 @@ msgstr "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
 
 #. module: rma
 #: model:mail.template,subject:rma.mail_template_rma_receipt_notification
+#, fuzzy
 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' }) productos "
+"recibidos"
 
 #. module: rma
 #: model:mail.template,subject:rma.mail_template_rma_draft_notification

From e9502bb10cab14c5fec53bd4bff81daf316801c7 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Mon, 17 Jan 2022 09:44:13 +0100
Subject: [PATCH 042/108] [FIX] rma: return wizard to_refund

To create the rma we create the core return wizard, which now sets
to_refund to True as default. This isn't right for RMAs anyway.

TT33706
---
 rma/__manifest__.py | 2 +-
 rma/models/rma.py   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 8d6f0745f..84b39b7db 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -10,7 +10,7 @@
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "maintainers": ["ernestotejeda"],
     "license": "AGPL-3",
-    "depends": ["account", "stock"],
+    "depends": ["stock_account"],
     "data": [
         "views/report_rma.xml",
         "report/report.xml",
diff --git a/rma/models/rma.py b/rma/models/rma.py
index ee79e08d8..172d9fa5d 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -912,7 +912,14 @@ def _create_receptions_from_picking(self):
             lambda r: r.move_id != self.move_id
         ).unlink()
         return_line = return_wizard.product_return_moves
-        return_line.quantity = self.product_uom_qty
+        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.
+                "to_refund": False,
+            }
+        )
         # set_rma_picking_type is to override the copy() method of stock
         # picking and change the default picking type to rma picking type.
         picking_action = return_wizard.with_context(

From 79e4fd61128ae2b1790ac2e7097150f18c6ffe01 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Sat, 18 Dec 2021 15:20:21 +0100
Subject: [PATCH 043/108] [FIX] rma: Adjust hook for existing values

If rma_in_type_id or rma_out_type_id are already set, then the hook
fails. With this alternative code, we avoid it and clean it for being
clearer.
---
 rma/hooks.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/rma/hooks.py b/rma/hooks.py
index 9aafcaf0e..ed6259060 100644
--- a/rma/hooks.py
+++ b/rma/hooks.py
@@ -56,15 +56,10 @@ def create_rma_picking_types(whs):
                 )
                 data[picking_type] = stock_picking_type.create(values).id
 
-        rma_out_type = stock_picking_type.browse(data["rma_out_type_id"])
-        rma_out_type.write(
-            {"return_picking_type_id": data.get("rma_in_type_id", False)}
-        )
-        rma_in_type = stock_picking_type.browse(data["rma_in_type_id"])
-        rma_in_type.write(
-            {"return_picking_type_id": data.get("rma_out_type_id", False)}
-        )
-        whs.write(data)
+        if data:
+            whs.write(data)
+        whs.rma_in_type_id.return_picking_type_id = whs.rma_out_type_id.id
+        whs.rma_out_type_id.return_picking_type_id = whs.rma_in_type_id.id
 
     # Create rma locations and picking types
     warehouses = env["stock.warehouse"].search([])

From c8895a6c962c840218a7c512ce636acc6d1ea6b8 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Fri, 21 Jan 2022 10:23:25 +0100
Subject: [PATCH 044/108] [IMP] rma report: invoice and shipping address

TT13069
---
 rma/i18n/es.po                     | 429 ++++++++++++++---------------
 rma/i18n/rma.pot                   |  27 +-
 rma/views/report_rma.xml           |  22 +-
 rma/views/rma_portal_templates.xml |  33 +++
 4 files changed, 276 insertions(+), 235 deletions(-)

diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index f4ccbcbd0..195cdd26e 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -4,13 +4,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-10-23 20:11+0000\n"
 "PO-Revision-Date: 2022-01-17 12:39+0000\n"
 "Last-Translator: xavigutipujol <jgutierrez@pyming.com>\n"
 "Language-Team: \n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,9 +41,10 @@ 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' })"
+"${object.company_id.name} Your RMA has been succesfully created (Ref ${object.name or 'n/"
+"a' })"
 msgstr ""
+"${object.company_id.name} Su RMA se ha creado con éxito (Ref ${object.name or 'n/a' })"
 
 #. module: rma
 #: code:addons/rma/models/rma_team.py:0
@@ -62,12 +62,11 @@ msgstr ""
 #, python-format
 msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
 msgstr ""
-"<b>Asunto del correo electrónico:</b> %s<br/><br/><b>Cuerpo del correo "
-"electrónico:</b><br/>%s"
+"<b>Asunto del correo electrónico:</b> %s<br/><br/><b>Cuerpo del correo electrónico:</b><br/"
+">%s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
-#, fuzzy
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
@@ -76,8 +75,7 @@ msgid ""
 "        (${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"
+"    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"
@@ -91,8 +89,7 @@ msgstr ""
 "        (${object.partner_id.parent_id.name})\n"
 "    % endif\n"
 "    <br/><br/>\n"
-"    Aquí tiene el RMA <strong>${object.name}</strong> Desde ${object."
-"company_id.name}.\n"
+"    Aquí tiene el RMA <strong>${object.name}</strong> Desde ${object.company_id.name}.\n"
 "    <br/><br/>\n"
 "    No dude en ponerse en contacto con nosotros si tiene alguna pregunta.\n"
 "</p>\n"
@@ -117,6 +114,20 @@ msgid ""
 "</div>\n"
 "        "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"    Estimado ${object.partner_id.name}\n"
+"    % if object.partner_id.parent_id:\n"
+"        (${object.partner_id.parent_id.name})\n"
+"    % endif\n"
+"    <br/><br/>\n"
+"    Los productos de su RMA <strong>${object.name}</strong>\n"
+"    from ${object.company_id.name} han sido recibidos en nuestro almacén.\n"
+"    <br/><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
@@ -137,19 +148,30 @@ msgid ""
 "</div>\n"
 "        "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"    Estimado ${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 solicitado con éxito su RMA <strong>${object.name}</strong>\n"
+"    en ${object.company_id.name}. Nuestro equipo la comprobará y validará\n"
+"    tan pronto como sea posible.\n"
+"    <br/><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
-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="
-"\"Descargar\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\"Descargar\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-#, fuzzy
 msgid ""
 "<i class=\"fa fa-fw fa-check\"/>\n"
 "                                <b>Paid</b>"
@@ -157,7 +179,6 @@ msgstr "<i class=\"fa fa-fw fa-check\"/><b>Pagado</b>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
-#, fuzzy
 msgid ""
 "<i class=\"fa fa-fw fa-clock-o\"/>\n"
 "                                <b>Waiting Payment</b>"
@@ -166,62 +187,60 @@ msgstr "<i class=\"fa fa-fw fa-clock-o\"/><b>Esperando Pago</b>"
 #. 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=\"Descargar\"/>"
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" title="
+"\"Descargar\"/>"
 
 #. 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="
-"\"Descargar\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title=\"Descargar\"/>"
 
 #. 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\"><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>"
+"<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-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>"
+"<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-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>"
+"<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-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>"
+"<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
 msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" "
+"groups=\"base.group_multi_company\"/>"
 msgstr ""
 
 #. module: rma
@@ -269,11 +288,6 @@ msgstr "<strong>Cantidad entregada:</strong>"
 msgid "<strong>Delivered quantity</strong>"
 msgstr "<strong>Cantidad entregada</strong>"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
-msgid "<strong>Invoicing address:</strong>"
-msgstr "<strong>Dirección de facturación:</strong>"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Move:</strong>"
@@ -335,6 +349,16 @@ msgstr "<strong>Nota:</strong>"
 msgid "<strong>Responsible:</strong>"
 msgstr "<strong>Responsable:</strong>"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr "<strong>Dirección de envío:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr "<strong>Dirección de envío:</strong>"
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>State:</strong>"
@@ -343,11 +367,11 @@ msgstr "<strong>Estado:</strong>"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
 msgid ""
-"A Python dictionary that will be evaluated to provide default values when "
-"creating new records for this alias."
+"A Python dictionary that will be evaluated to provide default values when creating new "
+"records for this alias."
 msgstr ""
-"Diccionario Python a evaluar para proporcionar valores por defecto cuando un "
-"nuevo registro se cree para este seudónimo."
+"Diccionario Python a evaluar para proporcionar valores por defecto cuando un nuevo "
+"registro se cree para este seudónimo."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
@@ -421,7 +445,7 @@ msgstr "Modelo con seudónimo"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Archived"
-msgstr ""
+msgstr "Archivado"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -521,7 +545,7 @@ msgstr "Compañía"
 #. module: rma
 #: model:ir.model,name:rma.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Opciones de Configuración"
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_configuration_menu
@@ -561,7 +585,7 @@ msgstr "Crear RMAs"
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid "Create a new RMA tag"
-msgstr ""
+msgstr "Crear una nueva etiqueta de RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
@@ -707,43 +731,43 @@ msgstr "Pseudónimo de correo"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Email Template"
-msgstr ""
+msgstr "Plantillade correo"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email Template confirmation for RMA"
-msgstr ""
+msgstr "Plantilla de correo de confirmación de RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
 msgid "Email Template draft notification for RMA"
-msgstr ""
+msgstr "Plantilla de correo de notificación de borrador RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
 msgid "Email Template receipt confirmation for RMA"
-msgstr ""
+msgstr "Plantilla de correo de confirmación de recepción RMA"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email sent to the customer once the RMA is confirmed."
-msgstr ""
+msgstr "Enviar correo al cliente una vez se confirma el RMA."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
 msgid "Email sent to the customer once the RMA products are received."
-msgstr ""
+msgstr "Enviar correo al cliente una vez se recepcionen los productos del RMA."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
 msgid "Email sent to the customer when they place an RMA from the portal"
-msgstr ""
+msgstr "Enviar correo de confirmación al cliente una vez se tramite el RMA desde el portal"
 
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
@@ -808,16 +832,16 @@ 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 del registro padre que tiene el seudónimo. (ejemplo: el proyecto que "
-"contiene el seudónimo para la creación de tareas)"
+"ID del registro padre que tiene el seudónimo. (ejemplo: el proyecto que contiene el "
+"seudónimo para la creación de tareas)"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
 msgid "Icon"
-msgstr ""
+msgstr "Icono"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
@@ -850,11 +874,10 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
 msgid ""
-"If the active field is set to false, it will allow you to hide the RMA Team "
-"without removing it."
+"If the active field is set to false, it will allow you to hide the RMA Team without "
+"removing it."
 msgstr ""
-"Si el campo activo se establece a Falso, permitirá ocultar El equipo de RMA "
-"sin eliminarlo."
+"Si el campo activo se establece a Falso, permitirá ocultar El equipo de RMA sin eliminarlo."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -867,6 +890,16 @@ msgstr "Correo electrónico entrante"
 msgid "Invoice Address"
 msgstr "Dirección de factura"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr "Dirección de facturación:"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr "Dirección de envío y facturación:"
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
@@ -881,7 +914,7 @@ msgstr ""
 #. module: rma
 #: model:ir.model,name:rma.model_account_move_line
 msgid "Journal Item"
-msgstr ""
+msgstr "Apunte contable"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_account_move____last_update
@@ -952,9 +985,10 @@ msgstr "Adjuntos principales"
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
-msgid ""
-"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgid "Manage RMA tags to better classify them for tracking and analysis purposes."
 msgstr ""
+"Administrar etiquetas de RMA para clasificarlos de modo que mejore el seguimiento y "
+"análisis de los mismos."
 
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
@@ -1063,13 +1097,12 @@ msgstr "Número de mensajes no leidos"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
-"Optional ID of a thread (record) to which all incoming messages will be "
-"attached, even if they did not reply to it. If set, this will disable the "
-"creation of new records completely."
+"Optional ID of a thread (record) to which all incoming messages will be attached, even if "
+"they did not reply to it. If set, this will disable the creation of new records completely."
 msgstr ""
-"Id. opcional de un hilo (registro) al que todos los mensajes entrantes serán "
-"adjuntados, incluso si no fueron respuestas del mismo. Si se establece, se "
-"deshabilitará completamente la creación de nuevos registros."
+"Id. opcional de un hilo (registro) al que todos los mensajes entrantes serán adjuntados, "
+"incluso si no fueron respuestas del mismo. Si se establece, se deshabilitará completamente "
+"la creación de nuevos registros."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_orders_menu
@@ -1109,12 +1142,11 @@ msgstr "ID del hilo del registro padre"
 #. 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) and task (model))"
+"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 ""
-"Modelo padre que contiene el alias. El modelo que contiene la referencia "
-"alias no es necesariamente el modelo dado por alias_model_id"
+"Modelo padre que contiene el alias. El modelo que contiene la referencia alias no es "
+"necesariamente el modelo dado por alias_model_id"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -1127,15 +1159,13 @@ 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 ""
-"Política para publicar un mensaje en el documento utilizando el servidor de "
-"correo.\n"
+"Política para publicar un mensaje en el documento utilizando el servidor de correo.\n"
 "- todo el mundo: todos pueden publicar\n"
 "- socios: sólo socios autenticados\n"
-"- seguidores: sólo seguidores del documento relacionado o miembros de los "
-"siguientes canales\n"
+"- seguidores: sólo seguidores del documento relacionado o miembros de los siguientes "
+"canales\n"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_url
@@ -1171,7 +1201,7 @@ msgstr "Cantidad"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
 msgid "Public Tag"
-msgstr ""
+msgstr "Etiqueta pública"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
@@ -1194,12 +1224,8 @@ msgstr "Cantidad a extraer"
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
-msgid ""
-"Quantity to extract cannot be greater than remaining delivery quantity (%s "
-"%s)"
-msgstr ""
-"La cantidad a extraer no puede ser mayor que la cantidad de entrega "
-"restante(%s %s)"
+msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
+msgstr "La cantidad a extraer no puede ser mayor que la cantidad de entrega restante(%s %s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
@@ -1207,13 +1233,11 @@ msgid "Quantity to extract to a new RMA."
 msgstr "Cantidad a extraer en nuevo RMA."
 
 #. module: rma
-#: model:ir.actions.act_window,name:rma.rma_action
-#: model:ir.model,name:rma.model_rma
+#: model:ir.actions.act_window,name:rma.rma_action model:ir.model,name:rma.model_rma
 #: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
-#: model:ir.module.category,name:rma.rma_module_category
-#: model:ir.ui.menu,name:rma.rma_menu
+#: model:ir.module.category,name:rma.rma_module_category model:ir.ui.menu,name:rma.rma_menu
 #: model_terms:ir.ui.view,arch_db:rma.view_partner_form
 #: model_terms:ir.ui.view,arch_db:rma.view_picking_form
 msgid "RMA"
@@ -1234,7 +1258,7 @@ msgstr "Código de RMA"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA Confirmation Email"
-msgstr ""
+msgstr "Correo de confirmación de RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -1271,7 +1295,7 @@ msgstr "Ubicación de RMA"
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
 msgid "RMA Notification"
-msgstr ""
+msgstr "Notificación de RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -1293,7 +1317,7 @@ msgstr "Tipo de operación para entrega de RMA"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA Receipt Confirmation Email"
-msgstr ""
+msgstr "Correo de confirmación de recepción de RMA"
 
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
@@ -1314,16 +1338,15 @@ msgstr "Asistente para dividir RMA"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
 msgid "RMA Tag"
-msgstr ""
+msgstr "Etiqueta RMA"
 
 #. module: rma
-#: model:ir.actions.act_window,name:rma.action_rma_tag
-#: model:ir.model,name:rma.model_rma_tag
+#: model:ir.actions.act_window,name:rma.action_rma_tag 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 ""
+msgstr "Etiquetas RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_team
@@ -1341,7 +1364,7 @@ msgstr "Equipo de RMA del cual el usuario es miembro."
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_notification
 msgid "RMA automatic customer notifications"
-msgstr ""
+msgstr "Notificaciones automáticas de RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
@@ -1353,7 +1376,7 @@ msgstr "Cantidad de RMAs"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA draft notification Email"
-msgstr ""
+msgstr "Correo de notificación de borrador de RMA"
 
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
@@ -1368,8 +1391,7 @@ msgstr "RMAs que originaron esta orden"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_stock_warehouse__rma
 msgid "RMA related products can be stored in this warehouse."
-msgstr ""
-"Productos relacionados con el RMA pueden ser guardados en este almacén."
+msgstr "Productos relacionados con el RMA pueden ser guardados en este almacén."
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_operation
@@ -1490,27 +1512,25 @@ msgstr "Reemplazado"
 #: 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=\"%d\">%s</a> "
+"(Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a>) has been "
+"created."
 msgstr ""
-"Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
-"id=\"%d\">%s</a> (Orden de entrega <a href=\"#\" data-oe-model=\"stock."
-"picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
+"Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d\">%s</"
+"a> (Orden de entrega <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
+"a>) ha sido creado."
 
 #. module: rma
 #: 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."
+"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 ""
-"Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-"
-"oe-id=\"%d\">%s</a><br/>Cantidad %f %s<br/>El reemplazo realizado no creó un "
-"movimiento nuevo, pero uno de los movimientos creados anteriormente fué "
-"actualizado con estos datos."
+"Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-oe-id=\"%d\">"
+"%s</a><br/>Cantidad %f %s<br/>El reemplazo realizado no creó un movimiento nuevo, pero uno "
+"de los movimientos creados anteriormente fué actualizado con estos datos."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
@@ -1555,11 +1575,11 @@ msgstr "Devolver al cliente"
 #: 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=\"%d\">%s</a> has been "
+"created."
 msgstr ""
-"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking"
-"\" data-oe-id=\"%d\">%s</a> ha sido creada."
+"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
+"\"%d\">%s</a> ha sido creada."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1569,7 +1589,7 @@ msgstr "Devuelto"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
-msgstr ""
+msgstr "Rma"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
@@ -1579,7 +1599,6 @@ 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
-#, fuzzy
 msgid "SMS Delivery error"
 msgstr "Error de Envío de Mensaje"
 
@@ -1597,24 +1616,24 @@ msgstr "Token de seguridad"
 #: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
 msgid "Send RMA Confirmation"
-msgstr ""
+msgstr "Enviar confirmación de RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
 msgid "Send RMA Receipt Confirmation"
-msgstr ""
+msgstr "Enviar confirmación de recepción de RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
 msgid "Send RMA draft Confirmation"
-msgstr ""
+msgstr "Enviar confirmación de borrador RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA info to customer"
-msgstr ""
+msgstr "Enviar información automática de RMA al cliente"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -1671,12 +1690,12 @@ msgstr "Compartir"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
 msgid "Shipping Address"
-msgstr ""
+msgstr "Dirección de envío"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
 msgid "Shipping address for current RMA."
-msgstr ""
+msgstr "Dirección de envío para el RMA en curso"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
@@ -1697,12 +1716,10 @@ msgstr "Dividir RMA"
 #. module: rma
 #: 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."
+msgid "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
-"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</"
-"a> ha sido creado."
+"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> ha sido "
+"creado."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -1711,8 +1728,7 @@ msgid "State"
 msgstr "Estado"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:0
-#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: code:addons/rma/controllers/main.py:0 model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
 msgstr "Estado"
@@ -1743,22 +1759,22 @@ msgstr "Regla de Inventario"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__name
 msgid "Tag Name"
-msgstr ""
+msgstr "Nombre de etiqueta"
 
 #. module: rma
 #: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
 msgid "Tag name already exists !"
-msgstr ""
+msgstr "¡El nombre de etiqueta ya existe!"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__tag_ids
 msgid "Tags"
-msgstr ""
+msgstr "Etiquetas"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Tags..."
-msgstr ""
+msgstr "Etiquetas..."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__user_id
@@ -1784,46 +1800,44 @@ 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 ""
-"El modelo (Tipo de documento de Odoo) al que corresponde este seudónimo. "
-"Cualquier correo entrante que no sea respuesta a un registro existente, "
-"causará la creación de un nuevo registro de este modelo"
+"El modelo (Tipo de documento de Odoo) al que corresponde este seudónimo. Cualquier correo "
+"entrante que no sea respuesta a un registro existente, causará la creación de un nuevo "
+"registro de este modelo"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_name
 msgid ""
-"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
-"<jobs@example.odoo.com>"
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example."
+"odoo.com>"
 msgstr ""
-"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos"
-"\", si lo que quiere es obtener los correos para <trabajos@example.odoo.com>"
+"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos\", si lo que "
+"quiere es obtener los correos para <trabajos@example.odoo.com>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
 msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
+"The owner of records created upon receiving emails on this alias. If this field is not set "
+"the system will attempt to find the right owner based on the sender (From) address, or "
+"will use the Administrator account if no system user is found for that address."
 msgstr ""
-"El propietario de los registros creados al recibir correos electrónicos en "
-"este seudónimo. Si el campo no está establecido, el sistema tratará de "
-"encontrar el propietario adecuado basado en la dirección del emisor (De), o "
-"usará la cuenta de administrador si no se encuentra un usuario para esa "
-"dirección."
+"El propietario de los registros creados al recibir correos electrónicos en este seudónimo. "
+"Si el campo no está establecido, el sistema tratará de encontrar el propietario adecuado "
+"basado en la dirección del emisor (De), o usará la cuenta de administrador si no se "
+"encuentra un usuario para esa dirección."
 
 #. module: rma
 #: 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 '%s' must be equal to its initial demand because the "
+"stock move is linked to an RMA (%s)."
 msgstr ""
-"La cantidad realizada para el producto '%s' debe ser igual a la demanda "
-"inicial porque el movimiento está enlazado a un RMA (%s)."
+"La cantidad realizada para el producto '%s' debe ser igual a la demanda inicial porque el "
+"movimiento está enlazado a un RMA (%s)."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1834,17 +1848,17 @@ msgstr "La cantidad a devolver es mayor que la cantidad restante del RMA."
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_tag__is_public
 msgid "The tag is visible in the portal view"
-msgstr ""
+msgstr "La etiqueta es visible en la vista de portal"
 
 #. module: rma
 #: 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 ""
-"Hay al menos una linea de factura que tiene una cantidad menor que la "
-"cantidad especificada en el RMA asociado."
+"Hay al menos una linea de factura que tiene una cantidad menor que la cantidad "
+"especificada en el RMA asociado."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1873,7 +1887,7 @@ msgstr "Reembolsar"
 #. module: rma
 #: model:ir.model,name:rma.model_stock_picking
 msgid "Transfer"
-msgstr "Transferir"
+msgstr "Albarán"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
@@ -1986,8 +2000,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When customers themselves place an RMA from the portal, send an automatic "
-"notification acknowleging it."
+"When customers themselves place an RMA from the portal, send an automatic notification "
+"acknowleging it."
 msgstr ""
 
 #. module: rma
@@ -1997,22 +2011,19 @@ msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"When the RMA products are received, send an automatic information email."
+msgid "When the RMA products are received, send an automatic information email."
 msgstr ""
 
 #. 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."
+msgid "When the RMA receipt is confirmed, send a confirmation email to the customer."
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
-msgid ""
-"When the delivery is confirmed, send a confirmation email to the customer."
+msgid "When the delivery is confirmed, send a confirmation email to the customer."
 msgstr ""
 
 #. module: rma
@@ -2025,18 +2036,14 @@ msgstr "No puede eliminar RMAs que no estén en estado borrador"
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
-"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
-"be created"
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will be created"
 msgstr ""
-"Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los "
-"RMAs serán creados"
+"Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los RMAs serán creados"
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
-msgid ""
-"the user will have access to all records of everyone in the RMA application."
-msgstr ""
-"El usuario tendrá acceso a todos los registros de RMA de todos lo usuarios."
+msgid "the user will have access to all records of everyone in the RMA application."
+msgstr "El usuario tendrá acceso a todos los registros de RMA de todos lo usuarios."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_own
@@ -2051,33 +2058,3 @@ msgid ""
 msgstr ""
 "El usuario tendrá acceso a la configuración de RMA y a los informes "
 "estadísticos."
-
-#~ msgid "Not urgent"
-#~ msgstr "No Urgente"
-
-#~ msgid "Very Urgent"
-#~ msgstr "Muy Urgente"
-
-#~ msgid "If checked new messages require your attention."
-#~ msgstr "Si está marcado, hay nuevos mensajes que requieren su atención."
-
-#~ msgid "Invoice"
-#~ msgstr "Factura"
-
-#~ msgid "Invoice Line"
-#~ msgstr "Linea de factura"
-
-#~ msgid "Overdue"
-#~ msgstr "Vencidas"
-
-#~ msgid "Planned"
-#~ msgstr "Planeado"
-
-#~ msgid "Today"
-#~ msgstr "Hoy"
-
-#~ msgid "Waiting for refund"
-#~ msgstr "Esperando por reembolso"
-
-#~ msgid "New RMA in draft state"
-#~ msgstr "Nuevo RMA en estado Borrador"
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 366dd5791..1d350b859 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -6,6 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-01-21 09:33+0000\n"
+"PO-Revision-Date: 2022-01-21 09:33+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -226,11 +228,6 @@ msgstr ""
 msgid "<strong>Delivered quantity</strong>"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
-msgid "<strong>Invoicing address:</strong>"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Move:</strong>"
@@ -292,6 +289,16 @@ msgstr ""
 msgid "<strong>Responsible:</strong>"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>State:</strong>"
@@ -818,6 +825,16 @@ msgstr ""
 msgid "Invoice Address"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
diff --git a/rma/views/report_rma.xml b/rma/views/report_rma.xml
index 2442589d8..46bbd3e8d 100644
--- a/rma/views/report_rma.xml
+++ b/rma/views/report_rma.xml
@@ -15,14 +15,28 @@
                 </t>
             </t>
             <t
-                t-if="(doc.partner_id or doc.partner_invoice_id) and doc.partner_id != doc.partner_invoice_id"
+                t-if="doc.partner_shipping_id == doc.partner_invoice_id
+            and doc.partner_invoice_id != doc.partner_id
+            or doc.partner_shipping_id != doc.partner_invoice_id"
             >
-                <t t-set="information_block">
-                    <strong>Invoicing address:</strong>
-                    <div
+            <t t-set="information_block">
+                <strong
+                        t-if="doc.partner_shipping_id == doc.partner_invoice_id"
+                    >Invoicing and Shipping Address:</strong>
+                <strong
+                        t-if="doc.partner_shipping_id != doc.partner_invoice_id"
+                    >Invoicing Address:</strong>
+                <div
                         t-field="doc.partner_invoice_id"
                         t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
                     />
+                <t t-if="doc.partner_shipping_id != doc.partner_invoice_id">
+                    <strong>Shipping Address:</strong>
+                    <div
+                            t-field="doc.partner_shipping_id"
+                            t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
+                        />
+                </t>
                 </t>
             </t>
             <div class="page">
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index a102f80df..eb1b68924 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -159,6 +159,7 @@
                 <t t-set="card_body">
                     <div id="general_information">
                         <div class="row mt4">
+                            <!-- Customer -->
                             <div
                                 t-if="rma.partner_id"
                                 class="col-12 col-md-6 mb-4 mb-md-0"
@@ -189,6 +190,38 @@
                                     </div>
                                 </div>
                             </div>
+                            <!-- Shipping Address -->
+                            <div
+                                t-if="rma.partner_shipping_id"
+                                class="col-12 col-md-6 mb-4 mb-md-0"
+                            >
+                                <h6>
+                                    <strong>Shipping address:</strong>
+                                </h6>
+                                <div class="row">
+                                    <div class="col flex-grow-0 pr-3">
+                                        <img
+                                            t-if="rma.partner_shipping_id.image_1024"
+                                            class="rounded-circle mt-1 o_portal_contact_img"
+                                            t-att-src="image_data_uri(rma.partner_shipping_id.image_1024)"
+                                            alt="Contact"
+                                        />
+                                        <img
+                                            t-else=""
+                                            class="rounded-circle mt-1 o_portal_contact_img"
+                                            src="/web/static/src/img/user_menu_avatar.png"
+                                            alt="Contact"
+                                        />
+                                    </div>
+                                    <div class="col pl-sm-0">
+                                        <address
+                                            t-field="rma.partner_shipping_id"
+                                            t-options='{"widget": "contact", "fields": ["name", "email", "phone", "address"]}'
+                                        />
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- RMA Info -->
                             <div t-if="rma.user_id" class="col-12 col-md-6">
                                 <h6>
                                     <strong>Responsible:</strong>

From 3c9a6a27e6240d8d8e972b55531d4c809d59e9fa Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Tue, 25 Jan 2022 13:59:59 +0100
Subject: [PATCH 045/108] [IMP] rma: unplug test cases from declaration

This way, we can reuse them in other modules easily
---
 rma/tests/test_rma.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index ab0ca6dad..1de32523f 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -123,6 +123,8 @@ def _create_delivery(self):
         picking.button_validate()
         return picking
 
+
+class TestRmaCase(TestRma):
     def test_onchange(self):
         rma_form = Form(self.env["rma"])
         # If partner changes, the invoice address is set

From e2dd2799e503273f298fb399133a3d07ad86f97d Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Fri, 28 Jan 2022 16:50:02 +0100
Subject: [PATCH 046/108] [IMP] rma: finish RMA manually

Sometimes there's no choice to return, refund or replace an RMA for
different reasons. For example, when the customer doesn't want to repair
the product because that would be too expensive. We still want finish
the RMA and document the reasons. This improvement allows it.

TT34164
---
 rma/README.rst                               |  10 +
 rma/__manifest__.py                          |   4 +-
 rma/i18n/es.po                               | 431 +++++++++++++------
 rma/i18n/it.po                               | 160 ++++++-
 rma/i18n/nl.po                               | 157 ++++++-
 rma/i18n/pt.po                               | 160 ++++++-
 rma/i18n/pt_BR.po                            | 160 ++++++-
 rma/i18n/rma.pot                             | 134 +++++-
 rma/i18n/ro.po                               | 160 ++++++-
 rma/i18n/zh_CN.po                            | 157 ++++++-
 rma/models/__init__.py                       |   1 +
 rma/models/res_config_settings.py            |   5 +
 rma/models/rma.py                            |  35 ++
 rma/models/rma_finalization.py               |  26 ++
 rma/readme/CONFIGURE.rst                     |   5 +
 rma/readme/USAGE.rst                         |   5 +
 rma/security/ir.model.access.csv             |   4 +
 rma/security/rma_security.xml                |  12 +
 rma/static/description/index.html            |  10 +
 rma/tests/test_rma.py                        |  23 +
 rma/views/res_config_settings_views.xml      |  15 +
 rma/views/rma_finalization_views.xml         |  72 ++++
 rma/views/rma_views.xml                      |  28 ++
 rma/wizard/__init__.py                       |   1 +
 rma/wizard/rma_finalization_wizard.py        |  18 +
 rma/wizard/rma_finalization_wizard_views.xml |  34 ++
 26 files changed, 1665 insertions(+), 162 deletions(-)
 create mode 100644 rma/models/rma_finalization.py
 create mode 100644 rma/views/rma_finalization_views.xml
 create mode 100644 rma/wizard/rma_finalization_wizard.py
 create mode 100644 rma/wizard/rma_finalization_wizard_views.xml

diff --git a/rma/README.rst b/rma/README.rst
index 855d4bf96..4361cc0a9 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -51,6 +51,11 @@ If you want RMAs to be created from incoming emails, you need to:
    one.
 #. Go to 'Email' tab and set an 'Email Alias'.
 
+If you want to manually finish RMAs, you need to:
+
+#. Go to *Settings > Inventory*.
+#. Set *Finish RMAs manually* checkbox on.
+
 Usage
 =====
 
@@ -79,6 +84,11 @@ To use this module, you need to:
      The RMA will be set automatically to 'Replaced' or 'Returned' state when
      the RMA quantity is equal or lower than the quantity in done delivery
      orders linked to it.
+#. You can also finish the RMA without further ado. To do so click on the *Finish*
+   button. A wizard will ask you for the reason from a selection of preconfigured ones.
+   Be sure to configure them in advance on *RMA > Configuration > Finalization Reasons*.
+   Once the RMA is finished, it will be set to that state and the reason will be
+   registered.
 
 An RMA can also be created from a return of a delivery order:
 
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 84b39b7db..9a52e5e15 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.1.1.0",
+    "version": "14.0.2.0.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
@@ -21,9 +21,11 @@
         "security/ir.model.access.csv",
         "wizard/stock_picking_return_views.xml",
         "wizard/rma_delivery_views.xml",
+        "wizard/rma_finalization_wizard_views.xml",
         "wizard/rma_split_views.xml",
         "views/menus.xml",
         "views/res_partner_views.xml",
+        "views/rma_finalization_views.xml",
         "views/rma_portal_templates.xml",
         "views/rma_team_views.xml",
         "views/rma_views.xml",
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 195cdd26e..b932f1a02 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2022-01-17 12:39+0000\n"
 "Last-Translator: xavigutipujol <jgutierrez@pyming.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,12 +22,12 @@ msgstr ""
 #: 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 '')}"
+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 "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
+msgstr ""
 
 #. module: rma
 #: model:mail.template,subject:rma.mail_template_rma_receipt_notification
@@ -41,10 +42,11 @@ 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' })"
+"${object.company_id.name} Your RMA has been succesfully created (Ref "
+"${object.name or 'n/a' })"
 msgstr ""
-"${object.company_id.name} Su RMA se ha creado con éxito (Ref ${object.name or 'n/a' })"
+"${object.company_id.name} Su RMA se ha creado con éxito (Ref ${object.name "
+"or 'n/a' })"
 
 #. module: rma
 #: code:addons/rma/models/rma_team.py:0
@@ -62,8 +64,8 @@ msgstr ""
 #, python-format
 msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
 msgstr ""
-"<b>Asunto del correo electrónico:</b> %s<br/><br/><b>Cuerpo del correo electrónico:</b><br/"
-">%s"
+"<b>Asunto del correo electrónico:</b> %s<br/><br/><b>Cuerpo del correo "
+"electrónico:</b><br/>%s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
@@ -75,7 +77,8 @@ msgid ""
 "        (${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"
+"    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"
@@ -89,7 +92,8 @@ msgstr ""
 "        (${object.partner_id.parent_id.name})\n"
 "    % endif\n"
 "    <br/><br/>\n"
-"    Aquí tiene el RMA <strong>${object.name}</strong> Desde ${object.company_id.name}.\n"
+"    Aquí tiene el RMA <strong>${object.name}</strong> Desde ${object."
+"company_id.name}.\n"
 "    <br/><br/>\n"
 "    No dude en ponerse en contacto con nosotros si tiene alguna pregunta.\n"
 "</p>\n"
@@ -166,9 +170,12 @@ 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 ""
-"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\"Descargar\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
+"\"Descargar\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -187,60 +194,62 @@ msgstr "<i class=\"fa fa-fw fa-clock-o\"/><b>Esperando Pago</b>"
 #. 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="
-"\"Descargar\"/>"
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Descargar\"/>"
 
 #. 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=\"Descargar\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
+"\"Descargar\"/>"
 
 #. 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\"><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>"
+"<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-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>"
+"<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-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>"
+"<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-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>"
+"<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
 msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" "
-"groups=\"base.group_multi_company\"/>"
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
 msgstr ""
 
 #. module: rma
@@ -367,11 +376,11 @@ msgstr "<strong>Estado:</strong>"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
 msgid ""
-"A Python dictionary that will be evaluated to provide default values when creating new "
-"records for this alias."
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
 msgstr ""
-"Diccionario Python a evaluar para proporcionar valores por defecto cuando un nuevo "
-"registro se cree para este seudónimo."
+"Diccionario Python a evaluar para proporcionar valores por defecto cuando un "
+"nuevo registro se cree para este seudónimo."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
@@ -390,9 +399,11 @@ msgid "Action Needed"
 msgstr "Acción Necesaria"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
 #: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr "Activo"
@@ -443,7 +454,19 @@ msgid "Aliased Model"
 msgstr "Modelo con seudónimo"
 
 #. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "Archived"
 msgstr "Archivado"
 
@@ -461,7 +484,12 @@ msgstr "Conteo de archivos adjuntos"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Avatar"
-msgstr "Avatar"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
@@ -489,6 +517,7 @@ msgid "Can Be Split"
 msgstr "Puede ser dividido"
 
 #. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -538,6 +567,7 @@ msgstr "Compañías"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__company_id
 msgid "Company"
 msgstr "Compañía"
@@ -582,6 +612,11 @@ msgstr ""
 msgid "Create RMAs"
 msgstr "Crear RMAs"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr "Crear un nuevo motivo de finalización de RMA"
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid "Create a new RMA tag"
@@ -590,6 +625,8 @@ msgstr "Crear una nueva etiqueta de RMA"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
@@ -600,6 +637,8 @@ msgstr "Creado por"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
@@ -694,6 +733,8 @@ msgstr "Descripción"
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
@@ -767,7 +808,9 @@ msgstr "Enviar correo al cliente una vez se recepcionen los productos del RMA."
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
 msgid "Email sent to the customer when they place an RMA from the portal"
-msgstr "Enviar correo de confirmación al cliente una vez se tramite el RMA desde el portal"
+msgstr ""
+"Enviar correo de confirmación al cliente una vez se tramite el RMA desde el "
+"portal"
 
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
@@ -780,6 +823,46 @@ msgstr "RMA Extraído"
 msgid "Extracted from"
 msgstr "Extraído de"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr "Motivo de finalización"
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr "¡El nombre de finalización ya existe!"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr "Finalizar"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr "Finalizar RMA"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr "Finalizar RMA manualmente"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr "Finalizado"
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
@@ -817,6 +900,8 @@ msgstr "Agrupar por"
 #: model:ir.model.fields,field_description:rma.field_res_users__id
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
@@ -827,16 +912,16 @@ msgstr "Agrupar por"
 #: 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"
+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 ""
-"ID del registro padre que tiene el seudónimo. (ejemplo: el proyecto que contiene el "
-"seudónimo para la creación de tareas)"
+"ID del registro padre que tiene el seudónimo. (ejemplo: el proyecto que "
+"contiene el seudónimo para la creación de tareas)"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
@@ -874,10 +959,11 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
 msgid ""
-"If the active field is set to false, it will allow you to hide the RMA Team without "
-"removing it."
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
 msgstr ""
-"Si el campo activo se establece a Falso, permitirá ocultar El equipo de RMA sin eliminarlo."
+"Si el campo activo se establece a Falso, permitirá ocultar El equipo de RMA "
+"sin eliminarlo."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -925,6 +1011,8 @@ msgstr "Apunte contable"
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
@@ -940,6 +1028,8 @@ msgstr "Última modificación en"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
@@ -950,6 +1040,8 @@ msgstr "Última actualización por"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
@@ -983,12 +1075,22 @@ msgstr "Bloqueado"
 msgid "Main Attachment"
 msgstr "Adjuntos principales"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+"Adminitrar motivos de finalización de RMA para una mejor clasificación de "
+"estos para su seguimiento análisis posterior."
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
-msgid "Manage RMA tags to better classify them for tracking and analysis purposes."
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
 msgstr ""
-"Administrar etiquetas de RMA para clasificarlos de modo que mejore el seguimiento y "
-"análisis de los mismos."
+"Administrar etiquetas de RMA para clasificarlos de modo que mejore el "
+"seguimiento y análisis de los mismos."
 
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
@@ -1062,7 +1164,7 @@ msgstr "Ninguno de los RMAs seleccionados puede realizar una devolución."
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
 msgid "Normal"
-msgstr "Normal"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
@@ -1097,12 +1199,13 @@ msgstr "Número de mensajes no leidos"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
-"Optional ID of a thread (record) to which all incoming messages will be attached, even if "
-"they did not reply to it. If set, this will disable the creation of new records completely."
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
 msgstr ""
-"Id. opcional de un hilo (registro) al que todos los mensajes entrantes serán adjuntados, "
-"incluso si no fueron respuestas del mismo. Si se establece, se deshabilitará completamente "
-"la creación de nuevos registros."
+"Id. opcional de un hilo (registro) al que todos los mensajes entrantes serán "
+"adjuntados, incluso si no fueron respuestas del mismo. Si se establece, se "
+"deshabilitará completamente la creación de nuevos registros."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_orders_menu
@@ -1142,11 +1245,12 @@ msgstr "ID del hilo del registro padre"
 #. 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) and task (model))"
+"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 ""
-"Modelo padre que contiene el alias. El modelo que contiene la referencia alias no es "
-"necesariamente el modelo dado por alias_model_id"
+"Modelo padre que contiene el alias. El modelo que contiene la referencia "
+"alias no es necesariamente el modelo dado por alias_model_id"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -1159,13 +1263,15 @@ 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 ""
-"Política para publicar un mensaje en el documento utilizando el servidor de correo.\n"
+"Política para publicar un mensaje en el documento utilizando el servidor de "
+"correo.\n"
 "- todo el mundo: todos pueden publicar\n"
 "- socios: sólo socios autenticados\n"
-"- seguidores: sólo seguidores del documento relacionado o miembros de los siguientes "
-"canales\n"
+"- seguidores: sólo seguidores del documento relacionado o miembros de los "
+"siguientes canales\n"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_url
@@ -1224,8 +1330,12 @@ msgstr "Cantidad a extraer"
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
-msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
-msgstr "La cantidad a extraer no puede ser mayor que la cantidad de entrega restante(%s %s)"
+msgid ""
+"Quantity to extract cannot be greater than remaining delivery quantity (%s "
+"%s)"
+msgstr ""
+"La cantidad a extraer no puede ser mayor que la cantidad de entrega "
+"restante(%s %s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
@@ -1233,15 +1343,17 @@ msgid "Quantity to extract to a new RMA."
 msgstr "Cantidad a extraer en nuevo RMA."
 
 #. module: rma
-#: model:ir.actions.act_window,name:rma.rma_action model:ir.model,name:rma.model_rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
 #: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
-#: model:ir.module.category,name:rma.rma_module_category model:ir.ui.menu,name:rma.rma_menu
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
 #: model_terms:ir.ui.view,arch_db:rma.view_partner_form
 #: model_terms:ir.ui.view,arch_db:rma.view_picking_form
 msgid "RMA"
-msgstr "RMA"
+msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -1281,6 +1393,29 @@ msgstr "Órdenes de entrega de RMA"
 msgid "RMA Delivery Wizard"
 msgstr "Asistente de entrega de RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "RMA Finalization"
+msgstr "Finalización de RMA"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr "Motivo de finalización de RMA"
+
+#. module: 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 "Motivos de finalización de RMA"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr "Asistente de finalización de RMA"
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
 msgid "RMA In Type"
@@ -1291,6 +1426,11 @@ msgstr "Tipo de operación para recepción de RMA"
 msgid "RMA Location"
 msgstr "Ubicación de RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1341,7 +1481,8 @@ msgid "RMA Tag"
 msgstr "Etiqueta RMA"
 
 #. module: rma
-#: model:ir.actions.act_window,name:rma.action_rma_tag model:ir.model,name:rma.model_rma_tag
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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
@@ -1391,7 +1532,8 @@ msgstr "RMAs que originaron esta orden"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_stock_warehouse__rma
 msgid "RMA related products can be stored in this warehouse."
-msgstr "Productos relacionados con el RMA pueden ser guardados en este almacén."
+msgstr ""
+"Productos relacionados con el RMA pueden ser guardados en este almacén."
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_operation
@@ -1414,7 +1556,7 @@ msgstr "Equipo de RMA"
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
 msgid "RMAs"
-msgstr "RMAs"
+msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -1426,6 +1568,16 @@ msgstr "RMAs pasados de fecha límite"
 msgid "RMAs yet to be fully processed"
 msgstr "RMAs pendientes de ser procesados por completo"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr "Motivo"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr "Nombre del motivo"
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -1512,25 +1664,27 @@ msgstr "Reemplazado"
 #: 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=\"%d"
+"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
+"\"%d\">%s</a>) has been created."
 msgstr ""
-"Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d\">%s</"
-"a> (Orden de entrega <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
-"a>) ha sido creado."
+"Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
+"id=\"%d\">%s</a> (Orden de entrega <a href=\"#\" data-oe-model=\"stock."
+"picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
 
 #. module: rma
 #: 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."
+"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 ""
-"Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-oe-id=\"%d\">"
-"%s</a><br/>Cantidad %f %s<br/>El reemplazo realizado no creó un movimiento nuevo, pero uno "
-"de los movimientos creados anteriormente fué actualizado con estos datos."
+"Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-"
+"oe-id=\"%d\">%s</a><br/>Cantidad %f %s<br/>El reemplazo realizado no creó un "
+"movimiento nuevo, pero uno de los movimientos creados anteriormente fué "
+"actualizado con estos datos."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
@@ -1575,11 +1729,11 @@ msgstr "Devolver al cliente"
 #: 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=\"%d\">%s</"
+"a> has been created."
 msgstr ""
-"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
-"\"%d\">%s</a> ha sido creada."
+"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking"
+"\" data-oe-id=\"%d\">%s</a> ha sido creada."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1589,7 +1743,7 @@ msgstr "Devuelto"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
-msgstr "Rma"
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
@@ -1716,10 +1870,12 @@ msgstr "Dividir RMA"
 #. module: rma
 #: 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."
+msgid ""
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
+"created."
 msgstr ""
-"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> ha sido "
-"creado."
+"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</"
+"a> ha sido creado."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -1728,7 +1884,8 @@ msgid "State"
 msgstr "Estado"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:0 model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: code:addons/rma/controllers/main.py:0
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
 msgstr "Estado"
@@ -1800,44 +1957,46 @@ 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 ""
-"El modelo (Tipo de documento de Odoo) al que corresponde este seudónimo. Cualquier correo "
-"entrante que no sea respuesta a un registro existente, causará la creación de un nuevo "
-"registro de este modelo"
+"El modelo (Tipo de documento de Odoo) al que corresponde este seudónimo. "
+"Cualquier correo entrante que no sea respuesta a un registro existente, "
+"causará la creación de un nuevo registro de este modelo"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_name
 msgid ""
-"The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example."
-"odoo.com>"
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
 msgstr ""
-"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos\", si lo que "
-"quiere es obtener los correos para <trabajos@example.odoo.com>"
+"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos"
+"\", si lo que quiere es obtener los correos para <trabajos@example.odoo.com>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
 msgid ""
-"The owner of records created upon receiving emails on this alias. If this field is not set "
-"the system will attempt to find the right owner based on the sender (From) address, or "
-"will use the Administrator account if no system user is found for that address."
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
 msgstr ""
-"El propietario de los registros creados al recibir correos electrónicos en este seudónimo. "
-"Si el campo no está establecido, el sistema tratará de encontrar el propietario adecuado "
-"basado en la dirección del emisor (De), o usará la cuenta de administrador si no se "
-"encuentra un usuario para esa dirección."
+"El propietario de los registros creados al recibir correos electrónicos en "
+"este seudónimo. Si el campo no está establecido, el sistema tratará de "
+"encontrar el propietario adecuado basado en la dirección del emisor (De), o "
+"usará la cuenta de administrador si no se encuentra un usuario para esa "
+"dirección."
 
 #. module: rma
 #: 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 '%s' must be equal to its initial demand "
+"because the stock move is linked to an RMA (%s)."
 msgstr ""
-"La cantidad realizada para el producto '%s' debe ser igual a la demanda inicial porque el "
-"movimiento está enlazado a un RMA (%s)."
+"La cantidad realizada para el producto '%s' debe ser igual a la demanda "
+"inicial porque el movimiento está enlazado a un RMA (%s)."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1854,11 +2013,11 @@ msgstr "La etiqueta es visible en la vista de portal"
 #: 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 ""
-"Hay al menos una linea de factura que tiene una cantidad menor que la cantidad "
-"especificada en el RMA asociado."
+"Hay al menos una linea de factura que tiene una cantidad menor que la "
+"cantidad especificada en el RMA asociado."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -2000,8 +2159,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When customers themselves place an RMA from the portal, send an automatic notification "
-"acknowleging it."
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
 msgstr ""
 
 #. module: rma
@@ -2011,19 +2170,29 @@ msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "When the RMA products are received, send an automatic information email."
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
 msgstr ""
 
 #. 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."
+msgid ""
+"When the RMA receipt is confirmed, send a confirmation email to the customer."
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
-msgid "When the delivery is confirmed, send a confirmation email to the customer."
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
 msgstr ""
 
 #. module: rma
@@ -2036,14 +2205,18 @@ msgstr "No puede eliminar RMAs que no estén en estado borrador"
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
-"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will be created"
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
 msgstr ""
-"Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los RMAs serán creados"
+"Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los "
+"RMAs serán creados"
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
-msgid "the user will have access to all records of everyone in the RMA application."
-msgstr "El usuario tendrá acceso a todos los registros de RMA de todos lo usuarios."
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+"El usuario tendrá acceso a todos los registros de RMA de todos lo usuarios."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_own
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 4d8692643..406cdbc93 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -299,11 +299,6 @@ msgstr "<strong>Quantità consegnata:</strong>"
 msgid "<strong>Delivered quantity</strong>"
 msgstr "<strong>Quantità consegnata</strong>"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
-msgid "<strong>Invoicing address:</strong>"
-msgstr "<strong>Indirizzo di fatturazione:</strong>"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Move:</strong>"
@@ -365,6 +360,16 @@ msgstr "<strong>Note RMA:</strong>"
 msgid "<strong>Responsible:</strong>"
 msgstr "<strong>Responsabile:</strong>"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>State:</strong>"
@@ -396,9 +401,11 @@ msgid "Action Needed"
 msgstr "Azione Necessaria"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
 #: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr "Attivo"
@@ -449,7 +456,19 @@ msgid "Aliased Model"
 msgstr "Modello con alias"
 
 #. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "Archived"
 msgstr "Archiviato"
 
@@ -469,6 +488,11 @@ msgstr "Conteggio Allegati"
 msgid "Avatar"
 msgstr "Avatar"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
 msgid "Can Be Locked"
@@ -495,6 +519,7 @@ msgid "Can Be Split"
 msgstr "Può essere Diviso"
 
 #. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -544,6 +569,7 @@ msgstr "Aziende"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__company_id
 msgid "Company"
 msgstr "Azienda"
@@ -590,6 +616,11 @@ msgstr ""
 msgid "Create RMAs"
 msgstr "Crea RMA"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid "Create a new RMA tag"
@@ -598,6 +629,8 @@ msgstr "Crea una nuova Etichetta RMA"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
@@ -608,6 +641,8 @@ msgstr "Creato da"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
@@ -702,6 +737,8 @@ msgstr "Descrizione"
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
@@ -789,6 +826,46 @@ msgstr "RMA Estratto"
 msgid "Extracted from"
 msgstr "Estratto da"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
@@ -826,6 +903,8 @@ msgstr "Raggruppa per"
 #: model:ir.model.fields,field_description:rma.field_res_users__id
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
@@ -902,6 +981,16 @@ msgstr "Email in arrivo"
 msgid "Invoice Address"
 msgstr "Indirizzo di Fatturazione"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
@@ -927,6 +1016,8 @@ msgstr "Oggetto Registro"
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
@@ -942,6 +1033,8 @@ msgstr "Ultima modifica il"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
@@ -952,6 +1045,8 @@ msgstr "Ultimo aggiornamento di"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
@@ -985,6 +1080,13 @@ msgstr "Bloccato"
 msgid "Main Attachment"
 msgstr "Allegato Principale"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid ""
@@ -1289,6 +1391,29 @@ msgstr "Ordini di consegna RMA"
 msgid "RMA Delivery Wizard"
 msgstr "Wizard Consegna RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "RMA Finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr ""
+
+#. module: 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 ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
 msgid "RMA In Type"
@@ -1299,6 +1424,11 @@ msgstr "RMA nel tipo"
 msgid "RMA Location"
 msgstr "Ubicazione RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1435,6 +1565,16 @@ msgstr "RMA scaduti"
 msgid "RMAs yet to be fully processed"
 msgstr "RMA ancora da processare completamente"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -2018,6 +2158,13 @@ msgstr ""
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr "Quando l'RMA è confermato, inviare un'e-mail informativa automatica."
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
@@ -2077,3 +2224,6 @@ 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."
+
+#~ msgid "<strong>Invoicing address:</strong>"
+#~ msgstr "<strong>Indirizzo di fatturazione:</strong>"
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index 937c9de46..9fd3abb56 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -230,11 +230,6 @@ msgstr ""
 msgid "<strong>Delivered quantity</strong>"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
-msgid "<strong>Invoicing address:</strong>"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Move:</strong>"
@@ -296,6 +291,16 @@ msgstr ""
 msgid "<strong>Responsible:</strong>"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>State:</strong>"
@@ -325,9 +330,11 @@ msgid "Action Needed"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
 #: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr ""
@@ -378,7 +385,19 @@ msgid "Aliased Model"
 msgstr ""
 
 #. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "Archived"
 msgstr ""
 
@@ -398,6 +417,11 @@ msgstr ""
 msgid "Avatar"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
 msgid "Can Be Locked"
@@ -424,6 +448,7 @@ msgid "Can Be Split"
 msgstr ""
 
 #. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -473,6 +498,7 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__company_id
 msgid "Company"
 msgstr ""
@@ -517,6 +543,11 @@ msgstr ""
 msgid "Create RMAs"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid "Create a new RMA tag"
@@ -525,6 +556,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
@@ -535,6 +568,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
@@ -629,6 +664,8 @@ msgstr ""
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
@@ -715,6 +752,46 @@ msgstr ""
 msgid "Extracted from"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
@@ -752,6 +829,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_res_users__id
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
@@ -822,6 +901,16 @@ msgstr ""
 msgid "Invoice Address"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
@@ -847,6 +936,8 @@ msgstr ""
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
@@ -862,6 +953,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
@@ -872,6 +965,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
@@ -905,6 +1000,13 @@ msgstr ""
 msgid "Main Attachment"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid ""
@@ -1199,6 +1301,29 @@ msgstr ""
 msgid "RMA Delivery Wizard"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "RMA Finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr ""
+
+#. module: 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 ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
 msgid "RMA In Type"
@@ -1209,6 +1334,11 @@ msgstr ""
 msgid "RMA Location"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1345,6 +1475,16 @@ msgstr ""
 msgid "RMAs yet to be fully processed"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -1906,6 +2046,13 @@ msgstr ""
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
diff --git a/rma/i18n/pt.po b/rma/i18n/pt.po
index ddb97db38..547b4a8bc 100644
--- a/rma/i18n/pt.po
+++ b/rma/i18n/pt.po
@@ -248,11 +248,6 @@ msgstr "<strong>Quantidade Enviada:</strong>"
 msgid "<strong>Delivered quantity</strong>"
 msgstr "<strong>Quantidade Enviada</strong>"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
-msgid "<strong>Invoicing address:</strong>"
-msgstr "<strong>Endereço de Cobrança:</strong>"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Move:</strong>"
@@ -314,6 +309,16 @@ msgstr "<strong>Nota da RMA:</strong>"
 msgid "<strong>Responsible:</strong>"
 msgstr "<strong>Responsável:</strong>"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>State:</strong>"
@@ -345,9 +350,11 @@ msgid "Action Needed"
 msgstr "Ação Necessária"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
 #: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr "Ativo"
@@ -398,7 +405,19 @@ msgid "Aliased Model"
 msgstr "Modelo do Alias"
 
 #. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "Archived"
 msgstr ""
 
@@ -418,6 +437,11 @@ msgstr "Número de Anexos"
 msgid "Avatar"
 msgstr "Avatar"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
 msgid "Can Be Locked"
@@ -444,6 +468,7 @@ msgid "Can Be Split"
 msgstr "Pode Ser Dividido"
 
 #. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -493,6 +518,7 @@ msgstr "Empresas"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__company_id
 msgid "Company"
 msgstr "Empresa"
@@ -537,6 +563,11 @@ msgstr ""
 msgid "Create RMAs"
 msgstr "Criar RMAs"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid "Create a new RMA tag"
@@ -545,6 +576,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
@@ -555,6 +588,8 @@ msgstr "Criado Por"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
@@ -649,6 +684,8 @@ msgstr "Descrição"
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
@@ -735,6 +772,46 @@ msgstr "RMA Extraído"
 msgid "Extracted from"
 msgstr "Extraído de"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
@@ -772,6 +849,8 @@ msgstr "Agrupado Por"
 #: model:ir.model.fields,field_description:rma.field_res_users__id
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
@@ -846,6 +925,16 @@ msgstr "E-mail recebido"
 msgid "Invoice Address"
 msgstr "Endereço de Fatura"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
@@ -871,6 +960,8 @@ msgstr ""
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
@@ -886,6 +977,8 @@ msgstr "Última Modificação Em"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
@@ -896,6 +989,8 @@ msgstr "Última Atualiz. por"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
@@ -929,6 +1024,13 @@ msgstr "Bloqueada"
 msgid "Main Attachment"
 msgstr "Anexo Principal"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid ""
@@ -1236,6 +1338,29 @@ msgstr "Pedidos de Entrega RMA"
 msgid "RMA Delivery Wizard"
 msgstr "Assistente de Entrega RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "RMA Finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr ""
+
+#. module: 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 ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
 msgid "RMA In Type"
@@ -1246,6 +1371,11 @@ msgstr "Tipo Entrada RMA"
 msgid "RMA Location"
 msgstr "Localização RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1382,6 +1512,16 @@ msgstr "RMAs cujo prazo já passou"
 msgid "RMAs yet to be fully processed"
 msgstr "RMAs não totalmente processados"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -1971,6 +2111,13 @@ msgstr ""
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr "Quando a RMA é confirmada, enviar um e-mail automático de informação."
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
@@ -2029,3 +2176,6 @@ msgid ""
 msgstr ""
 "o utilizador terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
+
+#~ msgid "<strong>Invoicing address:</strong>"
+#~ msgstr "<strong>Endereço de Cobrança:</strong>"
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index c36a6bbef..b16a20399 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -246,11 +246,6 @@ msgstr "<strong>Quantidade Enviada:</strong>"
 msgid "<strong>Delivered quantity</strong>"
 msgstr "<strong>Quantidade Enviada</strong>"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
-msgid "<strong>Invoicing address:</strong>"
-msgstr "<strong>Endereço de Cobrança:</strong>"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Move:</strong>"
@@ -312,6 +307,16 @@ msgstr "<strong>Comentário do RMA:</strong>"
 msgid "<strong>Responsible:</strong>"
 msgstr "<strong>Responsável:</strong>"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>State:</strong>"
@@ -343,9 +348,11 @@ msgid "Action Needed"
 msgstr "Ação Necessária"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
 #: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr "Ativar/Ativo(a)"
@@ -396,7 +403,19 @@ msgid "Aliased Model"
 msgstr "Modelo do Alias"
 
 #. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "Archived"
 msgstr ""
 
@@ -416,6 +435,11 @@ msgstr "Contagem de Anexos"
 msgid "Avatar"
 msgstr "Avatar"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
 msgid "Can Be Locked"
@@ -442,6 +466,7 @@ msgid "Can Be Split"
 msgstr "Pode Ser Dividido"
 
 #. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -491,6 +516,7 @@ msgstr "Empresas"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__company_id
 msgid "Company"
 msgstr "Empresa"
@@ -535,6 +561,11 @@ msgstr ""
 msgid "Create RMAs"
 msgstr "Criar RMAs"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid "Create a new RMA tag"
@@ -543,6 +574,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
@@ -553,6 +586,8 @@ msgstr "Criado Por"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
@@ -647,6 +682,8 @@ msgstr "Descrição"
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
@@ -733,6 +770,46 @@ msgstr "RMA Extraído"
 msgid "Extracted from"
 msgstr "Extraído de"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
@@ -770,6 +847,8 @@ msgstr "Agrupado Por"
 #: model:ir.model.fields,field_description:rma.field_res_users__id
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
@@ -844,6 +923,16 @@ msgstr "E-mail recebido"
 msgid "Invoice Address"
 msgstr "Endereço de Faturamento"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
@@ -869,6 +958,8 @@ msgstr ""
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
@@ -884,6 +975,8 @@ msgstr "Última Modificação Feita em"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
@@ -894,6 +987,8 @@ msgstr "Última Atualização Feita por"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
@@ -927,6 +1022,13 @@ msgstr "Travado"
 msgid "Main Attachment"
 msgstr "Anexo Principal"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid ""
@@ -1234,6 +1336,29 @@ msgstr "Pedidos de Entrega RMA"
 msgid "RMA Delivery Wizard"
 msgstr "Assistente de Entrega RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "RMA Finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr ""
+
+#. module: 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 ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
 msgid "RMA In Type"
@@ -1244,6 +1369,11 @@ msgstr "Tipo Entrada RMA"
 msgid "RMA Location"
 msgstr "Localização RMA"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1380,6 +1510,16 @@ msgstr ""
 msgid "RMAs yet to be fully processed"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -1969,6 +2109,13 @@ msgstr ""
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
@@ -2025,6 +2172,9 @@ msgstr ""
 "o usuário terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
 
+#~ msgid "<strong>Invoicing address:</strong>"
+#~ msgstr "<strong>Endereço de Cobrança:</strong>"
+
 #~ msgid "Not urgent"
 #~ msgstr "Não é urgente"
 
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 1d350b859..5f5a30e00 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -6,8 +6,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-21 09:33+0000\n"
-"PO-Revision-Date: 2022-01-21 09:33+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -328,9 +326,11 @@ msgid "Action Needed"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
 #: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr ""
@@ -381,7 +381,19 @@ msgid "Aliased Model"
 msgstr ""
 
 #. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "Archived"
 msgstr ""
 
@@ -401,6 +413,11 @@ msgstr ""
 msgid "Avatar"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
 msgid "Can Be Locked"
@@ -427,6 +444,7 @@ msgid "Can Be Split"
 msgstr ""
 
 #. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -476,6 +494,7 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__company_id
 msgid "Company"
 msgstr ""
@@ -520,6 +539,11 @@ msgstr ""
 msgid "Create RMAs"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid "Create a new RMA tag"
@@ -528,6 +552,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
@@ -538,6 +564,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
@@ -632,6 +660,8 @@ msgstr ""
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
@@ -718,6 +748,46 @@ msgstr ""
 msgid "Extracted from"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
@@ -755,6 +825,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_res_users__id
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
@@ -860,6 +932,8 @@ msgstr ""
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
@@ -875,6 +949,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
@@ -885,6 +961,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
@@ -918,6 +996,13 @@ msgstr ""
 msgid "Main Attachment"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid ""
@@ -1212,6 +1297,29 @@ msgstr ""
 msgid "RMA Delivery Wizard"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "RMA Finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr ""
+
+#. module: 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 ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
 msgid "RMA In Type"
@@ -1222,6 +1330,11 @@ msgstr ""
 msgid "RMA Location"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1358,6 +1471,16 @@ msgstr ""
 msgid "RMAs yet to be fully processed"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -1919,6 +2042,13 @@ msgstr ""
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index eeb7d371a..3429a2d45 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -265,11 +265,6 @@ msgstr "<strong>Cant livrată:</strong>"
 msgid "<strong>Delivered quantity</strong>"
 msgstr "<strong>Cantitate livrată</strong>"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
-msgid "<strong>Invoicing address:</strong>"
-msgstr "<strong>Adresă facturare:</strong>"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Move:</strong>"
@@ -331,6 +326,16 @@ msgstr "<strong>Notă retur:</strong>"
 msgid "<strong>Responsible:</strong>"
 msgstr "<strong>Responsabil:</strong>"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>State:</strong>"
@@ -362,9 +367,11 @@ msgid "Action Needed"
 msgstr "Acțiune necesară"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
 #: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr "Activ"
@@ -415,7 +422,19 @@ msgid "Aliased Model"
 msgstr ""
 
 #. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "Archived"
 msgstr ""
 
@@ -435,6 +454,11 @@ msgstr ""
 msgid "Avatar"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
 msgid "Can Be Locked"
@@ -461,6 +485,7 @@ msgid "Can Be Split"
 msgstr "Poate fi divizat"
 
 #. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -510,6 +535,7 @@ msgstr "Companii"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__company_id
 msgid "Company"
 msgstr "Companie"
@@ -554,6 +580,11 @@ msgstr ""
 msgid "Create RMAs"
 msgstr "Creați cerere retur"
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid "Create a new RMA tag"
@@ -562,6 +593,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
@@ -572,6 +605,8 @@ msgstr "Creat de"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
@@ -666,6 +701,8 @@ msgstr "Descriere"
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
@@ -752,6 +789,46 @@ msgstr ""
 msgid "Extracted from"
 msgstr "Extras din"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
@@ -789,6 +866,8 @@ msgstr "Grupează după"
 #: model:ir.model.fields,field_description:rma.field_res_users__id
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
@@ -861,6 +940,16 @@ msgstr "E-mail primite"
 msgid "Invoice Address"
 msgstr "Adresă facurare"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
@@ -886,6 +975,8 @@ msgstr ""
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
@@ -901,6 +992,8 @@ msgstr "Ultima modificare în"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
@@ -911,6 +1004,8 @@ msgstr "Ultima modificare de"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
@@ -944,6 +1039,13 @@ msgstr "Închis"
 msgid "Main Attachment"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid ""
@@ -1246,6 +1348,29 @@ msgstr "Comenzi livrare"
 msgid "RMA Delivery Wizard"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "RMA Finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr ""
+
+#. module: 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 ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
 msgid "RMA In Type"
@@ -1256,6 +1381,11 @@ msgstr ""
 msgid "RMA Location"
 msgstr "Locație"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1392,6 +1522,16 @@ msgstr ""
 msgid "RMAs yet to be fully processed"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -1962,6 +2102,13 @@ msgstr ""
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
@@ -2016,6 +2163,9 @@ msgid ""
 "reports."
 msgstr ""
 
+#~ msgid "<strong>Invoicing address:</strong>"
+#~ msgstr "<strong>Adresă facturare:</strong>"
+
 #~ msgid "Not urgent"
 #~ msgstr "Nu e urgent"
 
diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
index 0a8357e94..b23a36f98 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -232,11 +232,6 @@ msgstr ""
 msgid "<strong>Delivered quantity</strong>"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
-msgid "<strong>Invoicing address:</strong>"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Move:</strong>"
@@ -298,6 +293,16 @@ msgstr ""
 msgid "<strong>Responsible:</strong>"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>State:</strong>"
@@ -327,9 +332,11 @@ msgid "Action Needed"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
 #: model:ir.model.fields,field_description:rma.field_rma_operation__active
 #: model:ir.model.fields,field_description:rma.field_rma_tag__active
 #: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "Active"
 msgstr ""
@@ -380,7 +387,19 @@ msgid "Aliased Model"
 msgstr ""
 
 #. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "Archived"
 msgstr ""
 
@@ -400,6 +419,11 @@ msgstr ""
 msgid "Avatar"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
 msgid "Can Be Locked"
@@ -426,6 +450,7 @@ msgid "Can Be Split"
 msgstr ""
 
 #. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -475,6 +500,7 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__company_id
 msgid "Company"
 msgstr ""
@@ -519,6 +545,11 @@ msgstr ""
 msgid "Create RMAs"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid "Create a new RMA tag"
@@ -527,6 +558,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
@@ -537,6 +570,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
@@ -631,6 +666,8 @@ msgstr ""
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
 #: 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
@@ -717,6 +754,46 @@ msgstr ""
 msgid "Extracted from"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
@@ -754,6 +831,8 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_res_users__id
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_operation__id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__id
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
@@ -824,6 +903,16 @@ msgstr ""
 msgid "Invoice Address"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
@@ -849,6 +938,8 @@ msgstr ""
 #: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
 #: 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
@@ -864,6 +955,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
@@ -874,6 +967,8 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
@@ -907,6 +1002,13 @@ msgstr ""
 msgid "Main Attachment"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid ""
@@ -1201,6 +1303,29 @@ msgstr ""
 msgid "RMA Delivery Wizard"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "RMA Finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr ""
+
+#. module: 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 ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
 msgid "RMA In Type"
@@ -1211,6 +1336,11 @@ msgstr ""
 msgid "RMA Location"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1347,6 +1477,16 @@ msgstr ""
 msgid "RMAs yet to be fully processed"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
@@ -1908,6 +2048,13 @@ msgstr ""
 msgid "When the RMA is confirmed, send an automatic information email."
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
diff --git a/rma/models/__init__.py b/rma/models/__init__.py
index cc2109239..0436117f4 100644
--- a/rma/models/__init__.py
+++ b/rma/models/__init__.py
@@ -2,6 +2,7 @@
 
 from . import account_move
 from . import rma
+from . import rma_finalization
 from . import rma_operation
 from . import rma_tag
 from . import rma_team
diff --git a/rma/models/res_config_settings.py b/rma/models/res_config_settings.py
index c48d324ed..7eae1ded7 100644
--- a/rma/models/res_config_settings.py
+++ b/rma/models/res_config_settings.py
@@ -6,6 +6,11 @@
 class ResConfigSettings(models.TransientModel):
     _inherit = "res.config.settings"
 
+    group_rma_manual_finalization = fields.Boolean(
+        string="Finish RMA manually choosing a reason",
+        help="Allow to finish an RMA without returning back a product or refunding",
+        implied_group="rma.group_rma_manual_finalization",
+    )
     send_rma_confirmation = fields.Boolean(
         related="company_id.send_rma_confirmation",
         readonly=False,
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 172d9fa5d..c84036b3a 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -67,6 +67,14 @@ def _domain_location_id(self):
         states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
     )
     tag_ids = fields.Many2many(comodel_name="rma.tag", string="Tags")
+    finalization_id = fields.Many2one(
+        string="Finalization Reason",
+        comodel_name="rma.finalization",
+        copy=False,
+        readonly=True,
+        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+        tracking=True,
+    )
     company_id = fields.Many2one(
         comodel_name="res.company",
         default=lambda self: self.env.company,
@@ -171,6 +179,7 @@ def _domain_location_id(self):
             ("refunded", "Refunded"),
             ("returned", "Returned"),
             ("replaced", "Replaced"),
+            ("finished", "Finished"),
             ("locked", "Locked"),
             ("cancelled", "Canceled"),
         ],
@@ -245,6 +254,9 @@ def _domain_location_id(self):
     can_be_locked = fields.Boolean(
         compute="_compute_can_be_locked",
     )
+    can_be_finished = fields.Boolean(
+        compute="_compute_can_be_finished",
+    )
     remaining_qty = fields.Float(
         string="Remaining delivered qty",
         digits="Product Unit of Measure",
@@ -388,6 +400,14 @@ def _compute_can_be_replaced(self):
                 "replaced",
             ]
 
+    @api.depends("state", "remaining_qty")
+    def _compute_can_be_finished(self):
+        for rma in self:
+            rma.can_be_finished = (
+                rma.state in {"received", "waiting_replacement", "waiting_return"}
+                and rma.remaining_qty > 0
+            )
+
     @api.depends("product_uom_qty", "state", "remaining_qty", "remaining_qty_to_done")
     def _compute_can_be_split(self):
         """Compute 'can_be_split'. This field controls the
@@ -718,6 +738,21 @@ def action_split(self):
         action["context"].update(active_id=self.id, active_ids=self.ids)
         return action
 
+    def action_finish(self):
+        """Invoked when a user wants to manually finalize the RMA"""
+        self.ensure_one()
+        self._ensure_can_be_returned()
+        # Force active_id to avoid issues when coming from smart buttons
+        # in other models
+        action = (
+            self.env.ref("rma.rma_finalization_wizard_action")
+            .with_context(active_id=self.id)
+            .read()[0]
+        )
+        action["context"] = dict(self.env.context)
+        action["context"].update(active_id=self.id, active_ids=self.ids)
+        return action
+
     def action_cancel(self):
         """Invoked when 'Cancel' button in rma form view is clicked."""
         self.mapped("reception_move_id")._action_cancel()
diff --git a/rma/models/rma_finalization.py b/rma/models/rma_finalization.py
new file mode 100644
index 000000000..46b50b2c8
--- /dev/null
+++ b/rma/models/rma_finalization.py
@@ -0,0 +1,26 @@
+# Copyright 2022 Tecnativa - David Vidal
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class RmaFinalization(models.Model):
+    _description = "RMA Finalization Reason"
+    _name = "rma.finalization"
+    _order = "name"
+
+    active = fields.Boolean(default=True)
+    name = fields.Char(
+        string="Reason Name",
+        required=True,
+        translate=True,
+        copy=False,
+    )
+    company_id = fields.Many2one(comodel_name="res.company")
+
+    _sql_constraints = [
+        (
+            "name_company_uniq",
+            "unique (name, company_id)",
+            "Finalization name already exists !",
+        ),
+    ]
diff --git a/rma/readme/CONFIGURE.rst b/rma/readme/CONFIGURE.rst
index c55130468..94121f649 100644
--- a/rma/readme/CONFIGURE.rst
+++ b/rma/readme/CONFIGURE.rst
@@ -6,3 +6,8 @@ If you want RMAs to be created from incoming emails, you need to:
 #. Go to *RMA > Configuration > RMA Team* and select a team or create a new
    one.
 #. Go to 'Email' tab and set an 'Email Alias'.
+
+If you want to manually finish RMAs, you need to:
+
+#. Go to *Settings > Inventory*.
+#. Set *Finish RMAs manually* checkbox on.
diff --git a/rma/readme/USAGE.rst b/rma/readme/USAGE.rst
index aa524e7a0..1381ebc45 100644
--- a/rma/readme/USAGE.rst
+++ b/rma/readme/USAGE.rst
@@ -23,6 +23,11 @@ To use this module, you need to:
      The RMA will be set automatically to 'Replaced' or 'Returned' state when
      the RMA quantity is equal or lower than the quantity in done delivery
      orders linked to it.
+#. You can also finish the RMA without further ado. To do so click on the *Finish*
+   button. A wizard will ask you for the reason from a selection of preconfigured ones.
+   Be sure to configure them in advance on *RMA > Configuration > Finalization Reasons*.
+   Once the RMA is finished, it will be set to that state and the reason will be
+   registered.
 
 An RMA can also be created from a return of a delivery order:
 
diff --git a/rma/security/ir.model.access.csv b/rma/security/ir.model.access.csv
index 911c8d53f..1a264c1b0 100644
--- a/rma/security/ir.model.access.csv
+++ b/rma/security/ir.model.access.csv
@@ -10,3 +10,7 @@ access_rma_tag_user_own,rma.tag.user.own,model_rma_tag,rma_group_user_own,1,0,0,
 access_rma_tag_manager,rma.tag.manager,model_rma_tag,rma_group_manager,1,1,1,1
 access_rma_delivery_wizard_user_all,rma.delivery.wizard.user.all,model_rma_delivery_wizard,rma_group_user_all,1,1,1,1
 access_rma_split_wizard_user_all,rma.split.wizard.user.all,model_rma_split_wizard,rma_group_user_all,1,1,1,1
+access_rma_finalization_portal,rma.finalization.portal,model_rma_finalization,base.group_portal,1,0,0,0
+access_rma_finalization_user_own,rma.finalization.user.own,model_rma_finalization,rma_group_user_own,1,0,0,0
+access_rma_finalization_manager,rma.finalization.manager,model_rma_finalization,rma_group_manager,1,1,1,1
+access_rma_finalization_wizard_user_own,rma.finalization.wizard.user.own,model_rma_finalization_wizard,rma_group_user_own,1,0,0,0
diff --git a/rma/security/rma_security.xml b/rma/security/rma_security.xml
index e7c422899..f9c3ad48c 100644
--- a/rma/security/rma_security.xml
+++ b/rma/security/rma_security.xml
@@ -38,6 +38,10 @@
             eval="[(4, ref('base.user_root')), (4, ref('base.user_admin'))]"
         />
     </record>
+    <record id="group_rma_manual_finalization" model="res.groups">
+        <field name="name">Allow RMA manual finalization</field>
+        <field name="category_id" ref="base.module_category_hidden" />
+    </record>
     <!-- Record Rules -->
     <record id="rma_rule_user_own" model="ir.rule">
         <field name="name">Personal RMAs</field>
@@ -79,6 +83,14 @@
             name="domain_force"
         >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
     </record>
+    <record id="rma_finalization_comp_rule" model="ir.rule">
+        <field name="name">RMA Finalization Reason multi-company</field>
+        <field name="model_id" ref="model_rma_finalization" />
+        <field name="global" eval="True" />
+        <field
+            name="domain_force"
+        > ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
+    </record>
     <!-- New users will belong to rma_group_user_own  -->
     <record id="base.default_user" model="res.users">
         <field name="groups_id" eval="[(4, ref('rma_group_user_own'))]" />
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index 2fbf341ff..a14bb780e 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -401,6 +401,11 @@ <h1><a class="toc-backref" href="#id1">Configuration</a></h1>
 one.</li>
 <li>Go to ‘Email’ tab and set an ‘Email Alias’.</li>
 </ol>
+<p>If you want to manually finish RMAs, you need to:</p>
+<ol class="arabic simple">
+<li>Go to <em>Settings &gt; Inventory</em>.</li>
+<li>Set <em>Finish RMAs manually</em> checkbox on.</li>
+</ol>
 </div>
 <div class="section" id="usage">
 <h1><a class="toc-backref" href="#id2">Usage</a></h1>
@@ -430,6 +435,11 @@ <h1><a class="toc-backref" href="#id2">Usage</a></h1>
 orders linked to it.</li>
 </ul>
 </li>
+<li>You can also finish the RMA without further ado. To do so click on the <em>Finish</em>
+button. A wizard will ask you for the reason from a selection of preconfigured ones.
+Be sure to configure them in advance on <em>RMA &gt; Configuration &gt; Finalization Reasons</em>.
+Once the RMA is finished, it will be set to that state and the reason will be
+registered.</li>
 </ol>
 <p>An RMA can also be created from a return of a delivery order:</p>
 <ol class="arabic simple">
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 1de32523f..32243cdb5 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -50,6 +50,13 @@ def setUpClass(cls):
                 "type": "delivery",
             }
         )
+        cls.finalization_reason_1 = cls.env["rma.finalization"].create(
+            {"name": "[Test] It can't be repaired and customer doesn't want it"}
+        )
+        cls.finalization_reason_2 = cls.env["rma.finalization"].create(
+            {"name": "[Test] It's out of warranty. To be scrapped"}
+        )
+        cls.env.ref("rma.group_rma_manual_finalization").users |= cls.env.user
 
     def _create_rma(self, partner=None, product=None, qty=None, location=None):
         rma_form = Form(self.env["rma"])
@@ -502,6 +509,22 @@ def test_return_to_customer(self):
         self.assertFalse(rma.can_be_replaced)
         self._test_readonly_fields(rma)
 
+    def test_finish_rma(self):
+        # Create, confirm and receive an RMA
+        rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
+        rma.action_finish()
+        finalization_form = Form(
+            self.env["rma.finalization.wizard"].with_context(
+                active_ids=rma.ids,
+                rma_finalization_type="replace",
+            )
+        )
+        finalization_form.finalization_id = self.finalization_reason_2
+        finalization_wizard = finalization_form.save()
+        finalization_wizard.action_finish()
+        self.assertEqual(rma.state, "finished")
+        self.assertEqual(rma.finalization_id, self.finalization_reason_2)
+
     def test_mass_return_to_customer(self):
         # Create, confirm and receive rma_1
         rma_1 = self._create_confirm_receive(
diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index 423dff2dd..7e6abfc6d 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -8,6 +8,21 @@
                 expr="//div[@data-key='stock']/div[hasclass('o_settings_container')]"
                 position="inside"
             >
+                <div class="col-12 col-lg-6 o_setting_box" title="Finish RMAs manually">
+                    <div class="o_setting_left_pane">
+                        <field name="group_rma_manual_finalization" />
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label
+                            for="group_rma_manual_finalization"
+                            string="RMA Manual Finalization"
+                        />
+                        <div class="text-muted">
+                            When the RMA is receive, allow to finsish it manually choosing
+                            a finalization reason.
+                        </div>
+                    </div>
+                </div>
                 <div
                     class="col-12 col-lg-6 o_setting_box"
                     title="Send automatic RMA info to customer"
diff --git a/rma/views/rma_finalization_views.xml b/rma/views/rma_finalization_views.xml
new file mode 100644
index 000000000..ce0fb51c1
--- /dev/null
+++ b/rma/views/rma_finalization_views.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="rma_finalization_view_search" model="ir.ui.view">
+        <field name="model">rma.finalization</field>
+        <field name="arch" type="xml">
+            <search string="RMA Finalization Reasons">
+                <field name="name" />
+                <filter
+                    string="Archived"
+                    name="inactive"
+                    domain="[('active','=',False)]"
+                />
+                <filter
+                    string="Active"
+                    name="active"
+                    domain="[('active','!=',False)]"
+                />
+            </search>
+        </field>
+    </record>
+    <record id="view_rma_finalization_form" model="ir.ui.view">
+        <field name="name">Rma Finalization Reasons</field>
+        <field name="model">rma.finalization</field>
+        <field name="arch" type="xml">
+            <form string="RMA Finalization">
+                <sheet>
+                    <widget
+                        name="web_ribbon"
+                        title="Archived"
+                        bg_color="bg-danger"
+                        attrs="{'invisible': [('active', '=', True)]}"
+                    />
+                    <group>
+                        <field name="name" />
+                        <field name="company_id" groups="base.group_multi_company" />
+                        <field name="active" invisible="1" />
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record id="view_rma_finalization_list" model="ir.ui.view">
+        <field name="name">RMA Finalization Reasons</field>
+        <field name="model">rma.finalization</field>
+        <field eval="6" name="priority" />
+        <field name="arch" type="xml">
+            <tree string="RMA Finalization Reasons">
+                <field name="name" />
+                <field name="company_id" groups="base.group_multi_company" />
+            </tree>
+        </field>
+    </record>
+    <record id="action_rma_finalization" model="ir.actions.act_window">
+        <field name="name">RMA Finalization Reasons</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">rma.finalization</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+            Create a new RMA finalization
+            </p><p>
+            Manage RMA finalization reasons to better classify them for tracking and analysis purposes.
+            </p>
+        </field>
+    </record>
+    <menuitem
+        id="rma_configuration_rma_finalization_menu"
+        name="RMA Finalization Reasons"
+        parent="rma_configuration_menu"
+        action="action_rma_finalization"
+        groups="rma.group_rma_manual_finalization"
+    />
+</odoo>
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 4f8496c04..b562d8074 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -98,6 +98,7 @@
                 <field name="product_uom" groups="uom.group_uom" />
                 <field name="date" />
                 <field name="deadline" />
+                <field name="finalization_id" optional="hide" />
                 <field name="state" />
             </tree>
         </field>
@@ -281,6 +282,10 @@
                             />
                             <field name="origin" />
                             <field name="operation_id" />
+                            <field
+                                name="finalization_id"
+                                attrs="{'invisible': [('state', '!=', 'finished')]}"
+                            />
                             <field
                                 name="company_id"
                                 options="{'no_create': True}"
@@ -321,6 +326,7 @@
                     <field name="can_be_replaced" invisible="1" />
                     <field name="can_be_split" invisible="1" />
                     <field name="can_be_locked" invisible="1" />
+                    <field name="can_be_finished" invisible="1" />
                     <field name="commercial_partner_id" invisible="1" />
                     <field name="remaining_qty" invisible="1" />
                 </sheet>
@@ -332,6 +338,28 @@
             </form>
         </field>
     </record>
+    <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']"
+                position="before"
+            >
+                <button
+                    type="object"
+                    string="Finish"
+                    name="action_finish"
+                    class="btn-primary"
+                    attrs="{'invisible': [('can_be_finished', '=', False)]}"
+                />
+            </xpath>
+        </field>
+    </record>
     <record id="rma_view_pivot" model="ir.ui.view">
         <field name="name">rma.pivot</field>
         <field name="model">rma</field>
diff --git a/rma/wizard/__init__.py b/rma/wizard/__init__.py
index b81a7402c..bf23dcae4 100644
--- a/rma/wizard/__init__.py
+++ b/rma/wizard/__init__.py
@@ -1,5 +1,6 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from . import rma_delivery
+from . import rma_finalization_wizard
 from . import rma_split
 from . import stock_picking_return
diff --git a/rma/wizard/rma_finalization_wizard.py b/rma/wizard/rma_finalization_wizard.py
new file mode 100644
index 000000000..e05162523
--- /dev/null
+++ b/rma/wizard/rma_finalization_wizard.py
@@ -0,0 +1,18 @@
+# Copyright 2022 Tecnativa - David Vidal
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class RmaFinalizationWizard(models.TransientModel):
+    _name = "rma.finalization.wizard"
+    _description = "RMA Finalization Wizard"
+
+    finalization_id = fields.Many2one(
+        comodel_name="rma.finalization", string="Reason", required=True
+    )
+
+    def action_finish(self):
+        self.ensure_one()
+        rma_ids = self.env.context.get("active_ids")
+        rma = self.env["rma"].browse(rma_ids)
+        rma.write({"finalization_id": self.finalization_id, "state": "finished"})
diff --git a/rma/wizard/rma_finalization_wizard_views.xml b/rma/wizard/rma_finalization_wizard_views.xml
new file mode 100644
index 000000000..26363c077
--- /dev/null
+++ b/rma/wizard/rma_finalization_wizard_views.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2022 Tecnativa - David Vidal
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record id="rma_finalization_wizard_view_form" model="ir.ui.view">
+        <field name="model">rma.finalization.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <group>
+                    <group>
+                        <field name="finalization_id" />
+                    </group>
+                </group>
+                <footer>
+                    <button
+                        name="action_finish"
+                        string="Finish RMA"
+                        type="object"
+                        class="btn-primary"
+                    />
+                    <button string="Cancel" class="btn-secondary" special="cancel" />
+                </footer>
+            </form>
+        </field>
+    </record>
+    <record id="rma_finalization_wizard_action" model="ir.actions.act_window">
+        <field name="name">Finish RMA Manualy</field>
+        <field name="res_model">rma.finalization.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="binding_model_id" ref="rma.model_rma" />
+        <field name="binding_view_types">list</field>
+        <field name="target">new</field>
+    </record>
+</odoo>

From 79d0fcff4557259fee67a2184e8b06670a50d9eb Mon Sep 17 00:00:00 2001
From: Florian da Costa <florian.dacosta@akretion.com>
Date: Mon, 7 Feb 2022 09:49:55 +0100
Subject: [PATCH 047/108] [FIX] Do not link reception and delivery move in case
 of RMA replacement

---
 rma/models/rma.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index c84036b3a..b9a40607b 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1164,7 +1164,6 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
         self._action_launch_stock_rule(scheduled_date, warehouse, product, qty, uom)
         new_move = self.delivery_move_ids - moves_before
         if new_move:
-            self.reception_move_id.move_dest_ids = [(4, new_move.id)]
             self.message_post(
                 body=_(
                     "Replacement: "

From a6e66c8188e16cf4082d6f4bdd84ff4a6b37b74c Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Tue, 15 Mar 2022 10:21:34 +0100
Subject: [PATCH 048/108] [FIX] rma: name column width in tree view

In the tree view, the RMA code (`name` field) tends to lose in the
column width share. The result is will be the trimming of the reference
with ellipsis (...).

As this is very relevant information, we want to ensure a minimum width
for such reference.

TT35107
---
 rma/__manifest__.py     | 2 +-
 rma/views/rma_views.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 9a52e5e15..0cb14a172 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.2.0.0",
+    "version": "14.0.2.1.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index b562d8074..934b7f755 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -89,7 +89,7 @@
                 decoration-bf="state == 'draft' and product_id == False"
                 decoration-danger="deadline and (deadline &lt; current_date)"
             >
-                <field name="name" />
+                <field name="name" width="100px" />
                 <field name="origin" />
                 <field name="user_id" />
                 <field name="partner_id" />

From 2ef03ea3f1083054974b95e8ec020bfa30e4332c Mon Sep 17 00:00:00 2001
From: Francesco Foresti <francesco.foresti@ooops404.com>
Date: Wed, 23 Mar 2022 09:21:01 +0000
Subject: [PATCH 049/108] Translated using Weblate (Italian)

Currently translated at 99.1% (343 of 346 strings)

Translation: rma-14.0/rma-14.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-14-0/rma-14-0-rma/it/
---
 rma/i18n/it.po | 59 +++++++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 406cdbc93..e7647f40f 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-12-10 17:39+0000\n"
+"PO-Revision-Date: 2022-03-23 12:17+0000\n"
 "Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -363,12 +363,12 @@ msgstr "<strong>Responsabile:</strong>"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Shipping Address:</strong>"
-msgstr ""
+msgstr "<strong>Indirizzo di consegna:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong>Shipping address:</strong>"
-msgstr ""
+msgstr "<strong>Indirizzo di consegna:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
@@ -458,12 +458,12 @@ msgstr "Modello con alias"
 #. module: rma
 #: model:res.groups,name:rma.group_rma_manual_finalization
 msgid "Allow RMA manual finalization"
-msgstr ""
+msgstr "Permetti chiusura manuale RMA"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
 msgid "Allow to finish an RMA without returning back a product or refunding"
-msgstr ""
+msgstr "Permetti di chiudere un RMA senza restituire un prodotto o rimborso"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
@@ -491,7 +491,7 @@ msgstr "Avatar"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
 msgid "Can Be Finished"
-msgstr ""
+msgstr "Può essere chiuso"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
@@ -539,7 +539,7 @@ msgstr "Categoria"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 msgid "Category UoM"
-msgstr ""
+msgstr "Categoria UdM"
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
@@ -619,7 +619,7 @@ msgstr "Crea RMA"
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid "Create a new RMA finalization"
-msgstr ""
+msgstr "Crea una nuova chiusura RMA"
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
@@ -829,42 +829,42 @@ msgstr "Estratto da"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__finalization_id
 msgid "Finalization Reason"
-msgstr ""
+msgstr "Motivo chiusura"
 
 #. module: rma
 #: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
 msgid "Finalization name already exists !"
-msgstr ""
+msgstr "Esiste già questo nome per la chiusura!"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
 msgid "Finish"
-msgstr ""
+msgstr "Chiudi"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
 msgid "Finish RMA"
-msgstr ""
+msgstr "Chiudi RMA"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
 msgid "Finish RMA Manualy"
-msgstr ""
+msgstr "Chiudi RMA manualmente"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
 msgid "Finish RMA manually choosing a reason"
-msgstr ""
+msgstr "Chiudi RMA manualmente indicando un motivo"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Finish RMAs manually"
-msgstr ""
+msgstr "Chiudi RMAs manualmente"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
-msgstr ""
+msgstr "Chiuso"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
@@ -984,12 +984,12 @@ msgstr "Indirizzo di Fatturazione"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "Invoicing Address:"
-msgstr ""
+msgstr "Indirizzo di fatturazione:"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "Invoicing and Shipping Address:"
-msgstr ""
+msgstr "Indirizzo di fatturazione e spedizione:"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
@@ -1086,6 +1086,8 @@ msgid ""
 "Manage RMA finalization reasons to better classify them for tracking and "
 "analysis purposes."
 msgstr ""
+"Gestisci le motivazioni per la chiusura degli RMA per classificarle ai fini "
+"di tracciamento e analisi."
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
@@ -1270,6 +1272,11 @@ msgid ""
 "- followers: only followers of the related document or members of following "
 "channels\n"
 msgstr ""
+"Politica per inviare un messaggio sul documento utilizzando il mailgateway.\n"
+"- chiunque: chiunque può inviare\n"
+"- clienti: solo i clienti autenticati\n"
+"- followers: solo chi segue il documento collegato o i membri dei seguenti "
+"canali\n"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_url
@@ -1394,12 +1401,12 @@ msgstr "Wizard Consegna RMA"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "RMA Finalization"
-msgstr ""
+msgstr "Chiusura RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_finalization
 msgid "RMA Finalization Reason"
-msgstr ""
+msgstr "Motivo Chiusura RMA"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.action_rma_finalization
@@ -1407,12 +1414,12 @@ msgstr ""
 #: 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 ""
+msgstr "Motivi chiusura RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_finalization_wizard
 msgid "RMA Finalization Wizard"
-msgstr ""
+msgstr "Wizard Chiusura RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
@@ -1427,7 +1434,7 @@ msgstr "Ubicazione RMA"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA Manual Finalization"
-msgstr ""
+msgstr "Chiusura manuale RMA"
 
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
@@ -1568,12 +1575,12 @@ msgstr "RMA ancora da processare completamente"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
 msgid "Reason"
-msgstr ""
+msgstr "Motivo"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__name
 msgid "Reason Name"
-msgstr ""
+msgstr "Nome Motivo"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -2164,6 +2171,8 @@ msgid ""
 "When the RMA is receive, allow to finsish it manually choosing\n"
 "                            a finalization reason."
 msgstr ""
+"Quando si riceve l'RMA, permetti di chiuderlo manualmente scegliendo\n"
+"                            un motivo per la chiusura."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form

From e05c772ddf22a6fe25d8e1170c5c93a0849a204e Mon Sep 17 00:00:00 2001
From: Samuele Mariani <samuele@ooops404.com>
Date: Thu, 31 Mar 2022 09:22:31 +0000
Subject: [PATCH 050/108] Translated using Weblate (Italian)

Currently translated at 100.0% (346 of 346 strings)

Translation: rma-14.0/rma-14.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-14-0/rma-14-0-rma/it/
---
 rma/i18n/it.po | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index e7647f40f..149138890 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-03-23 12:17+0000\n"
-"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
+"PO-Revision-Date: 2022-03-31 12:17+0000\n"
+"Last-Translator: Samuele Mariani <samuele@ooops404.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -1966,6 +1966,9 @@ msgid ""
 "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 ""
+"Il modello (Odoo Document Kind) a cui corrisponde questo alias. Qualsiasi "
+"email in arrivo che non risponde a un record esistente causerà la creazione "
+"di un nuovo record di questo modello (es. una task progetto)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_name
@@ -1973,6 +1976,8 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
 msgstr ""
+"Il nome dell'email alias, es. 'lavoro' se vuoi ricevere email per "
+"<jobs@example.odoo.com>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
@@ -1982,6 +1987,11 @@ msgid ""
 "the sender (From) address, or will use the Administrator account if no "
 "system user is found for that address."
 msgstr ""
+"Il proprietario dei record creati dopo aver ricevuto email con questo alias. "
+"Se questo campo non è impostato il sistema tenterà di trovare il "
+"proprietario corretto in base all'indirizzo del mittente (Da) oppure "
+"utilizzerà l'account amministratore se non viene trovato alcun utente di "
+"sistema per quell'indirizzo."
 
 #. module: rma
 #: code:addons/rma/models/stock_move.py:0

From 9bd34c60a2d4883f3e6952d206c9403e70eb22e2 Mon Sep 17 00:00:00 2001
From: oca-git-bot <oca-git-bot@odoo-community.org>
Date: Thu, 31 Mar 2022 17:27:35 +0200
Subject: [PATCH 051/108] [IMP] update dotfiles [ci skip]

---
 rma/hooks.py      | 2 +-
 rma/models/rma.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rma/hooks.py b/rma/hooks.py
index ed6259060..83b95586d 100644
--- a/rma/hooks.py
+++ b/rma/hooks.py
@@ -8,7 +8,7 @@ def post_init_hook(cr, registry):
     env = api.Environment(cr, SUPERUSER_ID, {})
 
     def _get_next_picking_type_color():
-        """ Choose the next available color for the operation types."""
+        """Choose the next available color for the operation types."""
         stock_picking_type = env["stock.picking.type"]
         picking_type = stock_picking_type.search_read(
             [("warehouse_id", "!=", False), ("color", "!=", False)],
diff --git a/rma/models/rma.py b/rma/models/rma.py
index b9a40607b..b79c69038 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1367,7 +1367,7 @@ def update_replaced_state(self):
             rma.write({"state": "replaced"})
 
     def update_returned_state(self):
-        """ Invoked by [stock.move]._action_done"""
+        """Invoked by [stock.move]._action_done"""
         rma = self.filtered(
             lambda r: (r.state == "waiting_return" and r.remaining_qty_to_done <= 0)
         )

From c135b89b40264f54c5da3bccd4d947345beaa454 Mon Sep 17 00:00:00 2001
From: Giovanni <giovanni@gslab.it>
Date: Tue, 26 Apr 2022 16:36:50 +0200
Subject: [PATCH 052/108] [14.0][FIX] rma_sale, fix action permission issues.

---
 rma/models/stock_picking.py | 2 +-
 rma/readme/CONTRIBUTORS.rst | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rma/models/stock_picking.py b/rma/models/stock_picking.py
index 8b5b76830..242871d5b 100644
--- a/rma/models/stock_picking.py
+++ b/rma/models/stock_picking.py
@@ -29,7 +29,7 @@ def copy(self, default=None):
 
     def action_view_rma(self):
         self.ensure_one()
-        action = self.env.ref("rma.rma_action").read()[0]
+        action = self.sudo().env.ref("rma.rma_action").read()[0]
         rma = self.move_lines.mapped("rma_ids")
         if len(rma) == 1:
             action.update(
diff --git a/rma/readme/CONTRIBUTORS.rst b/rma/readme/CONTRIBUTORS.rst
index 49a9884e5..c93f16063 100644
--- a/rma/readme/CONTRIBUTORS.rst
+++ b/rma/readme/CONTRIBUTORS.rst
@@ -5,3 +5,4 @@
   * David Vidal
 
 * Chafique Delli <chafique.delli@akretion.com>
+* Giovanni Serra - Ooops <giovanni@ooops404.com>

From 8ee81ffb7a7226fff3b300c12b96d93392ac825c Mon Sep 17 00:00:00 2001
From: Giovanni <giovanni@gslab.it>
Date: Tue, 26 Apr 2022 16:50:19 +0200
Subject: [PATCH 053/108] [14.0][FIX] rma, fix permission for action

---
 rma/README.rst                    | 1 +
 rma/__manifest__.py               | 2 +-
 rma/models/res_partner.py         | 2 +-
 rma/static/description/index.html | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index 4361cc0a9..5fa893058 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -152,6 +152,7 @@ Contributors
   * David Vidal
 
 * Chafique Delli <chafique.delli@akretion.com>
+* Giovanni Serra - Ooops <giovanni@ooops404.com>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 0cb14a172..021152250 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.2.1.0",
+    "version": "14.0.2.2.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/models/res_partner.py b/rma/models/res_partner.py
index d6bed155c..e300f6b87 100644
--- a/rma/models/res_partner.py
+++ b/rma/models/res_partner.py
@@ -27,7 +27,7 @@ def _compute_rma_count(self):
 
     def action_view_rma(self):
         self.ensure_one()
-        action = self.env.ref("rma.rma_action").read()[0]
+        action = self.sudo().env.ref("rma.rma_action").read()[0]
         rma = self.rma_ids
         if len(rma) == 1:
             action.update(
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index a14bb780e..c2e501151 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -508,6 +508,7 @@ <h2><a class="toc-backref" href="#id7">Contributors</a></h2>
 </ul>
 </li>
 <li>Chafique Delli &lt;<a class="reference external" href="mailto:chafique.delli&#64;akretion.com">chafique.delli&#64;akretion.com</a>&gt;</li>
+<li>Giovanni Serra - Ooops &lt;<a class="reference external" href="mailto:giovanni&#64;ooops404.com">giovanni&#64;ooops404.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

From a92408acce73ffbd37e40bcae1fdb79e1287e2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Wed, 4 May 2022 14:59:36 +0200
Subject: [PATCH 054/108] [FIX] rma: Allow manual finalization in wizard.

---
 rma/__manifest__.py              | 2 +-
 rma/security/ir.model.access.csv | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 021152250..49eaa4d3f 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.2.2.0",
+    "version": "14.0.2.3.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/security/ir.model.access.csv b/rma/security/ir.model.access.csv
index 1a264c1b0..4955f9694 100644
--- a/rma/security/ir.model.access.csv
+++ b/rma/security/ir.model.access.csv
@@ -13,4 +13,4 @@ access_rma_split_wizard_user_all,rma.split.wizard.user.all,model_rma_split_wizar
 access_rma_finalization_portal,rma.finalization.portal,model_rma_finalization,base.group_portal,1,0,0,0
 access_rma_finalization_user_own,rma.finalization.user.own,model_rma_finalization,rma_group_user_own,1,0,0,0
 access_rma_finalization_manager,rma.finalization.manager,model_rma_finalization,rma_group_manager,1,1,1,1
-access_rma_finalization_wizard_user_own,rma.finalization.wizard.user.own,model_rma_finalization_wizard,rma_group_user_own,1,0,0,0
+access_rma_finalization_wizard_user_own,rma.finalization.wizard.user.own,model_rma_finalization_wizard,group_rma_manual_finalization,1,1,1,1

From 22dd2bb163f620afeff961adb7a67101adaa610f Mon Sep 17 00:00:00 2001
From: Francesco Foresti <francesco.foresti@ooops404.com>
Date: Wed, 18 May 2022 08:04:28 +0000
Subject: [PATCH 055/108] Translated using Weblate (Italian)

Currently translated at 100.0% (346 of 346 strings)

Translation: rma-14.0/rma-14.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-14-0/rma-14-0-rma/it/
---
 rma/__manifest__.py |  2 +-
 rma/i18n/it.po      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 49eaa4d3f..640768ae7 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.2.3.0",
+    "version": "14.0.2.3.1",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 149138890..91045511d 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-03-31 12:17+0000\n"
-"Last-Translator: Samuele Mariani <samuele@ooops404.com>\n"
+"PO-Revision-Date: 2022-05-18 10:05+0000\n"
+"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -418,7 +418,7 @@ msgstr "Attività"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
 msgid "Activity Exception Decoration"
-msgstr "Decorazione Eccezione Attività"
+msgstr "Decorazione eccezione attività"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_state
@@ -887,7 +887,7 @@ msgstr "Seguito da (Clienti)"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_type_icon
 msgid "Font awesome icon e.g. fa-tasks"
-msgstr "Font awesome icon e.g. fa-tasks"
+msgstr "Icona Font Awesome es. fa-tasks"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -934,7 +934,7 @@ msgstr "Icona"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
 msgid "Icon to indicate an exception activity."
-msgstr "Icona per indicare un'attività di eccezione."
+msgstr "Icona per indicare un'attività eccezione."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction

From 606d6fa74cf94715b80cbe10a7ec6ae63b5b11d6 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Thu, 17 Feb 2022 13:06:56 +0100
Subject: [PATCH 056/108] [FIX] rma: refund permissions

Up to v12, account.invoice, was allowed for a wide variety of users. In
this version though, with account.move conversion, those permissions are
quite restricted.

We want to keep the possibility to open a refund for the RMA users.
Although only Invoicing users will be able to post it anyway.

TT34644
---
 rma/models/rma.py                |  6 ++++--
 rma/security/ir.model.access.csv |  2 ++
 rma/security/rma_security.xml    | 17 +++++++++++++++++
 rma/tests/test_rma.py            | 12 +++++++++++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index b79c69038..bb2db4b69 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -649,7 +649,9 @@ def action_refund(self):
         for rmas in group_dict.values():
             origin = ", ".join(rmas.mapped("name"))
             invoice_form = Form(
-                self.env["account.move"].with_context(
+                self.env["account.move"]
+                .sudo()
+                .with_context(
                     default_move_type="out_refund",
                     company_id=rmas[0].company_id.id,
                 ),
@@ -676,7 +678,7 @@ def action_refund(self):
                     }
                 )
             refund.invoice_origin = origin
-            refund.message_post_with_view(
+            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,
diff --git a/rma/security/ir.model.access.csv b/rma/security/ir.model.access.csv
index 4955f9694..0ab0e17b9 100644
--- a/rma/security/ir.model.access.csv
+++ b/rma/security/ir.model.access.csv
@@ -14,3 +14,5 @@ access_rma_finalization_portal,rma.finalization.portal,model_rma_finalization,ba
 access_rma_finalization_user_own,rma.finalization.user.own,model_rma_finalization,rma_group_user_own,1,0,0,0
 access_rma_finalization_manager,rma.finalization.manager,model_rma_finalization,rma_group_manager,1,1,1,1
 access_rma_finalization_wizard_user_own,rma.finalization.wizard.user.own,model_rma_finalization_wizard,group_rma_manual_finalization,1,1,1,1
+access_account_move_rma_user,account_move rma_user,account.model_account_move,rma.rma_group_user_own,1,0,0,0
+access_account_move_line_rma_user,account_move_line rma_user,account.model_account_move_line,rma.rma_group_user_own,1,0,0,0
diff --git a/rma/security/rma_security.xml b/rma/security/rma_security.xml
index f9c3ad48c..54833bc1d 100644
--- a/rma/security/rma_security.xml
+++ b/rma/security/rma_security.xml
@@ -91,6 +91,23 @@
             name="domain_force"
         > ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
     </record>
+    <!-- Allow to refund RMAs -->
+    <record id="rma_account_move_personal_rule" model="ir.rule">
+        <field name="name">RMA Personal Invoice</field>
+        <field ref="model_account_move" name="model_id" />
+        <field
+            name="domain_force"
+        >[('move_type', '=', 'out_refund'), '|', ('invoice_user_id', '=', user.id), ('invoice_user_id', '=', False)]</field>
+        <field name="groups" eval="[(4, ref('rma.rma_group_user_own'))]" />
+    </record>
+    <record id="rma_account_move_line_personal_rule" model="ir.rule">
+        <field name="name">RMA Personal Invoice Lines</field>
+        <field ref="model_account_move_line" name="model_id" />
+        <field
+            name="domain_force"
+        >[('move_id.move_type', '=', 'out_refund'), '|', ('move_id.invoice_user_id', '=', user.id), ('move_id.invoice_user_id', '=', False)]</field>
+        <field name="groups" eval="[(4, ref('rma.rma_group_user_own'))]" />
+    </record>
     <!-- New users will belong to rma_group_user_own  -->
     <record id="base.default_user" model="res.users">
         <field name="groups_id" eval="[(4, ref('rma_group_user_own'))]" />
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 32243cdb5..d373066f4 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -2,13 +2,18 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo.exceptions import UserError, ValidationError
-from odoo.tests import Form, SavepointCase
+from odoo.tests import Form, SavepointCase, new_test_user, users
 
 
 class TestRma(SavepointCase):
     @classmethod
     def setUpClass(cls):
         super(TestRma, cls).setUpClass()
+        cls.user_rma = new_test_user(
+            cls.env,
+            login="user_rma",
+            groups="rma.rma_group_user_own,stock.group_stock_user",
+        )
         cls.res_partner = cls.env["res.partner"]
         cls.product_product = cls.env["product.product"]
         cls.company = cls.env.user.company_id
@@ -256,6 +261,7 @@ def test_lock_unlock(self):
         self.assertEqual(rma_1.state, "draft")
         self.assertEqual(rma_2.state, "received")
 
+    @users("__system__", "user_rma")
     def test_action_refund(self):
         rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         self.assertEqual(rma.state, "received")
@@ -272,6 +278,10 @@ def test_action_refund(self):
         self.assertFalse(rma.can_be_refunded)
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
+        # A regular user can create the refund but only Invoicing users will be able
+        # to edit it and post it
+        if self.env.user.login != "__system__":
+            return
         with Form(rma.refund_line_id.move_id) as refund_form:
             with refund_form.invoice_line_ids.edit(0) as refund_line:
                 refund_line.quantity = 9

From aab626b87e6a353cf8a3939d1dc516d77d3ef3f3 Mon Sep 17 00:00:00 2001
From: david <david.vidal@tecnativa.com>
Date: Mon, 7 Mar 2022 17:40:03 +0100
Subject: [PATCH 057/108] [IMP] rma: optionally group returns to customer

TT34806
---
 rma/README.rst                          |   8 +
 rma/i18n/es.po                          | 314 +++++++++++-------------
 rma/i18n/rma.pot                        |   2 +
 rma/models/res_company.py               |   4 +
 rma/models/res_config_settings.py       |   4 +
 rma/models/rma.py                       |   9 +-
 rma/readme/CONFIGURE.rst                |   8 +
 rma/static/description/index.html       |   9 +-
 rma/tests/test_rma.py                   |  35 +++
 rma/views/res_config_settings_views.xml |  16 ++
 rma/wizard/rma_delivery.py              |   8 +-
 rma/wizard/rma_delivery_views.xml       |   4 +
 12 files changed, 246 insertions(+), 175 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index 5fa893058..b46e91f0b 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -56,6 +56,14 @@ If you want to manually finish RMAs, you need to:
 #. Go to *Settings > Inventory*.
 #. Set *Finish RMAs manually* checkbox on.
 
+By default, returns to customer are grouped by shipping address, warehouse and company.
+If you want to avoid this grouping you can:
+
+#. Go to *Settings > Inventory*.
+#. Set *Group RMA returns by customer address and warehouse* checkbox off.
+
+The users will still be able to group those pickings from the wizard.
+
 Usage
 =====
 
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index b932f1a02..9d8d1a76f 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -10,7 +10,6 @@ msgstr ""
 "PO-Revision-Date: 2022-01-17 12:39+0000\n"
 "Last-Translator: xavigutipujol <jgutierrez@pyming.com>\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,12 +21,12 @@ msgstr ""
 #: 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 ""
+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 ""
+msgstr "${object.company_id.name} RMA (Ref ${object.name or 'n/a' })"
 
 #. module: rma
 #: model:mail.template,subject:rma.mail_template_rma_receipt_notification
@@ -42,11 +41,10 @@ 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' })"
+"${object.company_id.name} Your RMA has been succesfully created (Ref ${object.name or 'n/"
+"a' })"
 msgstr ""
-"${object.company_id.name} Su RMA se ha creado con éxito (Ref ${object.name "
-"or 'n/a' })"
+"${object.company_id.name} Su RMA se ha creado con éxito (Ref ${object.name or 'n/a' })"
 
 #. module: rma
 #: code:addons/rma/models/rma_team.py:0
@@ -64,8 +62,8 @@ msgstr ""
 #, python-format
 msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
 msgstr ""
-"<b>Asunto del correo electrónico:</b> %s<br/><br/><b>Cuerpo del correo "
-"electrónico:</b><br/>%s"
+"<b>Asunto del correo electrónico:</b> %s<br/><br/><b>Cuerpo del correo electrónico:</b><br/"
+">%s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
@@ -77,8 +75,7 @@ msgid ""
 "        (${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"
+"    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"
@@ -92,8 +89,7 @@ msgstr ""
 "        (${object.partner_id.parent_id.name})\n"
 "    % endif\n"
 "    <br/><br/>\n"
-"    Aquí tiene el RMA <strong>${object.name}</strong> Desde ${object."
-"company_id.name}.\n"
+"    Aquí tiene el RMA <strong>${object.name}</strong> Desde ${object.company_id.name}.\n"
 "    <br/><br/>\n"
 "    No dude en ponerse en contacto con nosotros si tiene alguna pregunta.\n"
 "</p>\n"
@@ -170,12 +166,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 ""
-"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
-"\"Descargar\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\"Descargar\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -194,63 +187,63 @@ msgstr "<i class=\"fa fa-fw fa-clock-o\"/><b>Esperando Pago</b>"
 #. 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=\"Descargar\"/>"
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" title="
+"\"Descargar\"/>"
 
 #. 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="
-"\"Descargar\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title=\"Descargar\"/>"
 
 #. 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\"><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>"
+"<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-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>"
+"<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-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>"
+"<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-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>"
+"<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
 msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" "
+"groups=\"base.group_multi_company\"/>"
 msgstr ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Valores específicos por compañía.\" groups="
+"\"base.group_multi_company\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -376,11 +369,11 @@ msgstr "<strong>Estado:</strong>"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
 msgid ""
-"A Python dictionary that will be evaluated to provide default values when "
-"creating new records for this alias."
+"A Python dictionary that will be evaluated to provide default values when creating new "
+"records for this alias."
 msgstr ""
-"Diccionario Python a evaluar para proporcionar valores por defecto cuando un "
-"nuevo registro se cree para este seudónimo."
+"Diccionario Python a evaluar para proporcionar valores por defecto cuando un nuevo "
+"registro se cree para este seudónimo."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
@@ -808,9 +801,7 @@ msgstr "Enviar correo al cliente una vez se recepcionen los productos del RMA."
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
 msgid "Email sent to the customer when they place an RMA from the portal"
-msgstr ""
-"Enviar correo de confirmación al cliente una vez se tramite el RMA desde el "
-"portal"
+msgstr "Enviar correo de confirmación al cliente una vez se tramite el RMA desde el portal"
 
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
@@ -914,14 +905,26 @@ msgstr "Agrupar por"
 msgid "ID"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr "Agrupar las devoluciones de RMA a cliente por dirección de envío y almacén"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Group RMA returns by customer and warehouse."
+msgstr "Agrupar las devoluciones de RMA a cliente por dirección de envío y almacén"
+
 #. 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 del registro padre que tiene el seudónimo. (ejemplo: el proyecto que "
-"contiene el seudónimo para la creación de tareas)"
+"ID del registro padre que tiene el seudónimo. (ejemplo: el proyecto que contiene el "
+"seudónimo para la creación de tareas)"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
@@ -959,11 +962,10 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
 msgid ""
-"If the active field is set to false, it will allow you to hide the RMA Team "
-"without removing it."
+"If the active field is set to false, it will allow you to hide the RMA Team without "
+"removing it."
 msgstr ""
-"Si el campo activo se establece a Falso, permitirá ocultar El equipo de RMA "
-"sin eliminarlo."
+"Si el campo activo se establece a Falso, permitirá ocultar El equipo de RMA sin eliminarlo."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1078,19 +1080,17 @@ msgstr "Adjuntos principales"
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
-"Manage RMA finalization reasons to better classify them for tracking and "
-"analysis purposes."
+"Manage RMA finalization reasons to better classify them for tracking and analysis purposes."
 msgstr ""
-"Adminitrar motivos de finalización de RMA para una mejor clasificación de "
-"estos para su seguimiento análisis posterior."
+"Adminitrar motivos de finalización de RMA para una mejor clasificación de estos para su "
+"seguimiento análisis posterior."
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
-msgid ""
-"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgid "Manage RMA tags to better classify them for tracking and analysis purposes."
 msgstr ""
-"Administrar etiquetas de RMA para clasificarlos de modo que mejore el "
-"seguimiento y análisis de los mismos."
+"Administrar etiquetas de RMA para clasificarlos de modo que mejore el seguimiento y "
+"análisis de los mismos."
 
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
@@ -1199,13 +1199,12 @@ msgstr "Número de mensajes no leidos"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
-"Optional ID of a thread (record) to which all incoming messages will be "
-"attached, even if they did not reply to it. If set, this will disable the "
-"creation of new records completely."
+"Optional ID of a thread (record) to which all incoming messages will be attached, even if "
+"they did not reply to it. If set, this will disable the creation of new records completely."
 msgstr ""
-"Id. opcional de un hilo (registro) al que todos los mensajes entrantes serán "
-"adjuntados, incluso si no fueron respuestas del mismo. Si se establece, se "
-"deshabilitará completamente la creación de nuevos registros."
+"Id. opcional de un hilo (registro) al que todos los mensajes entrantes serán adjuntados, "
+"incluso si no fueron respuestas del mismo. Si se establece, se deshabilitará completamente "
+"la creación de nuevos registros."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_orders_menu
@@ -1245,12 +1244,11 @@ msgstr "ID del hilo del registro padre"
 #. 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) and task (model))"
+"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 ""
-"Modelo padre que contiene el alias. El modelo que contiene la referencia "
-"alias no es necesariamente el modelo dado por alias_model_id"
+"Modelo padre que contiene el alias. El modelo que contiene la referencia alias no es "
+"necesariamente el modelo dado por alias_model_id"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -1263,15 +1261,13 @@ 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 ""
-"Política para publicar un mensaje en el documento utilizando el servidor de "
-"correo.\n"
+"Política para publicar un mensaje en el documento utilizando el servidor de correo.\n"
 "- todo el mundo: todos pueden publicar\n"
 "- socios: sólo socios autenticados\n"
-"- seguidores: sólo seguidores del documento relacionado o miembros de los "
-"siguientes canales\n"
+"- seguidores: sólo seguidores del documento relacionado o miembros de los siguientes "
+"canales\n"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_url
@@ -1330,12 +1326,8 @@ msgstr "Cantidad a extraer"
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
-msgid ""
-"Quantity to extract cannot be greater than remaining delivery quantity (%s "
-"%s)"
-msgstr ""
-"La cantidad a extraer no puede ser mayor que la cantidad de entrega "
-"restante(%s %s)"
+msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
+msgstr "La cantidad a extraer no puede ser mayor que la cantidad de entrega restante(%s %s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
@@ -1343,13 +1335,11 @@ msgid "Quantity to extract to a new RMA."
 msgstr "Cantidad a extraer en nuevo RMA."
 
 #. module: rma
-#: model:ir.actions.act_window,name:rma.rma_action
-#: model:ir.model,name:rma.model_rma
+#: model:ir.actions.act_window,name:rma.rma_action model:ir.model,name:rma.model_rma
 #: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
-#: model:ir.module.category,name:rma.rma_module_category
-#: model:ir.ui.menu,name:rma.rma_menu
+#: model:ir.module.category,name:rma.rma_module_category model:ir.ui.menu,name:rma.rma_menu
 #: model_terms:ir.ui.view,arch_db:rma.view_partner_form
 #: model_terms:ir.ui.view,arch_db:rma.view_picking_form
 msgid "RMA"
@@ -1481,8 +1471,7 @@ msgid "RMA Tag"
 msgstr "Etiqueta RMA"
 
 #. module: rma
-#: model:ir.actions.act_window,name:rma.action_rma_tag
-#: model:ir.model,name:rma.model_rma_tag
+#: model:ir.actions.act_window,name:rma.action_rma_tag 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
@@ -1532,8 +1521,7 @@ msgstr "RMAs que originaron esta orden"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_stock_warehouse__rma
 msgid "RMA related products can be stored in this warehouse."
-msgstr ""
-"Productos relacionados con el RMA pueden ser guardados en este almacén."
+msgstr "Productos relacionados con el RMA pueden ser guardados en este almacén."
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_operation
@@ -1664,27 +1652,25 @@ msgstr "Reemplazado"
 #: 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=\"%d\">%s</a> "
+"(Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a>) has been "
+"created."
 msgstr ""
-"Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
-"id=\"%d\">%s</a> (Orden de entrega <a href=\"#\" data-oe-model=\"stock."
-"picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
+"Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d\">%s</"
+"a> (Orden de entrega <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
+"a>) ha sido creado."
 
 #. module: rma
 #: 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."
+"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 ""
-"Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-"
-"oe-id=\"%d\">%s</a><br/>Cantidad %f %s<br/>El reemplazo realizado no creó un "
-"movimiento nuevo, pero uno de los movimientos creados anteriormente fué "
-"actualizado con estos datos."
+"Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-oe-id=\"%d\">"
+"%s</a><br/>Cantidad %f %s<br/>El reemplazo realizado no creó un movimiento nuevo, pero uno "
+"de los movimientos creados anteriormente fué actualizado con estos datos."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
@@ -1729,11 +1715,11 @@ msgstr "Devolver al cliente"
 #: 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=\"%d\">%s</a> has been "
+"created."
 msgstr ""
-"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking"
-"\" data-oe-id=\"%d\">%s</a> ha sido creada."
+"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
+"\"%d\">%s</a> ha sido creada."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1870,12 +1856,10 @@ msgstr "Dividir RMA"
 #. module: rma
 #: 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."
+msgid "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been created."
 msgstr ""
-"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</"
-"a> ha sido creado."
+"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> ha sido "
+"creado."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -1884,8 +1868,7 @@ msgid "State"
 msgstr "Estado"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:0
-#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: code:addons/rma/controllers/main.py:0 model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
 msgstr "Estado"
@@ -1957,46 +1940,44 @@ 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 ""
-"El modelo (Tipo de documento de Odoo) al que corresponde este seudónimo. "
-"Cualquier correo entrante que no sea respuesta a un registro existente, "
-"causará la creación de un nuevo registro de este modelo"
+"El modelo (Tipo de documento de Odoo) al que corresponde este seudónimo. Cualquier correo "
+"entrante que no sea respuesta a un registro existente, causará la creación de un nuevo "
+"registro de este modelo"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_name
 msgid ""
-"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
-"<jobs@example.odoo.com>"
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example."
+"odoo.com>"
 msgstr ""
-"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos"
-"\", si lo que quiere es obtener los correos para <trabajos@example.odoo.com>"
+"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos\", si lo que "
+"quiere es obtener los correos para <trabajos@example.odoo.com>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
 msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
+"The owner of records created upon receiving emails on this alias. If this field is not set "
+"the system will attempt to find the right owner based on the sender (From) address, or "
+"will use the Administrator account if no system user is found for that address."
 msgstr ""
-"El propietario de los registros creados al recibir correos electrónicos en "
-"este seudónimo. Si el campo no está establecido, el sistema tratará de "
-"encontrar el propietario adecuado basado en la dirección del emisor (De), o "
-"usará la cuenta de administrador si no se encuentra un usuario para esa "
-"dirección."
+"El propietario de los registros creados al recibir correos electrónicos en este seudónimo. "
+"Si el campo no está establecido, el sistema tratará de encontrar el propietario adecuado "
+"basado en la dirección del emisor (De), o usará la cuenta de administrador si no se "
+"encuentra un usuario para esa dirección."
 
 #. module: rma
 #: 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 '%s' must be equal to its initial demand because the "
+"stock move is linked to an RMA (%s)."
 msgstr ""
-"La cantidad realizada para el producto '%s' debe ser igual a la demanda "
-"inicial porque el movimiento está enlazado a un RMA (%s)."
+"La cantidad realizada para el producto '%s' debe ser igual a la demanda inicial porque el "
+"movimiento está enlazado a un RMA (%s)."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -2013,11 +1994,11 @@ msgstr "La etiqueta es visible en la vista de portal"
 #: 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 ""
-"Hay al menos una linea de factura que tiene una cantidad menor que la "
-"cantidad especificada en el RMA asociado."
+"Hay al menos una linea de factura que tiene una cantidad menor que la cantidad "
+"especificada en el RMA asociado."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -2159,8 +2140,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When customers themselves place an RMA from the portal, send an automatic "
-"notification acknowleging it."
+"When customers themselves place an RMA from the portal, send an automatic notification "
+"acknowleging it."
 msgstr ""
 
 #. module: rma
@@ -2177,22 +2158,19 @@ msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"When the RMA products are received, send an automatic information email."
+msgid "When the RMA products are received, send an automatic information email."
 msgstr ""
 
 #. 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."
+msgid "When the RMA receipt is confirmed, send a confirmation email to the customer."
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
-msgid ""
-"When the delivery is confirmed, send a confirmation email to the customer."
+msgid "When the delivery is confirmed, send a confirmation email to the customer."
 msgstr ""
 
 #. module: rma
@@ -2205,18 +2183,14 @@ msgstr "No puede eliminar RMAs que no estén en estado borrador"
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
-"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
-"be created"
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will be created"
 msgstr ""
-"Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los "
-"RMAs serán creados"
+"Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los RMAs serán creados"
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
-msgid ""
-"the user will have access to all records of everyone in the RMA application."
-msgstr ""
-"El usuario tendrá acceso a todos los registros de RMA de todos lo usuarios."
+msgid "the user will have access to all records of everyone in the RMA application."
+msgstr "El usuario tendrá acceso a todos los registros de RMA de todos lo usuarios."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_own
@@ -2225,9 +2199,5 @@ msgstr "el usuario tendrá acceso solo a sus propios RMAs."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_manager
-msgid ""
-"the user will have an access to the RMA configuration as well as statistic "
-"reports."
-msgstr ""
-"El usuario tendrá acceso a la configuración de RMA y a los informes "
-"estadísticos."
+msgid "the user will have an access to the RMA configuration as well as statistic reports."
+msgstr "El usuario tendrá acceso a la configuración de RMA y a los informes estadísticos."
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 5f5a30e00..9b814b679 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -6,6 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-03-07 16:33+0000\n"
+"PO-Revision-Date: 2022-03-07 16:33+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/rma/models/res_company.py b/rma/models/res_company.py
index 479e7e7c5..94d274dfb 100644
--- a/rma/models/res_company.py
+++ b/rma/models/res_company.py
@@ -25,6 +25,10 @@ def _default_rma_mail_draft_template(self):
         except ValueError:
             return False
 
+    rma_return_grouping = fields.Boolean(
+        string="Group RMA returns by customer address and warehouse",
+        default=True,
+    )
     send_rma_confirmation = fields.Boolean(
         string="Send RMA Confirmation",
         help="When the delivery is confirmed, send a confirmation email "
diff --git a/rma/models/res_config_settings.py b/rma/models/res_config_settings.py
index 7eae1ded7..c06d9e594 100644
--- a/rma/models/res_config_settings.py
+++ b/rma/models/res_config_settings.py
@@ -11,6 +11,10 @@ class ResConfigSettings(models.TransientModel):
         help="Allow to finish an RMA without returning back a product or refunding",
         implied_group="rma.group_rma_manual_finalization",
     )
+    rma_return_grouping = fields.Boolean(
+        related="company_id.rma_return_grouping",
+        readonly=False,
+    )
     send_rma_confirmation = fields.Boolean(
         related="company_id.send_rma_confirmation",
         readonly=False,
diff --git a/rma/models/rma.py b/rma/models/rma.py
index bb2db4b69..4b8c4ebab 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1088,6 +1088,9 @@ def _get_extra_refund_line_vals(self):
     # Returning business methods
     def create_return(self, scheduled_date, qty=None, uom=None):
         """Intended to be invoked by the delivery wizard"""
+        group_returns = self.env.company.rma_return_grouping
+        if "rma_return_grouping" in self.env.context:
+            group_returns = self.env.context.get("rma_return_grouping")
         self._ensure_can_be_returned()
         self._ensure_qty_to_return(qty, uom)
         group_dict = {}
@@ -1100,7 +1103,11 @@ def create_return(self, scheduled_date, qty=None, uom=None):
             )
             group_dict.setdefault(key, self.env["rma"])
             group_dict[key] |= record
-        for rmas in group_dict.values():
+        if group_returns:
+            grouped_rmas = group_dict.values()
+        else:
+            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(
diff --git a/rma/readme/CONFIGURE.rst b/rma/readme/CONFIGURE.rst
index 94121f649..288531b1b 100644
--- a/rma/readme/CONFIGURE.rst
+++ b/rma/readme/CONFIGURE.rst
@@ -11,3 +11,11 @@ If you want to manually finish RMAs, you need to:
 
 #. Go to *Settings > Inventory*.
 #. Set *Finish RMAs manually* checkbox on.
+
+By default, returns to customer are grouped by shipping address, warehouse and company.
+If you want to avoid this grouping you can:
+
+#. Go to *Settings > Inventory*.
+#. Set *Group RMA returns by customer address and warehouse* checkbox off.
+
+The users will still be able to group those pickings from the wizard.
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index c2e501151..7787916a1 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -3,7 +3,7 @@
 <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: http://docutils.sourceforge.net/" />
 <title>Return Merchandise Authorization Management</title>
 <style type="text/css">
 
@@ -406,6 +406,13 @@ <h1><a class="toc-backref" href="#id1">Configuration</a></h1>
 <li>Go to <em>Settings &gt; Inventory</em>.</li>
 <li>Set <em>Finish RMAs manually</em> checkbox on.</li>
 </ol>
+<p>By default, returns to customer are grouped by shipping address, warehouse and company.
+If you want to avoid this grouping you can:</p>
+<ol class="arabic simple">
+<li>Go to <em>Settings &gt; Inventory</em>.</li>
+<li>Set <em>Group RMA returns by customer address and warehouse</em> checkbox off.</li>
+</ol>
+<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>
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index d373066f4..ef3ce748a 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -62,6 +62,8 @@ def setUpClass(cls):
             {"name": "[Test] It's out of warranty. To be scrapped"}
         )
         cls.env.ref("rma.group_rma_manual_finalization").users |= cls.env.user
+        # Ensure grouping
+        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"])
@@ -603,6 +605,39 @@ def test_mass_return_to_customer(self):
         pick_2.button_validate()
         self.assertEqual(all_rmas.mapped("state"), ["returned"] * 4)
 
+    def test_mass_return_to_customer_ungrouped(self):
+        """We can choose to avoid the customer returns grouping"""
+        self.env.company.rma_return_grouping = False
+        # Create, confirm and receive rma_1
+        rma_1 = self._create_confirm_receive(
+            self.partner, self.product, 10, self.rma_loc
+        )
+        # create, confirm and receive 3 more RMAs
+        # rma_2: Same partner and same product as rma_1
+        rma_2 = self._create_confirm_receive(
+            self.partner, self.product, 15, self.rma_loc
+        )
+        # rma_3: Same partner and different product than rma_1
+        product = self.product_product.create(
+            {"name": "Product 2 test", "type": "product"}
+        )
+        rma_3 = self._create_confirm_receive(self.partner, product, 20, self.rma_loc)
+        # rma_4: Different partner and same product as rma_1
+        partner = self.res_partner.create({"name": "Partner 2 test"})
+        rma_4 = self._create_confirm_receive(partner, product, 25, self.rma_loc)
+        # all rmas are ready to be returned to the customer
+        all_rmas = rma_1 | rma_2 | rma_3 | rma_4
+        self.assertEqual(all_rmas.mapped("state"), ["received"] * 4)
+        self.assertEqual(all_rmas.mapped("can_be_returned"), [True] * 4)
+        # Mass return of those four RMAs
+        delivery_wizard = (
+            self.env["rma.delivery.wizard"]
+            .with_context(active_ids=all_rmas.ids, rma_delivery_type="return")
+            .create({})
+        )
+        delivery_wizard.action_deliver()
+        self.assertEqual(4, len(all_rmas.delivery_move_ids.picking_id))
+
     def test_rma_from_picking_return(self):
         # Create a return from a delivery picking
         origin_delivery = self._create_delivery()
diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index 7e6abfc6d..fbaa21b7b 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -23,6 +23,22 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-12 col-lg-6 o_setting_box">
+                    <div class="o_setting_left_pane">
+                        <field name="rma_return_grouping" />
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="rma_return_grouping" />
+                        <span
+                            class="fa fa-lg fa-building-o"
+                            title="Values set here are company-specific."
+                            groups="base.group_multi_company"
+                        />
+                        <div class="text-muted">
+                            Group RMA returns by customer and warehouse.
+                        </div>
+                    </div>
+                </div>
                 <div
                     class="col-12 col-lg-6 o_setting_box"
                     title="Send automatic RMA info to customer"
diff --git a/rma/wizard/rma_delivery.py b/rma/wizard/rma_delivery.py
index e23d9d758..747e5fb89 100644
--- a/rma/wizard/rma_delivery.py
+++ b/rma/wizard/rma_delivery.py
@@ -31,6 +31,10 @@ class RmaReDeliveryWizard(models.TransientModel):
         required=True,
     )
     uom_category_id = fields.Many2one(related="product_id.uom_id.category_id")
+    rma_return_grouping = fields.Boolean(
+        string="Group RMA returns by customer address and warehouse",
+        default=lambda self: self.env.company.rma_return_grouping,
+    )
 
     @api.constrains("product_uom_qty")
     def _check_product_uom_qty(self):
@@ -87,4 +91,6 @@ def action_deliver(self):
             qty = uom = None
             if self.rma_count == 1:
                 qty, uom = self.product_uom_qty, self.product_uom
-            rma.create_return(self.scheduled_date, qty, uom)
+            rma.with_context(
+                rma_return_grouping=self.rma_return_grouping
+            ).create_return(self.scheduled_date, qty, uom)
diff --git a/rma/wizard/rma_delivery_views.xml b/rma/wizard/rma_delivery_views.xml
index 877bb1db8..112523f62 100644
--- a/rma/wizard/rma_delivery_views.xml
+++ b/rma/wizard/rma_delivery_views.xml
@@ -14,6 +14,10 @@
                             name="warehouse_id"
                             attrs="{'invisible': [('type', '!=', 'replace')]}"
                         />
+                        <field
+                            name="rma_return_grouping"
+                            attrs="{'invisible': ['|', ('type', '=', 'replace'), ('rma_count', '=', 1)]}"
+                        />
                     </group>
                     <group>
                         <field name="uom_category_id" invisible="1" />

From 017884d1b6b011d31288caf522651d8997e85bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Wed, 22 Jun 2022 17:06:05 +0200
Subject: [PATCH 058/108] [FIX] rma: Avoid set invoice_payment_term_id from
 partner default value in refund. TT37690

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-14.0/rma-14.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-14-0/rma-14-0-rma/
---
 rma/__manifest__.py               |   2 +-
 rma/i18n/es.po                    | 326 +++++++++++++++++-------------
 rma/i18n/it.po                    |  12 ++
 rma/i18n/nl.po                    |  12 ++
 rma/i18n/pt.po                    |  12 ++
 rma/i18n/pt_BR.po                 |  12 ++
 rma/i18n/rma.pot                  |  14 +-
 rma/i18n/ro.po                    |  12 ++
 rma/i18n/zh_CN.po                 |  12 ++
 rma/models/rma.py                 |   2 +
 rma/static/description/index.html |   2 +-
 rma/tests/test_rma.py             |   4 +
 12 files changed, 278 insertions(+), 144 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 640768ae7..2d195ec57 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.2.3.1",
+    "version": "14.0.3.0.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 9d8d1a76f..bbcc85a5c 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2022-01-17 12:39+0000\n"
 "Last-Translator: xavigutipujol <jgutierrez@pyming.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,10 +42,11 @@ 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' })"
+"${object.company_id.name} Your RMA has been succesfully created (Ref "
+"${object.name or 'n/a' })"
 msgstr ""
-"${object.company_id.name} Su RMA se ha creado con éxito (Ref ${object.name or 'n/a' })"
+"${object.company_id.name} Su RMA se ha creado con éxito (Ref ${object.name "
+"or 'n/a' })"
 
 #. module: rma
 #: code:addons/rma/models/rma_team.py:0
@@ -62,8 +64,8 @@ msgstr ""
 #, python-format
 msgid "<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s"
 msgstr ""
-"<b>Asunto del correo electrónico:</b> %s<br/><br/><b>Cuerpo del correo electrónico:</b><br/"
-">%s"
+"<b>Asunto del correo electrónico:</b> %s<br/><br/><b>Cuerpo del correo "
+"electrónico:</b><br/>%s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
@@ -75,7 +77,8 @@ msgid ""
 "        (${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"
+"    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"
@@ -89,7 +92,8 @@ msgstr ""
 "        (${object.partner_id.parent_id.name})\n"
 "    % endif\n"
 "    <br/><br/>\n"
-"    Aquí tiene el RMA <strong>${object.name}</strong> Desde ${object.company_id.name}.\n"
+"    Aquí tiene el RMA <strong>${object.name}</strong> Desde ${object."
+"company_id.name}.\n"
 "    <br/><br/>\n"
 "    No dude en ponerse en contacto con nosotros si tiene alguna pregunta.\n"
 "</p>\n"
@@ -166,9 +170,12 @@ 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 ""
-"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\"Descargar\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
+"\"Descargar\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -187,63 +194,65 @@ msgstr "<i class=\"fa fa-fw fa-clock-o\"/><b>Esperando Pago</b>"
 #. 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="
-"\"Descargar\"/>"
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Descargar\"/>"
 
 #. 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=\"Descargar\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
+"\"Descargar\"/>"
 
 #. 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\"><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>"
+"<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-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>"
+"<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-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>"
+"<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-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>"
+"<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
 msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" "
-"groups=\"base.group_multi_company\"/>"
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
 msgstr ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Valores específicos por compañía.\" groups="
-"\"base.group_multi_company\"/>"
+"<span class=\"fa fa-lg fa-building-o\" title=\"Valores específicos por "
+"compañía.\" groups=\"base.group_multi_company\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -369,11 +378,11 @@ msgstr "<strong>Estado:</strong>"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
 msgid ""
-"A Python dictionary that will be evaluated to provide default values when creating new "
-"records for this alias."
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
 msgstr ""
-"Diccionario Python a evaluar para proporcionar valores por defecto cuando un nuevo "
-"registro se cree para este seudónimo."
+"Diccionario Python a evaluar para proporcionar valores por defecto cuando un "
+"nuevo registro se cree para este seudónimo."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
@@ -801,7 +810,9 @@ msgstr "Enviar correo al cliente una vez se recepcionen los productos del RMA."
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
 msgid "Email sent to the customer when they place an RMA from the portal"
-msgstr "Enviar correo de confirmación al cliente una vez se tramite el RMA desde el portal"
+msgstr ""
+"Enviar correo de confirmación al cliente una vez se tramite el RMA desde el "
+"portal"
 
 #. module: rma
 #: code:addons/rma/wizard/rma_split.py:0
@@ -882,6 +893,20 @@ msgstr ""
 msgid "Group By"
 msgstr "Agrupar por"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr ""
+"Agrupar las devoluciones de RMA a cliente por dirección de envío y almacén"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Group RMA returns by customer and warehouse."
+msgstr ""
+"Agrupar las devoluciones de RMA a cliente por dirección de envío y almacén"
+
 #. 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
@@ -905,26 +930,14 @@ msgstr "Agrupar por"
 msgid "ID"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
-#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
-#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
-msgid "Group RMA returns by customer address and warehouse"
-msgstr "Agrupar las devoluciones de RMA a cliente por dirección de envío y almacén"
-
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "Group RMA returns by customer and warehouse."
-msgstr "Agrupar las devoluciones de RMA a cliente por dirección de envío y almacén"
-
 #. 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 del registro padre que tiene el seudónimo. (ejemplo: el proyecto que contiene el "
-"seudónimo para la creación de tareas)"
+"ID del registro padre que tiene el seudónimo. (ejemplo: el proyecto que "
+"contiene el seudónimo para la creación de tareas)"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
@@ -962,10 +975,11 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
 msgid ""
-"If the active field is set to false, it will allow you to hide the RMA Team without "
-"removing it."
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
 msgstr ""
-"Si el campo activo se establece a Falso, permitirá ocultar El equipo de RMA sin eliminarlo."
+"Si el campo activo se establece a Falso, permitirá ocultar El equipo de RMA "
+"sin eliminarlo."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1080,17 +1094,19 @@ msgstr "Adjuntos principales"
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
-"Manage RMA finalization reasons to better classify them for tracking and analysis purposes."
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
 msgstr ""
-"Adminitrar motivos de finalización de RMA para una mejor clasificación de estos para su "
-"seguimiento análisis posterior."
+"Adminitrar motivos de finalización de RMA para una mejor clasificación de "
+"estos para su seguimiento análisis posterior."
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
-msgid "Manage RMA tags to better classify them for tracking and analysis purposes."
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
 msgstr ""
-"Administrar etiquetas de RMA para clasificarlos de modo que mejore el seguimiento y "
-"análisis de los mismos."
+"Administrar etiquetas de RMA para clasificarlos de modo que mejore el "
+"seguimiento y análisis de los mismos."
 
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
@@ -1199,12 +1215,13 @@ msgstr "Número de mensajes no leidos"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
 msgid ""
-"Optional ID of a thread (record) to which all incoming messages will be attached, even if "
-"they did not reply to it. If set, this will disable the creation of new records completely."
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
 msgstr ""
-"Id. opcional de un hilo (registro) al que todos los mensajes entrantes serán adjuntados, "
-"incluso si no fueron respuestas del mismo. Si se establece, se deshabilitará completamente "
-"la creación de nuevos registros."
+"Id. opcional de un hilo (registro) al que todos los mensajes entrantes serán "
+"adjuntados, incluso si no fueron respuestas del mismo. Si se establece, se "
+"deshabilitará completamente la creación de nuevos registros."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_orders_menu
@@ -1244,11 +1261,12 @@ msgstr "ID del hilo del registro padre"
 #. 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) and task (model))"
+"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 ""
-"Modelo padre que contiene el alias. El modelo que contiene la referencia alias no es "
-"necesariamente el modelo dado por alias_model_id"
+"Modelo padre que contiene el alias. El modelo que contiene la referencia "
+"alias no es necesariamente el modelo dado por alias_model_id"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -1261,13 +1279,15 @@ 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 ""
-"Política para publicar un mensaje en el documento utilizando el servidor de correo.\n"
+"Política para publicar un mensaje en el documento utilizando el servidor de "
+"correo.\n"
 "- todo el mundo: todos pueden publicar\n"
 "- socios: sólo socios autenticados\n"
-"- seguidores: sólo seguidores del documento relacionado o miembros de los siguientes "
-"canales\n"
+"- seguidores: sólo seguidores del documento relacionado o miembros de los "
+"siguientes canales\n"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_url
@@ -1326,8 +1346,12 @@ msgstr "Cantidad a extraer"
 #. module: rma
 #: code:addons/rma/models/rma.py:0
 #, python-format
-msgid "Quantity to extract cannot be greater than remaining delivery quantity (%s %s)"
-msgstr "La cantidad a extraer no puede ser mayor que la cantidad de entrega restante(%s %s)"
+msgid ""
+"Quantity to extract cannot be greater than remaining delivery quantity (%s "
+"%s)"
+msgstr ""
+"La cantidad a extraer no puede ser mayor que la cantidad de entrega "
+"restante(%s %s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
@@ -1335,11 +1359,13 @@ msgid "Quantity to extract to a new RMA."
 msgstr "Cantidad a extraer en nuevo RMA."
 
 #. module: rma
-#: model:ir.actions.act_window,name:rma.rma_action model:ir.model,name:rma.model_rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
 #: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
-#: model:ir.module.category,name:rma.rma_module_category model:ir.ui.menu,name:rma.rma_menu
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
 #: model_terms:ir.ui.view,arch_db:rma.view_partner_form
 #: model_terms:ir.ui.view,arch_db:rma.view_picking_form
 msgid "RMA"
@@ -1471,7 +1497,8 @@ msgid "RMA Tag"
 msgstr "Etiqueta RMA"
 
 #. module: rma
-#: model:ir.actions.act_window,name:rma.action_rma_tag model:ir.model,name:rma.model_rma_tag
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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
@@ -1521,7 +1548,8 @@ msgstr "RMAs que originaron esta orden"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_stock_warehouse__rma
 msgid "RMA related products can be stored in this warehouse."
-msgstr "Productos relacionados con el RMA pueden ser guardados en este almacén."
+msgstr ""
+"Productos relacionados con el RMA pueden ser guardados en este almacén."
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_operation
@@ -1652,25 +1680,27 @@ msgstr "Reemplazado"
 #: 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=\"%d"
+"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
+"\"%d\">%s</a>) has been created."
 msgstr ""
-"Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d\">%s</"
-"a> (Orden de entrega <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
-"a>) ha sido creado."
+"Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
+"id=\"%d\">%s</a> (Orden de entrega <a href=\"#\" data-oe-model=\"stock."
+"picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
 
 #. module: rma
 #: 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."
+"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 ""
-"Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-oe-id=\"%d\">"
-"%s</a><br/>Cantidad %f %s<br/>El reemplazo realizado no creó un movimiento nuevo, pero uno "
-"de los movimientos creados anteriormente fué actualizado con estos datos."
+"Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-"
+"oe-id=\"%d\">%s</a><br/>Cantidad %f %s<br/>El reemplazo realizado no creó un "
+"movimiento nuevo, pero uno de los movimientos creados anteriormente fué "
+"actualizado con estos datos."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
@@ -1715,11 +1745,11 @@ msgstr "Devolver al cliente"
 #: 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=\"%d\">%s</"
+"a> has been created."
 msgstr ""
-"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
-"\"%d\">%s</a> ha sido creada."
+"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking"
+"\" data-oe-id=\"%d\">%s</a> ha sido creada."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1856,10 +1886,12 @@ msgstr "Dividir RMA"
 #. module: rma
 #: 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."
+msgid ""
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
+"created."
 msgstr ""
-"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> ha sido "
-"creado."
+"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</"
+"a> ha sido creado."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -1868,7 +1900,8 @@ msgid "State"
 msgstr "Estado"
 
 #. module: rma
-#: code:addons/rma/controllers/main.py:0 model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: code:addons/rma/controllers/main.py:0
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
 msgstr "Estado"
@@ -1940,44 +1973,46 @@ 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 ""
-"El modelo (Tipo de documento de Odoo) al que corresponde este seudónimo. Cualquier correo "
-"entrante que no sea respuesta a un registro existente, causará la creación de un nuevo "
-"registro de este modelo"
+"El modelo (Tipo de documento de Odoo) al que corresponde este seudónimo. "
+"Cualquier correo entrante que no sea respuesta a un registro existente, "
+"causará la creación de un nuevo registro de este modelo"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_name
 msgid ""
-"The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example."
-"odoo.com>"
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
 msgstr ""
-"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos\", si lo que "
-"quiere es obtener los correos para <trabajos@example.odoo.com>"
+"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos"
+"\", si lo que quiere es obtener los correos para <trabajos@example.odoo.com>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
 msgid ""
-"The owner of records created upon receiving emails on this alias. If this field is not set "
-"the system will attempt to find the right owner based on the sender (From) address, or "
-"will use the Administrator account if no system user is found for that address."
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
 msgstr ""
-"El propietario de los registros creados al recibir correos electrónicos en este seudónimo. "
-"Si el campo no está establecido, el sistema tratará de encontrar el propietario adecuado "
-"basado en la dirección del emisor (De), o usará la cuenta de administrador si no se "
-"encuentra un usuario para esa dirección."
+"El propietario de los registros creados al recibir correos electrónicos en "
+"este seudónimo. Si el campo no está establecido, el sistema tratará de "
+"encontrar el propietario adecuado basado en la dirección del emisor (De), o "
+"usará la cuenta de administrador si no se encuentra un usuario para esa "
+"dirección."
 
 #. module: rma
 #: 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 '%s' must be equal to its initial demand "
+"because the stock move is linked to an RMA (%s)."
 msgstr ""
-"La cantidad realizada para el producto '%s' debe ser igual a la demanda inicial porque el "
-"movimiento está enlazado a un RMA (%s)."
+"La cantidad realizada para el producto '%s' debe ser igual a la demanda "
+"inicial porque el movimiento está enlazado a un RMA (%s)."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1994,11 +2029,11 @@ msgstr "La etiqueta es visible en la vista de portal"
 #: 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 ""
-"Hay al menos una linea de factura que tiene una cantidad menor que la cantidad "
-"especificada en el RMA asociado."
+"Hay al menos una linea de factura que tiene una cantidad menor que la "
+"cantidad especificada en el RMA asociado."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -2140,8 +2175,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When customers themselves place an RMA from the portal, send an automatic notification "
-"acknowleging it."
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
 msgstr ""
 
 #. module: rma
@@ -2158,19 +2193,22 @@ msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "When the RMA products are received, send an automatic information email."
+msgid ""
+"When the RMA products are received, send an automatic information email."
 msgstr ""
 
 #. 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."
+msgid ""
+"When the RMA receipt is confirmed, send a confirmation email to the customer."
 msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
-msgid "When the delivery is confirmed, send a confirmation email to the customer."
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
 msgstr ""
 
 #. module: rma
@@ -2183,14 +2221,18 @@ msgstr "No puede eliminar RMAs que no estén en estado borrador"
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid ""
-"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will be created"
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
 msgstr ""
-"Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los RMAs serán creados"
+"Debe seleccionar el 'Cliente' en la 'Orden de Entrega' desde la cual los "
+"RMAs serán creados"
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
-msgid "the user will have access to all records of everyone in the RMA application."
-msgstr "El usuario tendrá acceso a todos los registros de RMA de todos lo usuarios."
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+"El usuario tendrá acceso a todos los registros de RMA de todos lo usuarios."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_own
@@ -2199,5 +2241,9 @@ msgstr "el usuario tendrá acceso solo a sus propios RMAs."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_manager
-msgid "the user will have an access to the RMA configuration as well as statistic reports."
-msgstr "El usuario tendrá acceso a la configuración de RMA y a los informes estadísticos."
+msgid ""
+"the user will have an access to the RMA configuration as well as statistic "
+"reports."
+msgstr ""
+"El usuario tendrá acceso a la configuración de RMA y a los informes "
+"estadísticos."
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 91045511d..07944e225 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -894,6 +894,18 @@ msgstr "Icona Font Awesome es. fa-tasks"
 msgid "Group By"
 msgstr "Raggruppa per"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+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
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index 9fd3abb56..a30dcbc3f 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -820,6 +820,18 @@ msgstr ""
 msgid "Group By"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+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
diff --git a/rma/i18n/pt.po b/rma/i18n/pt.po
index 547b4a8bc..f41795615 100644
--- a/rma/i18n/pt.po
+++ b/rma/i18n/pt.po
@@ -840,6 +840,18 @@ msgstr ""
 msgid "Group By"
 msgstr "Agrupado Por"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+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
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index b16a20399..725841c50 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -838,6 +838,18 @@ msgstr ""
 msgid "Group By"
 msgstr "Agrupado Por"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+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
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 9b814b679..83aa4dbf3 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -6,8 +6,6 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-03-07 16:33+0000\n"
-"PO-Revision-Date: 2022-03-07 16:33+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -818,6 +816,18 @@ msgstr ""
 msgid "Group By"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+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
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index 3429a2d45..30d5d9e87 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -857,6 +857,18 @@ msgstr ""
 msgid "Group By"
 msgstr "Grupează după"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+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
diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
index b23a36f98..6fd693ee2 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -822,6 +822,18 @@ msgstr ""
 msgid "Group By"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+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
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 4b8c4ebab..29d591041 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1048,6 +1048,8 @@ def _prepare_refund(self, invoice_form, origin):
         """
         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"]
 
     def _prepare_refund_line(self, line_form):
         """Hook method for preparing a refund line Form.
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index 7787916a1..7ebc384b7 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -3,7 +3,7 @@
 <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: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
 <title>Return Merchandise Authorization Management</title>
 <style type="text/css">
 
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index ef3ce748a..22b9327e4 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -39,6 +39,9 @@ def setUpClass(cls):
             {
                 "name": "Partner test",
                 "property_account_receivable_id": cls.account_receiv.id,
+                "property_payment_term_id": cls.env.ref(
+                    "account.account_payment_term_30days"
+                ).id,
             }
         )
         cls.partner_invoice = cls.res_partner.create(
@@ -273,6 +276,7 @@ def test_action_refund(self):
         rma.action_refund()
         self.assertEqual(rma.refund_id.move_type, "out_refund")
         self.assertEqual(rma.refund_id.state, "draft")
+        self.assertFalse(rma.refund_id.invoice_payment_term_id)
         self.assertEqual(rma.refund_line_id.product_id, rma.product_id)
         self.assertEqual(rma.refund_line_id.quantity, 10)
         self.assertEqual(rma.refund_line_id.product_uom_id, rma.product_uom)

From c983c807b6a4d4541aeb4a1f18ce8b20f77b56a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Mon, 16 May 2022 18:14:50 +0200
Subject: [PATCH 059/108] =?UTF-8?q?[FIX]=20rma=20+=20rma=5Fsale:=20Allow?=
 =?UTF-8?q?=20to=20create=20an=20RMA=20to=20a=20user=20with=20access=5Fto?=
 =?UTF-8?q?=E2=80=A6ken=20to=20sale=20order=20(no=20user=20created).=20[FI?=
 =?UTF-8?q?X]=20rma=20+=20rma=5Fsale:=20Show=20RMA's=20list=20(with=20shar?=
 =?UTF-8?q?e=20url)=20to=20a=20user=20with=20access=5Ftoken=20to=20sale=20?=
 =?UTF-8?q?order=20(no=20user=20created).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rma/__manifest__.py | 2 +-
 rma/models/rma.py   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 2d195ec57..1805ac986 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.3.0.0",
+    "version": "14.0.3.1.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 29d591041..bc82a99f4 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -623,6 +623,10 @@ def action_rma_send(self):
             "context": ctx,
         }
 
+    def _add_message_subscribe_partner(self):
+        if self.partner_id and self.partner_id not in self.message_partner_ids:
+            self.message_subscribe([self.partner_id.id])
+
     def action_confirm(self):
         """Invoked when 'Confirm' button in rma form view is clicked."""
         self.ensure_one()
@@ -633,8 +637,7 @@ def action_confirm(self):
             else:
                 reception_move = self._create_receptions_from_product()
             self.write({"reception_move_id": reception_move.id, "state": "confirmed"})
-            if self.partner_id not in self.message_partner_ids:
-                self.message_subscribe([self.partner_id.id])
+            self._add_message_subscribe_partner()
             self._send_confirmation_email()
 
     def action_refund(self):

From dd03cb78f1f35772422562c0d236a07097d7dcbc Mon Sep 17 00:00:00 2001
From: Nikolaus Weingartmair <niwe@odoovm1>
Date: Wed, 10 Aug 2022 07:48:08 +0200
Subject: [PATCH 060/108] [MIG] rma: Migration to 15.0

---
 rma/README.rst                       |  11 +-
 rma/__manifest__.py                  |   2 +-
 rma/data/mail_data.xml               | 128 ++++++----
 rma/i18n/es.po                       | 367 ++++++++++++++++-----------
 rma/i18n/it.po                       |   3 -
 rma/i18n/pt.po                       |   3 -
 rma/i18n/pt_BR.po                    |  85 -------
 rma/i18n/rma.pot                     | 304 ++++++++++++----------
 rma/i18n/ro.po                       |   9 -
 rma/models/rma.py                    | 151 +++++++----
 rma/models/stock_move.py             |  11 +-
 rma/readme/CONTRIBUTORS.rst          |   1 +
 rma/static/description/index.html    |   7 +-
 rma/tests/test_rma.py                |  20 +-
 rma/views/report_rma.xml             |  26 +-
 rma/views/rma_finalization_views.xml |   5 +-
 rma/views/rma_portal_templates.xml   |  83 +++---
 rma/views/rma_tag_views.xml          |   5 +-
 rma/wizard/rma_delivery.py           |   3 +-
 19 files changed, 663 insertions(+), 561 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index b46e91f0b..d0ef4f577 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -14,13 +14,13 @@ 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/14.0/rma
+    :target: https://github.com/OCA/rma/tree/15.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-14-0/rma-14-0-rma
+    :target: https://translation.odoo-community.org/projects/rma-15-0/rma-15-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/14.0
+    :target: https://runbot.odoo-community.org/runbot/145/15.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -138,7 +138,7 @@ 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:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`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**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -158,6 +158,7 @@ Contributors
   * Ernesto Tejeda
   * Pedro M. Baeza
   * David Vidal
+  * Víctor Martínez
 
 * Chafique Delli <chafique.delli@akretion.com>
 * Giovanni Serra - Ooops <giovanni@ooops404.com>
@@ -183,6 +184,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-ernestotejeda| 
 
-This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/14.0/rma>`_ project on GitHub.
+This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/15.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 1805ac986..d0817e53c 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "14.0.3.1.0",
+    "version": "15.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/data/mail_data.xml b/rma/data/mail_data.xml
index 4293a84b7..f1d8afa20 100644
--- a/rma/data/mail_data.xml
+++ b/rma/data/mail_data.xml
@@ -30,31 +30,42 @@
         <field name="parent_id" eval="ref('rma.mt_rma_notification')" />
         <field name="relation_field">team_id</field>
     </record>
+
+
     <!--RMA email template -->
     <record id="mail_template_rma_notification" model="mail.template">
         <field name="name">RMA Notification</field>
         <field name="model_id" ref="model_rma" />
-        <field name="email_from">${object.user_id.email_formatted |safe}</field>
-        <field name="partner_to">${object.partner_id.id}</field>
+        <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>
+        >{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }})</field>
         <field name="report_template" ref="report_rma_action" />
-        <field name="report_name">${(object.name or '')}</field>
-        <field name="lang">${object.partner_id.lang}</field>
+        <field name="report_name">{{(object.name or '')}}</field>
+        <field name="lang">{{object.partner_id.lang}}</field>
         <field name="auto_delete" eval="True" />
         <field name="body_html" type="html">
             <div style="margin: 0px; padding: 0px;">
                 <p style="margin: 0px; padding: 0px; font-size: 13px;">
-    Dear ${object.partner_id.name}
-    % if object.partner_id.parent_id:
-        (${object.partner_id.parent_id.name})
-    % endif
-    <br /><br />
-    Here is the RMA <strong>${object.name}</strong> from ${object.company_id.name}.
-    <br /><br />
-    Do not hesitate to contact us if you have any question.
-</p>
+                    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>
@@ -62,58 +73,73 @@
     <record id="mail_template_rma_receipt_notification" model="mail.template">
         <field name="name">RMA Receipt Notification</field>
         <field name="model_id" ref="model_rma" />
-        <field name="email_from">${object.user_id.email_formatted |safe}</field>
-        <field name="partner_to">${object.partner_id.id}</field>
+        <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>
+        >{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) products received</field>
         <field name="report_template" ref="report_rma_action" />
-        <field name="report_name">${(object.name or '')}</field>
-        <field name="lang">${object.partner_id.lang}</field>
+        <field name="report_name">{{(object.name or '')}}</field>
+        <field name="lang">{{object.partner_id.lang}}</field>
         <field name="auto_delete" eval="True" />
         <field name="body_html" type="html">
-<div style="margin: 0px; padding: 0px;">
-<p style="margin: 0px; padding: 0px; font-size: 13px;">
-    Dear ${object.partner_id.name}
-    % if object.partner_id.parent_id:
-        (${object.partner_id.parent_id.name})
-    % endif
-    <br /><br />
-    The products for your RMA <strong>${object.name}</strong>
-    from ${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>
+            <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="name">RMA Draft Notification</field>
         <field name="model_id" ref="model_rma" />
-        <field name="email_from">${object.user_id.email_formatted |safe}</field>
-        <field name="partner_to">${object.partner_id.id}</field>
+        <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>
+        >{{object.company_id.name}} Your RMA has been succesfully created (Ref {{object.name or 'n/a' }})</field>
         <field name="report_template" ref="report_rma_action" />
-        <field name="report_name">${(object.name or '')}</field>
-        <field name="lang">${object.partner_id.lang}</field>
+        <field name="report_name">{{(object.name or '')}}</field>
+        <field name="lang">{{object.partner_id.lang}}</field>
         <field name="auto_delete" eval="True" />
         <field name="body_html" type="html">
-<div style="margin: 0px; padding: 0px;">
-<p style="margin: 0px; padding: 0px; font-size: 13px;">
-    Dear ${object.partner_id.name}
-    % if object.partner_id.parent_id:
-        (${object.partner_id.parent_id.name})
-    % endif
-    <br /><br />
-    You've succesfully placed your RMA <strong>${object.name}</strong>
-    on ${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>
+            <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>
 </data>
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index bbcc85a5c..5218c230c 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -6,47 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-23 20:11+0000\n"
-"PO-Revision-Date: 2022-01-17 12:39+0000\n"
+"POT-Creation-Date: 2022-08-09 08:07+0000\n"
+"PO-Revision-Date: 2022-08-09 10:16+0200\n"
 "Last-Translator: xavigutipujol <jgutierrez@pyming.com>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"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
-#, fuzzy
-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' }) productos "
-"recibidos"
-
-#. 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} Su RMA se ha creado con éxito (Ref ${object.name "
-"or 'n/a' })"
+"X-Generator: Poedit 2.3\n"
 
 #. module: rma
 #: code:addons/rma/models/rma_team.py:0
@@ -61,27 +30,54 @@ msgstr ""
 
 #. module: rma
 #: 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"
+#, 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> %s<br/><br/><b>Cuerpo del correo "
-"electrónico:</b><br/>%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
+#, fuzzy
+#| 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"
+#| "        "
 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\"/>\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 ""
@@ -102,20 +98,44 @@ msgstr ""
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
+#, fuzzy
+#| 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"
+#| "        "
 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\"/>\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"
@@ -135,21 +155,47 @@ msgstr ""
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
+#, fuzzy
+#| 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"
+#| "        "
 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\"/>\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"
@@ -418,7 +464,7 @@ msgstr "Actividades"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
 msgid "Activity Exception Decoration"
-msgstr ""
+msgstr "Decoración de excepción de actividad"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_state
@@ -534,7 +580,7 @@ msgstr "Cancelado"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
@@ -697,12 +743,12 @@ msgstr "Entregar"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
-msgid "Delivered qty"
+msgid "Delivered Qty"
 msgstr "Ctd. entregada"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered qty done"
+msgid "Delivered Qty Done"
 msgstr "Ctd. entregada realizada"
 
 #. module: rma
@@ -727,12 +773,6 @@ msgid "Description"
 msgstr "Descripción"
 
 #. 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
@@ -741,11 +781,6 @@ msgstr "Descripción"
 #: 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 "Nombre mostrado"
 
@@ -871,12 +906,6 @@ msgstr "Finalizado"
 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 (Canales)"
-
 #. 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 +937,12 @@ msgstr ""
 "Agrupar las devoluciones de RMA a cliente por dirección de envío y almacén"
 
 #. 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,13 +951,8 @@ 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 ""
+msgstr "ID"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_thread_id
@@ -947,7 +971,7 @@ msgstr "Icono"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
 msgid "Icon to indicate an exception activity."
-msgstr ""
+msgstr "Icono para indicar una actividad de excepción."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
@@ -1011,7 +1035,7 @@ msgstr "Es un seguidor"
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
 msgid "Journal Entry"
-msgstr ""
+msgstr "Asiento contable"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move_line
@@ -1019,12 +1043,6 @@ msgid "Journal Item"
 msgstr "Apunte contable"
 
 #. 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
@@ -1033,11 +1051,6 @@ msgstr "Apunte contable"
 #: 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 modificación en"
 
@@ -1180,7 +1193,7 @@ msgstr "Ninguno de los RMAs seleccionados puede realizar una devolución."
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
@@ -1347,11 +1360,11 @@ msgstr "Cantidad a extraer"
 #: 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 cantidad a extraer no puede ser mayor que la cantidad de entrega "
-"restante(%s %s)"
+"restante(%(remaining_qty)s %(product_uom)s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
@@ -1409,6 +1422,11 @@ msgstr "Órdenes de entrega de RMA"
 msgid "RMA Delivery Wizard"
 msgstr "Asistente de entrega de 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"
@@ -1423,7 +1441,6 @@ msgstr "Motivo de finalización de 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 "Motivos de finalización de RMA"
 
@@ -1450,6 +1467,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 "Notificación de RMA"
 
@@ -1475,6 +1493,11 @@ msgstr "Tipo de operación para entrega de RMA"
 msgid "RMA Receipt Confirmation Email"
 msgstr "Correo de confirmación de recepción de RMA"
 
+#. module: rma
+#: model:mail.template,name:rma.mail_template_rma_receipt_notification
+msgid "RMA Receipt Notification"
+msgstr ""
+
 #. module: rma
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
@@ -1501,7 +1524,6 @@ msgstr "Etiqueta 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 "Etiquetas RMA"
 
@@ -1629,16 +1651,16 @@ msgstr "Referencia al documento que generó este RMA."
 msgid "Refund"
 msgstr "Factura rectificativa"
 
+#. 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 "Dirección de facturación de este RMA."
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
-msgid "Refund line"
-msgstr "Línea de factura rectificativa"
-
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
 msgid "Refunded"
@@ -1680,27 +1702,29 @@ msgstr "Reemplazado"
 #: 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 ""
 "Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
-"id=\"%d\">%s</a> (Orden de entrega <a href=\"#\" data-oe-model=\"stock."
-"picking\" data-oe-id=\"%d\">%s</a>) ha sido creado."
+"id=\"%(move_id)d\">%(move_name)s</a> (Orden de entrega <a href=\"#\" data-oe-"
+"model=\"stock.picking\" data-oe-id=\"%(picking_id)d\">%(picking_name)s</a>) "
+"ha sido creado."
 
 #. module: rma
 #: 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 ""
 "Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-"
-"oe-id=\"%d\">%s</a><br/>Cantidad %f %s<br/>El reemplazo realizado no creó un "
-"movimiento nuevo, pero uno de los movimientos creados anteriormente fué "
-"actualizado con estos datos."
+"oe-id=\"%(id)d\">%(name)s</a><br/>Cantidad %(qty) s%(uom)s<br/>El reemplazo "
+"realizado no creó un movimiento nuevo, pero uno de los movimientos creados "
+"anteriormente fué actualizado con estos datos."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
@@ -1745,11 +1769,11 @@ msgstr "Devolver al cliente"
 #: 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 ""
 "Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking"
-"\" data-oe-id=\"%d\">%s</a> ha sido creada."
+"\" data-oe-id=\"%(id)d\">%(name)s</a> ha sido creada."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1887,11 +1911,11 @@ msgstr "Dividir RMA"
 #: 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 ""
-"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</"
-"a> ha sido creado."
+"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> ha sido creado."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -1968,7 +1992,7 @@ msgstr "¡El nombre de operación ya existe!"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_tag__active
 msgid "The active field allows you to hide the category without removing it."
-msgstr ""
+msgstr "El campo activo le permite ocultar la clase sin tener que eliminarla."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
@@ -2008,11 +2032,11 @@ msgstr ""
 #: 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 cantidad realizada para el producto '%s' debe ser igual a la demanda "
-"inicial porque el movimiento está enlazado a un RMA (%s)."
+"La cantidad realizada para el producto '%(id)s' debe ser igual a la demanda "
+"inicial porque el movimiento está enlazado a un RMA (%(name)s)."
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -2077,7 +2101,7 @@ msgstr "Tipo de operación"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
 msgid "Type of the exception activity on record."
-msgstr ""
+msgstr "Tipo de actividad de excepción en registro."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -2247,3 +2271,36 @@ msgid ""
 msgstr ""
 "El usuario tendrá acceso a la configuración de RMA y a los informes "
 "estadí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 "{{(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 ""
+"{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) productos "
+"recibidos"
+
+#. 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}} Su RMA se ha creado con éxito (Ref {{object.name "
+"or 'n/a' }})"
+
+#~ msgid "Followers (Channels)"
+#~ msgstr "Seguidores (Canales)"
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 07944e225..8fb7f7c35 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -2255,6 +2255,3 @@ 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."
-
-#~ msgid "<strong>Invoicing address:</strong>"
-#~ msgstr "<strong>Indirizzo di fatturazione:</strong>"
diff --git a/rma/i18n/pt.po b/rma/i18n/pt.po
index f41795615..b80fca206 100644
--- a/rma/i18n/pt.po
+++ b/rma/i18n/pt.po
@@ -2188,6 +2188,3 @@ msgid ""
 msgstr ""
 "o utilizador terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
-
-#~ msgid "<strong>Invoicing address:</strong>"
-#~ msgstr "<strong>Endereço de Cobrança:</strong>"
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 725841c50..a87e7285f 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -2183,88 +2183,3 @@ msgid ""
 msgstr ""
 "o usuário terá acesso à configuração RMA, bem como aos relatórios "
 "estatísticos."
-
-#~ msgid "<strong>Invoicing address:</strong>"
-#~ msgstr "<strong>Endereço de Cobrança:</strong>"
-
-#~ msgid "Not urgent"
-#~ msgstr "Não é urgente"
-
-#~ msgid "Very Urgent"
-#~ msgstr "Muito Urgente"
-
-#~ 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"
-#~ "    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"
-#~ "    Aqui está o RMA <strong>${object.name}</strong> from ${object."
-#~ "company_id.name}.\n"
-#~ "    <br/><br/>\n"
-#~ "    Não deixe de nos contactar se houver qualquer dúvida ou outra "
-#~ "questão.\n"
-#~ "</p>\n"
-#~ "</div>\n"
-#~ "        "
-
-#~ msgid "<i class=\"fa fa-fw fa-check\"/> <b>Paid</b>"
-#~ msgstr "<i class=\"fa fa-fw fa-check\"/> <b>Pago</b>"
-
-#~ msgid "<i class=\"fa fa-fw fa-clock-o\"/> <b>Waiting Payment</b>"
-#~ msgstr "<i class=\"fa fa-fw fa-clock-o\"/> <b>Aguardando Pagamento</b>"
-
-#~ msgid ""
-#~ "E-mail subject: %s\n"
-#~ "\n"
-#~ "E-mail body:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Assunto do E-mail: %s\n"
-#~ "\n"
-#~ "Corpo do E-mail:\n"
-#~ "%s"
-
-#~ msgid "If checked new messages require your attention."
-#~ msgstr "Se marcada, novas mensagens requerem sua atenção."
-
-#~ msgid "Invoice"
-#~ msgstr "Fatura"
-
-#~ msgid "Invoice Line"
-#~ msgstr "Linha da Fatura"
-
-#~ msgid "Number of error"
-#~ msgstr "Número de Erros"
-
-#~ msgid "Overdue"
-#~ msgstr "Vencidos(as)"
-
-#~ msgid "Planned"
-#~ msgstr "Planejado)a)"
-
-#~ msgid "Today"
-#~ msgstr "Hoje"
-
-#~ msgid "Waiting for refund"
-#~ msgstr "Aguardando Restituição"
-
-#~ msgid "New RMA in draft state"
-#~ msgstr "Novo Rascunho de RMA"
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 83aa4dbf3..598eb8486 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -13,32 +13,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \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
 #: code:addons/rma/models/rma_team.py:0
 #, python-format
@@ -53,7 +27,8 @@ msgstr ""
 #. module: rma
 #: 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
@@ -61,15 +36,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\"/>\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 ""
@@ -78,18 +62,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\"/>\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 ""
 
@@ -97,19 +89,26 @@ 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\"/>\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 ""
 
@@ -149,29 +148,73 @@ 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
@@ -622,12 +665,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
@@ -652,12 +695,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
@@ -666,11 +703,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 ""
 
@@ -794,12 +826,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
@@ -829,12 +855,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
@@ -843,11 +869,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 ""
 
@@ -936,12 +957,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
@@ -950,11 +965,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 ""
 
@@ -1249,8 +1259,8 @@ msgstr ""
 #: 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
@@ -1309,6 +1319,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"
@@ -1323,7 +1338,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 ""
 
@@ -1350,6 +1364,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 ""
 
@@ -1375,6 +1390,11 @@ msgstr ""
 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
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
@@ -1401,7 +1421,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 ""
 
@@ -1529,13 +1548,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,8 +1599,9 @@ msgstr ""
 #, 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."
+"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
@@ -1589,9 +1609,9 @@ msgstr ""
 #, 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
@@ -1638,7 +1658,7 @@ msgstr ""
 #, python-format
 msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
-"id=\"%d\">%s</a> has been created."
+"id=\"%(id)d\">%(name)s</a> has been created."
 msgstr ""
 
 #. module: rma
@@ -1777,8 +1797,8 @@ msgstr ""
 #: 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
@@ -1882,8 +1902,8 @@ msgstr ""
 #: 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
@@ -2113,3 +2133,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/ro.po b/rma/i18n/ro.po
index 30d5d9e87..bb122b14d 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -2174,12 +2174,3 @@ msgid ""
 "the user will have an access to the RMA configuration as well as statistic "
 "reports."
 msgstr ""
-
-#~ msgid "<strong>Invoicing address:</strong>"
-#~ msgstr "<strong>Adresă facturare:</strong>"
-
-#~ msgid "Not urgent"
-#~ msgstr "Nu e urgent"
-
-#~ msgid "Very Urgent"
-#~ msgstr "Forate urgent"
diff --git a/rma/models/rma.py b/rma/models/rma.py
index bc82a99f4..8f2101b55 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1,6 +1,6 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-
+import logging
 from collections import Counter
 
 from odoo import _, api, fields, models
@@ -10,6 +10,8 @@
 
 from odoo.addons.stock.models.stock_move import PROCUREMENT_PRIORITIES
 
+_logger = logging.getLogger(__name__)
+
 
 class Rma(models.Model):
     _name = "rma"
@@ -31,7 +33,6 @@ def _domain_location_id(self):
     # General fields
     sent = fields.Boolean()
     name = fields.Char(
-        string="Name",
         index=True,
         readonly=True,
         states={"draft": [("readonly", False)]},
@@ -40,31 +41,43 @@ def _domain_location_id(self):
     )
     origin = fields.Char(
         string="Source Document",
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
+        states={
+            "locked": [("readonly", True)],
+            "cancelled": [("readonly", True)],
+        },
         help="Reference of the document that generated this RMA.",
     )
     date = fields.Datetime(
-        default=lambda self: fields.Datetime.now(),
+        default=fields.Datetime.now,
         index=True,
         required=True,
         readonly=True,
         states={"draft": [("readonly", False)]},
     )
     deadline = fields.Date(
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
+        states={
+            "locked": [("readonly", True)],
+            "cancelled": [("readonly", True)],
+        },
     )
     user_id = fields.Many2one(
         comodel_name="res.users",
         string="Responsible",
         index=True,
         tracking=True,
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
+        states={
+            "locked": [("readonly", True)],
+            "cancelled": [("readonly", True)],
+        },
     )
     team_id = fields.Many2one(
         comodel_name="rma.team",
         string="RMA team",
         index=True,
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
+        states={
+            "locked": [("readonly", True)],
+            "cancelled": [("readonly", True)],
+        },
     )
     tag_ids = fields.Many2many(comodel_name="rma.tag", string="Tags")
     finalization_id = fields.Many2one(
@@ -72,13 +85,18 @@ def _domain_location_id(self):
         comodel_name="rma.finalization",
         copy=False,
         readonly=True,
-        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+        domain=(
+            "['|', ('company_id', '=', False), ('company_id', '='," " company_id)]"
+        ),
         tracking=True,
     )
     company_id = fields.Many2one(
         comodel_name="res.company",
         default=lambda self: self.env.company,
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
+        states={
+            "locked": [("readonly", True)],
+            "cancelled": [("readonly", True)],
+        },
     )
     partner_id = fields.Many2one(
         string="Customer",
@@ -100,7 +118,9 @@ def _domain_location_id(self):
         comodel_name="res.partner",
         readonly=True,
         states={"draft": [("readonly", False)]},
-        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+        domain=(
+            "['|', ('company_id', '=', False), ('company_id', '='," " company_id)]"
+        ),
         help="Refund address for current RMA.",
     )
     commercial_partner_id = fields.Many2one(
@@ -110,21 +130,25 @@ def _domain_location_id(self):
     picking_id = fields.Many2one(
         comodel_name="stock.picking",
         string="Origin Delivery",
-        domain="["
-        "    ('state', '=', 'done'),"
-        "    ('picking_type_id.code', '=', 'outgoing'),"
-        "    ('partner_id', 'child_of', commercial_partner_id),"
-        "]",
+        domain=(
+            "["
+            "    ('state', '=', 'done'),"
+            "    ('picking_type_id.code', '=', 'outgoing'),"
+            "    ('partner_id', 'child_of', commercial_partner_id),"
+            "]"
+        ),
         readonly=True,
         states={"draft": [("readonly", False)]},
     )
     move_id = fields.Many2one(
         comodel_name="stock.move",
         string="Origin move",
-        domain="["
-        "    ('picking_id', '=', picking_id),"
-        "    ('picking_id', '!=', False)"
-        "]",
+        domain=(
+            "["
+            "    ('picking_id', '=', picking_id),"
+            "    ('picking_id', '!=', False)"
+            "]"
+        ),
         readonly=True,
         states={"draft": [("readonly", False)]},
     )
@@ -159,7 +183,6 @@ def _domain_location_id(self):
         },
     )
     priority = fields.Selection(
-        string="Priority",
         selection=PROCUREMENT_PRIORITIES,
         default="1",
         readonly=True,
@@ -188,7 +211,10 @@ def _domain_location_id(self):
         tracking=True,
     )
     description = fields.Html(
-        states={"locked": [("readonly", True)], "cancelled": [("readonly", True)]},
+        states={
+            "locked": [("readonly", True)],
+            "cancelled": [("readonly", True)],
+        },
     )
     # Reception fields
     location_id = fields.Many2one(
@@ -210,13 +236,11 @@ def _domain_location_id(self):
     # Refund fields
     refund_id = fields.Many2one(
         comodel_name="account.move",
-        string="Refund",
         readonly=True,
         copy=False,
     )
     refund_line_id = fields.Many2one(
         comodel_name="account.move.line",
-        string="Refund line",
         readonly=True,
         copy=False,
     )
@@ -234,13 +258,11 @@ def _domain_location_id(self):
         compute="_compute_delivery_picking_count",
     )
     delivered_qty = fields.Float(
-        string="Delivered qty",
         digits="Product Unit of Measure",
         compute="_compute_delivered_qty",
         store=True,
     )
     delivered_qty_done = fields.Float(
-        string="Delivered qty done",
         digits="Product Unit of Measure",
         compute="_compute_delivered_qty",
         compute_sudo=True,
@@ -447,7 +469,11 @@ def _compute_access_url(self):
 
     # Constrains methods (@api.constrains)
     @api.constrains(
-        "state", "partner_id", "partner_shipping_id", "partner_invoice_id", "product_id"
+        "state",
+        "partner_id",
+        "partner_shipping_id",
+        "partner_invoice_id",
+        "product_id",
     )
     def _check_required_after_draft(self):
         """Check that RMAs are being created or edited with the
@@ -695,6 +721,7 @@ def action_replace(self):
         # in other models
         action = (
             self.env.ref("rma.rma_delivery_wizard_action")
+            .sudo()
             .with_context(active_id=self.id)
             .read()[0]
         )
@@ -717,6 +744,7 @@ def action_return(self):
         # in other models
         action = (
             self.env.ref("rma.rma_delivery_wizard_action")
+            .sudo()
             .with_context(active_id=self.id)
             .read()[0]
         )
@@ -736,6 +764,7 @@ def action_split(self):
         # in other models
         action = (
             self.env.ref("rma.rma_split_wizard_action")
+            .sudo()
             .with_context(active_id=self.id)
             .read()[0]
         )
@@ -751,6 +780,7 @@ def action_finish(self):
         # in other models
         action = (
             self.env.ref("rma.rma_finalization_wizard_action")
+            .sudo()
             .with_context(active_id=self.id)
             .read()[0]
         )
@@ -792,6 +822,7 @@ def action_view_receipt(self):
         # in other models
         action = (
             self.env.ref("stock.action_picking_tree_all")
+            .sudo()
             .with_context(active_id=self.id)
             .read()[0]
         )
@@ -820,6 +851,7 @@ def action_view_delivery(self):
         """Invoked when 'Delivery' smart button in rma form view is clicked."""
         action = (
             self.env.ref("stock.action_picking_tree_all")
+            .sudo()
             .with_context(active_id=self.id)
             .read()[0]
         )
@@ -929,10 +961,15 @@ def _ensure_qty_to_extract(self, qty, uom):
         if to_split_uom_qty > self.remaining_qty:
             raise ValidationError(
                 _(
-                    "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)"
+                )
+                % (
+                    {
+                        "remaining_qty": self.remaining_qty,
+                        "product_uom": self.product_uom.name,
+                    }
                 )
-                % (self.remaining_qty, self.product_uom.name)
             )
 
     # Reception business methods
@@ -1030,12 +1067,9 @@ def extract_quantity(self, qty, uom):
         self.message_post(
             body=_(
                 'Split: <a href="#" data-oe-model="rma" '
-                'data-oe-id="%d">%s</a> has been created.'
-            )
-            % (
-                extracted_rma.id,
-                extracted_rma.name,
+                'data-oe-id="%(id)d">%(name)s</a> has been created.'
             )
+            % ({"id": extracted_rma.id, "name": extracted_rma.name})
         )
         return extracted_rma
 
@@ -1143,9 +1177,9 @@ def create_return(self, scheduled_date, qty=None, uom=None):
                 rma.message_post(
                     body=_(
                         'Return: <a href="#" data-oe-model="stock.picking" '
-                        'data-oe-id="%d">%s</a> has been created.'
+                        'data-oe-id="%(id)d">%(name)s</a> has been created.'
                     )
-                    % (picking.id, picking.name)
+                    % ({"id": picking.id, "name": picking.name})
                 )
             picking.action_confirm()
             picking.action_assign()
@@ -1180,17 +1214,19 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
         if new_move:
             self.message_post(
                 body=_(
-                    "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."
                 )
                 % (
-                    new_move.id,
-                    new_move.name_get()[0][1],
-                    new_move.picking_id.id,
-                    new_move.picking_id.name,
+                    {
+                        "move_id": new_move.id,
+                        "move_name": new_move.name_get()[0][1],
+                        "picking_id": new_move.picking_id.id,
+                        "picking_name": new_move.picking_id.name,
+                    }
                 )
             )
         else:
@@ -1198,12 +1234,19 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
                 body=_(
                     "Replacement:<br/>"
                     'Product <a href="#" data-oe-model="product.product" '
-                    'data-oe-id="%d">%s</a><br/>'
-                    "Quantity %f %s<br/>"
+                    '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."
                 )
-                % (product.id, product.display_name, qty, uom.name)
+                % (
+                    {
+                        "id": product.id,
+                        "name": product.display_name,
+                        "qty": qty,
+                        "uom": uom.name,
+                    }
+                )
             )
         if self.state != "waiting_replacement":
             self.state = "waiting_replacement"
@@ -1291,10 +1334,10 @@ def message_new(self, msg_dict, custom_values=None):
             custom_values = {}
         subject = msg_dict.get("subject", "")
         body = html2plaintext(msg_dict.get("body", ""))
-        desc = _("<b>E-mail subject:</b> %s<br/><br/><b>E-mail body:</b><br/>%s") % (
-            subject,
-            body,
-        )
+        desc = _(
+            "<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail"
+            " body:</b><br/>%(body)s"
+        ) % ({"subject": subject, "body": body})
         defaults = {
             "description": desc,
             "name": _("New"),
@@ -1336,8 +1379,8 @@ def _message_get_suggested_recipients(self):
                 record._message_add_suggested_recipient(
                     recipients, partner=record.partner_id, reason=_("Customer")
                 )
-        except AccessError:  # no read access rights
-            pass
+        except AccessError as e:  # no read access rights
+            _logger.debug(e)
         return recipients
 
     # Reporting business methods
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index 635db5d6c..1e846eec6 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -60,11 +60,16 @@ def _action_done(self, cancel_backorder=False):
             if rma_receiver and move.quantity_done != rma_receiver.product_uom_qty:
                 raise ValidationError(
                     _(
-                        "The quantity done for the product '%s' must "
+                        "The quantity done for the product '%(id)s' must "
                         "be equal to its initial demand because the "
-                        "stock move is linked to an RMA (%s)."
+                        "stock move is linked to an RMA (%(name)s)."
+                    )
+                    % (
+                        {
+                            "id": move.product_id.name,
+                            "name": move.rma_receiver_ids.name,
+                        }
                     )
-                    % (move.product_id.name, move.rma_receiver_ids.name)
                 )
         res = super()._action_done(cancel_backorder=cancel_backorder)
         move_done = self.filtered(lambda r: r.state == "done").sudo()
diff --git a/rma/readme/CONTRIBUTORS.rst b/rma/readme/CONTRIBUTORS.rst
index c93f16063..75646b6d3 100644
--- a/rma/readme/CONTRIBUTORS.rst
+++ b/rma/readme/CONTRIBUTORS.rst
@@ -3,6 +3,7 @@
   * Ernesto Tejeda
   * Pedro M. Baeza
   * David Vidal
+  * Víctor Martínez
 
 * Chafique Delli <chafique.delli@akretion.com>
 * Giovanni Serra - Ooops <giovanni@ooops404.com>
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index 7ebc384b7..d26b5a0cc 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/14.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-14-0/rma-14-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/14.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" 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>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
@@ -494,7 +494,7 @@ <h1><a class="toc-backref" href="#id4">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:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<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>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -512,6 +512,7 @@ <h2><a class="toc-backref" href="#id7">Contributors</a></h2>
 <li>Ernesto Tejeda</li>
 <li>Pedro M. Baeza</li>
 <li>David Vidal</li>
+<li>Víctor Martínez</li>
 </ul>
 </li>
 <li>Chafique Delli &lt;<a class="reference external" href="mailto:chafique.delli&#64;akretion.com">chafique.delli&#64;akretion.com</a>&gt;</li>
@@ -527,7 +528,7 @@ <h2><a class="toc-backref" href="#id8">Maintainers</a></h2>
 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/14.0/rma">OCA/rma</a> project on GitHub.</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>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 22b9327e4..63363b290 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -2,13 +2,13 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo.exceptions import UserError, ValidationError
-from odoo.tests import Form, SavepointCase, new_test_user, users
+from odoo.tests import Form, TransactionCase, new_test_user, users
 
 
-class TestRma(SavepointCase):
+class TestRma(TransactionCase):
     @classmethod
     def setUpClass(cls):
-        super(TestRma, cls).setUpClass()
+        super().setUpClass()
         cls.user_rma = new_test_user(
             cls.env,
             login="user_rma",
@@ -25,7 +25,11 @@ def setUpClass(cls):
             {"name": "Product test 1", "type": "product"}
         )
         account_type = cls.env["account.account.type"].create(
-            {"name": "RCV type", "type": "receivable", "internal_group": "income"}
+            {
+                "name": "RCV type",
+                "type": "receivable",
+                "internal_group": "income",
+            }
         )
         cls.account_receiv = cls.env["account.account"].create(
             {
@@ -59,7 +63,7 @@ def setUpClass(cls):
             }
         )
         cls.finalization_reason_1 = cls.env["rma.finalization"].create(
-            {"name": "[Test] It can't be repaired and customer doesn't want it"}
+            {"name": ("[Test] It can't be repaired and customer doesn't want it")}
         )
         cls.finalization_reason_2 = cls.env["rma.finalization"].create(
             {"name": "[Test] It's out of warranty. To be scrapped"}
@@ -199,7 +203,7 @@ def test_ensure_required_fields_on_confirm(self):
         with self.assertRaises(ValidationError) as e:
             rma.action_confirm()
         self.assertEqual(
-            e.exception.name,
+            e.exception.args[0],
             "Required field(s):\nCustomer\nShipping Address\nInvoice Address\n"
             "Product\nLocation",
         )
@@ -207,7 +211,7 @@ def test_ensure_required_fields_on_confirm(self):
             rma_form.partner_id = self.partner
         with self.assertRaises(ValidationError) as e:
             rma.action_confirm()
-        self.assertEqual(e.exception.name, "Required field(s):\nProduct\nLocation")
+        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
@@ -334,7 +338,7 @@ def test_mass_refund(self):
         action = self.env.ref("rma.rma_refund_action_server")
         ctx = dict(self.env.context)
         ctx.update(active_ids=all_rmas.ids, active_model="rma")
-        action.with_context(ctx).run()
+        action.with_context(**ctx).run()
         # After that all RMAs are in 'refunded' state
         self.assertEqual(all_rmas.mapped("state"), ["refunded"] * 4)
         # Two refunds were created
diff --git a/rma/views/report_rma.xml b/rma/views/report_rma.xml
index 46bbd3e8d..4c1af5e7f 100644
--- a/rma/views/report_rma.xml
+++ b/rma/views/report_rma.xml
@@ -9,9 +9,11 @@
                         t-field="doc.partner_id"
                         t-options='{"widget": "contact", "fields": ["address", "name"], "no_marker": True}'
                     />
-                    <p t-if="doc.partner_id.vat"><t
-                            t-esc="doc.company_id.country_id.vat_label or 'Tax ID'"
-                        />: <span t-field="doc.partner_id.vat" /></p>
+                    <p t-if="doc.partner_id.vat">
+                        <t t-esc="doc.company_id.country_id.vat_label or 'Tax ID'" />
+                        :
+                        <span t-field="doc.partner_id.vat" />
+                    </p>
                 </t>
             </t>
             <t
@@ -19,24 +21,24 @@
             and doc.partner_invoice_id != doc.partner_id
             or doc.partner_shipping_id != doc.partner_invoice_id"
             >
-            <t t-set="information_block">
-                <strong
+                <t t-set="information_block">
+                    <strong
                         t-if="doc.partner_shipping_id == doc.partner_invoice_id"
                     >Invoicing and Shipping Address:</strong>
-                <strong
+                    <strong
                         t-if="doc.partner_shipping_id != doc.partner_invoice_id"
                     >Invoicing Address:</strong>
-                <div
+                    <div
                         t-field="doc.partner_invoice_id"
                         t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
                     />
-                <t t-if="doc.partner_shipping_id != doc.partner_invoice_id">
-                    <strong>Shipping Address:</strong>
-                    <div
+                    <t t-if="doc.partner_shipping_id != doc.partner_invoice_id">
+                        <strong>Shipping Address:</strong>
+                        <div
                             t-field="doc.partner_shipping_id"
                             t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'
                         />
-                </t>
+                    </t>
                 </t>
             </t>
             <div class="page">
@@ -120,7 +122,7 @@
                 </div>
                 <div t-if="doc.description">
                     <strong>RMA Note:</strong>
-                    <p t-raw="doc.description" />
+                    <p t-out="doc.description" />
                 </div>
             </div>
         </t>
diff --git a/rma/views/rma_finalization_views.xml b/rma/views/rma_finalization_views.xml
index ce0fb51c1..45b3c9bcf 100644
--- a/rma/views/rma_finalization_views.xml
+++ b/rma/views/rma_finalization_views.xml
@@ -44,7 +44,7 @@
         <field name="model">rma.finalization</field>
         <field eval="6" name="priority" />
         <field name="arch" type="xml">
-            <tree string="RMA Finalization Reasons">
+            <tree>
                 <field name="name" />
                 <field name="company_id" groups="base.group_multi_company" />
             </tree>
@@ -57,7 +57,8 @@
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
             Create a new RMA finalization
-            </p><p>
+            </p>
+            <p>
             Manage RMA finalization reasons to better classify them for tracking and analysis purposes.
             </p>
         </field>
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index eb1b68924..be57983b7 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -97,7 +97,8 @@
                 <t t-set="card_header">
                     <h5 class="mb-0">
                         <span>
-                            RMA Order - <span t-field="rma.name" />
+                            RMA Order -
+                            <span t-field="rma.name" />
                         </span>
                         <span
                             style="position: absolute; left: 50%;"
@@ -353,32 +354,36 @@
                                     title="Download"
                                 />
                                 <span t-esc="picking.name" class="mr-lg-3" />
-                                <div class="d-lg-inline-block">Date: <span
-                                        class="text-muted"
-                                        t-field="picking.date"
-                                    /></div>
+                                <div class="d-lg-inline-block">
+                                    Date:
+                                    <span class="text-muted" t-field="picking.date" />
+                                </div>
                             </div>
                             <t t-if="picking.state == 'done'">
-                                <span class="badge badge-success label-text-align"><i
-                                        class="fa fa-fw fa-truck"
-                                    /> Shipped</span>
+                                <span class="badge badge-success label-text-align">
+                                    <i class="fa fa-fw fa-truck" />
+                                    Shipped
+                                </span>
                             </t>
                             <t t-if="picking.state == 'partially_available'">
-                                <span class="badge badge-warning label-text-align"><i
-                                        class="fa fa-fw fa-clock-o"
-                                    /> Partially Available</span>
+                                <span class="badge badge-warning label-text-align">
+                                    <i class="fa fa-fw fa-clock-o" />
+                                    Partially Available
+                                </span>
                             </t>
                             <t t-if="picking.state == 'cancel'">
-                                <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">
+                                    <i class="fa fa-fw fa-times" />
+                                    Cancelled
+                                </span>
                             </t>
                             <t
                                 t-if="picking.state in ['draft', 'waiting', 'confirmed', 'assigned']"
                             >
-                                <span class="badge badge-info label-text-align"><i
-                                        class="fa fa-fw fa-clock-o"
-                                    /> Preparation</span>
+                                <span class="badge badge-info label-text-align">
+                                    <i class="fa fa-fw fa-clock-o" />
+                                    Preparation
+                                </span>
                             </t>
                         </a>
                     </section>
@@ -406,10 +411,13 @@
                                     title="Download"
                                 />
                                 <span t-esc="refund.name" class="mr-lg-3" />
-                                <div class="d-lg-inline-block">Date: <span
+                                <div class="d-lg-inline-block">
+                                    Date:
+                                    <span
                                         class="text-muted"
                                         t-field="refund.invoice_date"
-                                    /></div>
+                                    />
+                                </div>
                             </div>
                             <span
                                 t-if="refund.state == 'paid'"
@@ -455,38 +463,45 @@
                                             title="Download"
                                         />
                                         <span t-esc="picking.name" class="mr-lg-3" />
-                                        <div class="d-lg-inline-block">Date: <span
+                                        <div class="d-lg-inline-block">
+                                            Date:
+                                            <span
                                                 class="text-muted"
                                                 t-field="picking.date"
-                                            /></div>
+                                            />
+                                        </div>
                                     </div>
                                     <t t-if="picking.state == 'done'">
                                         <span
                                             class="badge badge-success label-text-align"
-                                        ><i class="fa fa-fw fa-truck" /> Shipped</span>
+                                        >
+                                            <i class="fa fa-fw fa-truck" />
+                                            Shipped
+                                        </span>
                                     </t>
                                     <t t-if="picking.state == 'partially_available'">
                                         <span
                                             class="badge badge-warning label-text-align"
-                                        ><i
-                                                class="fa fa-fw fa-clock-o"
-                                            /> Partially Available</span>
+                                        >
+                                            <i class="fa fa-fw fa-clock-o" />
+                                            Partially Available
+                                        </span>
                                     </t>
                                     <t t-if="picking.state == 'cancel'">
                                         <span
                                             class="badge badge-danger label-text-align"
-                                        ><i
-                                                class="fa fa-fw fa-times"
-                                            /> Cancelled</span>
+                                        >
+                                            <i class="fa fa-fw fa-times" />
+                                            Cancelled
+                                        </span>
                                     </t>
                                     <t
                                         t-if="picking.state in ['draft', 'waiting', 'confirmed', 'assigned']"
                                     >
-                                        <span
-                                            class="badge badge-info label-text-align"
-                                        ><i
-                                                class="fa fa-fw fa-clock-o"
-                                            /> Preparation</span>
+                                        <span class="badge badge-info label-text-align">
+                                            <i class="fa fa-fw fa-clock-o" />
+                                            Preparation
+                                        </span>
                                     </t>
                                 </a>
                             </t>
@@ -495,7 +510,7 @@
                     <section id="description" class="mt-5" t-if="rma.description">
                         <h3 class="">Description</h3>
                         <hr class="mt-0 mb-1" />
-                        <t t-raw="rma.description" />
+                        <t t-out="rma.description" />
                     </section>
                 </t>
             </t>
diff --git a/rma/views/rma_tag_views.xml b/rma/views/rma_tag_views.xml
index d7166b65c..3cd8b9150 100644
--- a/rma/views/rma_tag_views.xml
+++ b/rma/views/rma_tag_views.xml
@@ -37,7 +37,7 @@
         <field name="model">rma.tag</field>
         <field eval="6" name="priority" />
         <field name="arch" type="xml">
-            <tree string="RMA Tags">
+            <tree>
                 <field name="name" />
                 <field name="is_public" />
                 <field name="active" />
@@ -51,7 +51,8 @@
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
             Create a new RMA tag
-            </p><p>
+            </p>
+            <p>
             Manage RMA tags to better classify them for tracking and analysis purposes.
             </p>
         </field>
diff --git a/rma/wizard/rma_delivery.py b/rma/wizard/rma_delivery.py
index 747e5fb89..b47aa75e8 100644
--- a/rma/wizard/rma_delivery.py
+++ b/rma/wizard/rma_delivery.py
@@ -12,7 +12,6 @@ class RmaReDeliveryWizard(models.TransientModel):
     rma_count = fields.Integer()
     type = fields.Selection(
         selection=[("replace", "Replace"), ("return", "Return to customer")],
-        string="Type",
         required=True,
     )
     product_id = fields.Many2one(
@@ -24,7 +23,7 @@ class RmaReDeliveryWizard(models.TransientModel):
         digits="Product Unit of Measure",
     )
     product_uom = fields.Many2one(comodel_name="uom.uom", string="Unit of measure")
-    scheduled_date = fields.Datetime(required=True, default=fields.Datetime.now())
+    scheduled_date = fields.Datetime(required=True, default=fields.Datetime.now)
     warehouse_id = fields.Many2one(
         comodel_name="stock.warehouse",
         string="Warehouse",

From 9a53ea0035d443120d9c3f9dba4fdbde7f444034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Fri, 19 Aug 2022 08:08:18 +0200
Subject: [PATCH 061/108] [OU-ADD] rma: Add migration script. TT37300

---
 rma/__manifest__.py                           |  2 +-
 .../15.0.1.0.0/noupdate_changes.xml           | 99 +++++++++++++++++++
 rma/migrations/15.0.1.0.0/post-migration.py   | 18 ++++
 3 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 rma/migrations/15.0.1.0.0/noupdate_changes.xml
 create mode 100644 rma/migrations/15.0.1.0.0/post-migration.py

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index d0817e53c..1b99d61ef 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "15.0.1.0.0",
+    "version": "15.0.1.0.1",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/migrations/15.0.1.0.0/noupdate_changes.xml b/rma/migrations/15.0.1.0.0/noupdate_changes.xml
new file mode 100644
index 000000000..7937b11e7
--- /dev/null
+++ b/rma/migrations/15.0.1.0.0/noupdate_changes.xml
@@ -0,0 +1,99 @@
+<?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
new file mode 100644
index 000000000..d83f6aba0
--- /dev/null
+++ b/rma/migrations/15.0.1.0.0/post-migration.py
@@ -0,0 +1,18 @@
+# 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",
+        ],
+    )

From 171fd36ef29cbd64e687078fee8f3403e61c6806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Fri, 2 Sep 2022 17:58:23 +0200
Subject: [PATCH 062/108] [IMP] rma: Use _prepare_home_portal_values()
 function.

---
 rma/__manifest__.py                |  2 +-
 rma/controllers/main.py            | 20 ++++++++++++++------
 rma/views/rma_portal_templates.xml |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 1b99d61ef..a0e44aa1c 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "15.0.1.0.1",
+    "version": "15.0.1.1.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/controllers/main.py b/rma/controllers/main.py
index 07f98862d..e87bd82ec 100644
--- a/rma/controllers/main.py
+++ b/rma/controllers/main.py
@@ -1,4 +1,5 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2022 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import _, exceptions, http
@@ -10,12 +11,16 @@
 
 
 class PortalRma(CustomerPortal):
-    def _prepare_portal_layout_values(self):
-        values = super()._prepare_portal_layout_values()
-        if request.env["rma"].check_access_rights("read", raise_exception=False):
-            values["rma_count"] = request.env["rma"].search_count([])
-        else:
-            values["rma_count"] = 0
+    def _prepare_home_portal_values(self, counters):
+        values = super()._prepare_home_portal_values(counters)
+        if "rma_count" in counters:
+            rma_model = request.env["rma"]
+            rma_count = (
+                rma_model.search_count([])
+                if rma_model.check_access_rights("read", raise_exception=False)
+                else 0
+            )
+            values["rma_count"] = rma_count
         return values
 
     def _rma_get_page_view_values(self, rma, access_token, **kwargs):
@@ -36,6 +41,9 @@ def _get_filter_domain(self, kw):
     def portal_my_rmas(self, page=1, date_begin=None, date_end=None, sortby=None, **kw):
         values = self._prepare_portal_layout_values()
         rma_obj = request.env["rma"]
+        # Avoid error if the user does not have access.
+        if not rma_obj.check_access_rights("read", raise_exception=False):
+            return request.redirect("/my")
         domain = self._get_filter_domain(kw)
         searchbar_sortings = {
             "date": {"label": _("Date"), "order": "date desc"},
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index be57983b7..7c56d9425 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -31,7 +31,7 @@
             <t t-call="portal.portal_docs_entry">
                 <t t-set="title">RMA Orders</t>
                 <t t-set="url" t-value="'/my/rmas'" />
-                <t t-set="count" t-value="rma_count" />
+                <t t-set="placeholder_count" t-value="'rma_count'" />
             </t>
         </xpath>
     </template>

From 4b4fa11993986ac598b105b68a771c4eb2bcbf3d Mon Sep 17 00:00:00 2001
From: Nikolaus Weingartmair <nikolaus.weingartmair@grueneerde.com>
Date: Mon, 26 Sep 2022 05:29:41 +0000
Subject: [PATCH 063/108] Added translation using Weblate (German)

Currently translated at 100.0% (354 of 354 strings)

Translation: rma-15.0/rma-15.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-15-0/rma-15-0-rma/de/

Added translation using Weblate (German (Austria))
---
 rma/i18n/de.po    | 2393 +++++++++++++++++++++++++++++++++++++++++++++
 rma/i18n/de_AT.po | 2162 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 4555 insertions(+)
 create mode 100644 rma/i18n/de.po
 create mode 100644 rma/i18n/de_AT.po

diff --git a/rma/i18n/de.po b/rma/i18n/de.po
new file mode 100644
index 000000000..7a706b1ba
--- /dev/null
+++ b/rma/i18n/de.po
@@ -0,0 +1,2393 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 15.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2022-09-26 10:58+0000\n"
+"Last-Translator: Nikolaus Weingartmair <nikolaus.weingartmair@grueneerde.com>"
+"\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.3.2\n"
+
+#. module: rma
+#: code:addons/rma/models/rma_team.py:0
+#, python-format
+msgid "%s (copy)"
+msgstr "%s (Kopie)"
+
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "(object._get_report_base_filename())"
+msgstr "(object._get_report_base_filename())"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid ""
+"<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
+msgstr ""
+"<b>E-mail Betreff:</b>%(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
+
+#. 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\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"
+"        "
+
+#. 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\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"
+"        "
+
+#. 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\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"
+"        "
+
+#. 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\"/>"
+msgstr ""
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
+"\"Download\"/>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
+msgstr ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Bezahlt</b>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
+msgstr ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Wartet auf Bezahlung</b>"
+
+#. 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 ""
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
+
+#. 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 ""
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
+"\"Download\"/>"
+
+#. 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"
+"                                            Cancelled\n"
+"                                        </span>"
+msgstr ""
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/>"
+"\n"
+"                                            Storniert\n"
+"                                        </span>"
+
+#. 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"
+"                                    Cancelled\n"
+"                                </span>"
+msgstr ""
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Abgebrochen\n"
+"                                </span>"
+
+#. module: rma
+#: 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"
+"                                            Preparation\n"
+"                                        </span>"
+msgstr ""
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\""
+"/>\n"
+"                                            in Vorbereitung\n"
+"                                        </span>"
+
+#. module: rma
+#: 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"
+"                                    Preparation\n"
+"                                </span>"
+msgstr ""
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    in Vorbereitung\n"
+"                                </span>"
+
+#. 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 ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/>"
+"\n"
+"                                            Versendet\n"
+"                                        </span>"
+
+#. 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 ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Versendet\n"
+"                                </span>"
+
+#. 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\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\""
+"/>\n"
+"                                            nur teilweise verfügbar\n"
+"                                        </span>"
+
+#. 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\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    nur teilweise verfügbar\n"
+"                                </span>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Diese Werte sind "
+"unternehmensspezifisch.\" groups=\"base.group_multi_company\"/>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr "<strong class=\"d-block mb-1\">Lieferung</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr "<strong class=\"d-block mb-1\">Empfang</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr "<strong class=\"d-block mb-1\">Rückerstattung</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr "<strong>Kunde:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr "<strong>Datum:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr "<strong>Stichtag:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr "<strong>Stichtag</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr "<strong>Liefermenge:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr "<strong>Gelieferte Menge</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr "<strong>Buchungssatz:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr "<strong>Ursprungslieferung:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin delivery</strong>"
+msgstr "<strong>Ursprungslieferung</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr "<strong>Ursprung:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr "<strong>Ursprung</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr "<strong>Produkt:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr "<strong>Produkt</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr "<strong>Menge:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr "<strong>Menge</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr "<strong>RMA Datum</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr "<strong>RMA Notiz:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr "<strong>Verantwortlich:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr "<strong>Versandadresse:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr "<strong>Versandadresse:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr "<strong>Status:</strong>"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+"Ein Python-Wörterbuch, das ausgewertet wird, um beim Erstellen neuer "
+"Datensätze für diesen Alias Standardwerte bereitzustellen."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Accept Emails From"
+msgstr "Akzeptiere Emails von"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr "Zugriffswarnung"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr "Handlungsbedarf"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr "Aktivitäten"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr "Ausnahmenkennzeichung"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr "Aktivitätsstatus"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr "Aktivitätstyp-Symbol"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr "Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr "Alias Kontaktsicherheit"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr "Alias Name"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr "Alias domain"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr "Aliased Model"
+
+#. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr "Erlauben Sie den manuellen RMA-Abschluss"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr ""
+"Lassen Sie eine RMA abschließen, ohne ein Produkt zurückzusenden oder eine "
+"Rückerstattung zu leisten"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "Archived"
+msgstr "Archiviert"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr "Möchten Sie diese RMA wirklich stornieren"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr "Anzahl der Anhänge"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr "Avatar"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr "Kann beendet werden"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr "Kann gesperrt werden"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr "Kann erstattet werden"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr "Kann ersetzt werden"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr "Kann zurückgegeben werden"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr "Kann aufgeteilt werden"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr "Absagen"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
+msgid "Canceled"
+msgstr "Abgebrochen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr "Kastegorie"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr "Kategorie UoM"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr "Klicken Sie hier, um eine neue RMA hinzuzufügen."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr "Farbindex"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr "Gewerbliche Einheit"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr "Kommunikation"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr "Unternehmen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr "Unternehmen"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr "Konfigurationseinstellungen"
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Confirmed"
+msgstr "Bestätigt"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr "Kontakt"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+"Die Umrechnung zwischen Maßeinheiten kann nur erfolgen, wenn sie zur selben "
+"Kategorie gehören. Die Umrechnung erfolgt anhand der Verhältnisse."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr "Erstellen Sie RMAs"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr "Erstellen Sie einen neuen RMA-Abschluss"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr "Erstellen Sie ein neues RMA-Tag"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr "Erstellt von"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr "Erstellt am"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr "Benutzerdefinierte Bounce Message"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr "Kundenportal URL"
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr "Datum"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr "Datum:"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr "Stichtag"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr "Unterlassungswerte"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr "Lieferung"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered Qty"
+msgstr "gelieferte Menge"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered Qty Done"
+msgstr "gelieferte Menge Erledigt"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr "Lieferung"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr "Anzahl der Lieferungen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr "Lieferreservierung"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
+#: 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
+msgid "Display Name"
+msgstr "Anzeigename"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Draft"
+msgstr "Entwurf"
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr "RMA Entwurf"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr "Email"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr "Email Alias"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr "Email Template"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr "E-Mail-Vorlage Bestätigung für RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr "E-Mail-Vorlagenentwurf Benachrichtigung für RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr "E-Mail-Vorlage Empfangsbestätigung für RMA"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr "E-Mail wird an den Kunden gesendet, sobald die RMA bestätigt wurde."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+"E-Mail wird an die Kunden gesendet, sobald die RMA-Produkte eingegangen sind."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+"Eine E-Mail wird an die Kunden gesendet, wenn eine RMA über das Portal "
+"aufgegeben wird"
+
+#. module: rma
+#: code:addons/rma/wizard/rma_split.py:0
+#, python-format
+msgid "Extracted RMA"
+msgstr "Extrahierter RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr "Herausgefiltert aus"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr "Abschlussgrund"
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr "Abschlussgrund existiert bereits !"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr "Abschluss"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr "RMA abschließen"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr "RMA manuell abschließen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr "Schließen Sie die RMA manuell ab, indem Sie einen Grund auswählen"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr "Schließen Sie RMAs manuell ab"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr "Fertig"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+msgid "Followers"
+msgstr "Anhänger"
+
+#. 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
+msgid "Followers (Partners)"
+msgstr "Follower (Partner)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr "Schriftart tolles Symbol z.B. fa-aufgaben"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+msgstr "Gruppiere nach"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr "Gruppieren Sie RMA-Rücksendungen nach Kundenadresse und Lager"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Group RMA returns by customer and warehouse."
+msgstr "Gruppieren Sie RMA-Rücksendungen nach Kunde und Lager."
+
+#. module: rma
+#: 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 "Nachricht vorhanden"
+
+#. 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_operation__id
+#: 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
+msgid "ID"
+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)"
+msgstr ""
+"ID des übergeordneten Datensatzes, der den Alias enthält (Beispiel: Projekt "
+"enthält den Alias für die Aufgabenerstellung)"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr "Icon"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+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 "
+"Aufmerksamkeit."
+
+#. 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 "
+"Übermittlungsfehler auf."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+"Wenn eingestellt, wird dieser Inhalt anstelle der Standardnachricht "
+"automatisch an nicht autorisierte Benutzer gesendet."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
+msgstr ""
+"Wenn das aktive Feld auf „false“ gesetzt ist, können Sie das RMA-Team "
+"ausblenden, ohne es zu entfernen."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Incoming e-mail"
+msgstr "Eingehende E-Mail"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr "Rechnungsanschrift"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr "Rechnungsadresse:"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr "Rechnungs- und Lieferadresse:"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr "Ist Follower"
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entry"
+msgstr "Journaleintrag"
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move_line
+msgid "Journal Item"
+msgstr "Journaleintrag"
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
+#: 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
+msgid "Last Modified on"
+msgstr "Zuletzt geändert am"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr "Zuletzt aktualisiert von"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr "Zuletzt aktualisiert am"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr "Verspätete RMAs"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr "Ort"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr "Sperren"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
+msgid "Locked"
+msgstr "Gesperrt"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr "Hauptanhang"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+"Verwalten Sie RMA-Abschlussgründe, um sie für Nachverfolgungs- und "
+"Analysezwecke besser zu klassifizieren."
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+"Verwalten Sie RMA-Tags, um sie für Nachverfolgungs- und Analysezwecke besser "
+"zu klassifizieren."
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr "Verwalten Sie Warenrücksendegenehmigungen (RMAs)."
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr "Manager"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr "Fehler bei der Nachrichtenübermittlung"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr "Mitteilungen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr "Meine Aktivitätsfrist"
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+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
+#, python-format
+msgid "New"
+msgstr "Neu"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "Frist für die nächste Aktivität"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr "Zusammenfassung der nächsten Aktivität"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+msgid "Next Activity Type"
+msgstr "Nächster Aktivitätstyp"
+
+#. module: rma
+#: 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
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a return."
+msgstr "Keine der ausgewählten RMAs kann eine Rücksendung durchführen."
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr "Anzahl der Aktionen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of errors"
+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"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+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 ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+"Optionale ID eines Threads (Datensatzes), an den alle eingehenden "
+"Nachrichten angehängt werden, auch wenn sie nicht darauf geantwortet haben. "
+"Wenn gesetzt, wird die Erstellung neuer Datensätze vollständig deaktiviert."
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr "Aufträge"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr "Ursprungslieferung"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr "Ursprungsbuchungssatz"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr "Andere Informationen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr "Eigentümer"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr "übergeordnetes Modell"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+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) and task (model))"
+msgstr ""
+"Übergeordnetes Modell mit dem Alias. Das Modell, das die Alias-Referenz "
+"enthält, ist nicht unbedingt das durch alias_model_id angegebene Modell "
+"(Beispiel: Projekt (parent_model) und Aufgabe (model))"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr "Partner"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+msgstr ""
+"Richtlinie zum Posten einer Nachricht im Dokument über das Mailgateway.\n"
+"- Jeder: Jeder kann Posten\n"
+"- Partner: Nur authentifizierte Partner\n"
+"- Follower: Nur Follower des zugehörigen Dokuments oder Mitglieder der "
+"folgenden Kanäle\n"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr "URL für den Portalzugriff"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr "Vorschau"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr "Priorität"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr "Beschaffungsgruppe"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr "Produkt"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr "Produktmenge"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr "Öffentlicher Tag"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Quantity"
+msgstr "Menge"
+
+#. module: rma
+#: 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
+msgid "Quantity must be greater than 0."
+msgstr "Die Menge muss größer als 0 sein."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract"
+msgstr "Zu extrahierende Menge"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid ""
+"Quantity to extract cannot be greater than remaining delivery quantity "
+"(%(remaining_qty)s %(product_uom)s)"
+msgstr ""
+"Die zu entnehmende Menge darf nicht größer als die verbleibende Liefermenge "
+"sein (%(remaining_qty)s%(product_uom)s)"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr "Menge, die in eine neue RMA extrahiert werden soll."
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr "RMA"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr "RMA #"
+
+#. module: rma
+#: code:addons/rma/models/res_company.py:0
+#, python-format
+msgid "RMA Code"
+msgstr "RMA-Code"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr "RMA-Bestätigungs-E-Mail"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr "RMA-Datum"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr "RMA-Frist"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr "RMA-Lieferaufträge"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+msgid "RMA Delivery Wizard"
+msgstr "RMA-Zustellungsassistent"
+
+#. module: rma
+#: model:mail.template,name:rma.mail_template_rma_draft_notification
+msgid "RMA Draft Notification"
+msgstr "Benachrichtigung über RMA-Entwurf"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "RMA Finalization"
+msgstr "RMA-Abschluss"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr "RMA-Abschlussgrund"
+
+#. module: 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
+msgid "RMA Finalization Reasons"
+msgstr "Gründe für den RMA-Abschluss"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr "RMA-Abschlussassistent"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr "RMA-Eingangstyp"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr "RMA-Standort"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+msgstr "Manueller RMA-Abschluss"
+
+#. 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 "RMA-Benachrichtigung"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr "RMA-Bestellung -"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr "RMA-Bestellungen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr "RMA-Out-Typ"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Receipt Confirmation Email"
+msgstr "RMA-Empfangsbestätigungs-E-Mail"
+
+#. module: rma
+#: model:mail.template,name:rma.mail_template_rma_receipt_notification
+msgid "RMA Receipt Notification"
+msgstr "RMA-Empfangsbenachrichtigung"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Receipts"
+msgstr "RMA-Quittungen"
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr "RMA-Bericht"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr "RMA-Aufteilungsassistent"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr "RMA Tag"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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
+msgid "RMA Tags"
+msgstr "RMA-Tags"
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr "RMA-Team"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr "RMA-Team, dem der Benutzer angehört."
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr "Automatische RMA-Kundenbenachrichtigungen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr "RMA-Zählung"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr "Benachrichtigungs-E-Mail zum RMA-Entwurf"
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr "RMA im Entwurfszustand"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr "RMA-Empfänger"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr "RMA-bezogene Produkte können in diesem Lager gelagert werden."
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr "RMA angeforderter Vorgang"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr "RMA-Rückgabe"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr "RMA-Team"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr "RMAs"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr "RMAs, deren Frist abgelaufen ist"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr "RMAs müssen noch vollständig bearbeitet werden"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr "Grund"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr "Name des Grundes"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr "Kassenbon"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Received"
+msgstr "Erhalten"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr "Eingangsbuchungssatz"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr "Thread ID des Eintrags"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+msgid "Reference of the document that generated this RMA."
+msgstr "Referenz des Dokuments, das diese RMA erstellt hat."
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#, python-format
+msgid "Refund"
+msgstr "Erstattung"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
+msgid "Refund Line"
+msgstr "Rückerstattungsbuchungssatz"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
+msgid "Refund address for current RMA."
+msgstr "Rückerstattungsadresse für aktuelle RMA."
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
+msgid "Refunded"
+msgstr "Erstattet"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr "Verbleibende Liefermenge"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr "Verbleibende Liefermenge zu erledigen"
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr "Reparatur"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
+#: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Replace"
+msgstr "Ersetzen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr "Produkt ersetzen"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
+msgid "Replaced"
+msgstr "Ersetzt"
+
+#. module: rma
+#: 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."
+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 "
+"erstellt.."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid ""
+"Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
+"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 ""
+"Ersatz:<br/>Produkt <a href=\"#\" data-oe-model=\"product.product\" data-oe-"
+"id=\"%(id)d\">%(name)s</a><br/>Quantity %(qty)s%(uom)s<br/>Durch diese "
+"Ersetzung wurde kein neuer Buchungssatz erstellt, aber einer der zuvor "
+"erstellten Buchungssätze wurde mit diesen Daten aktualisiert."
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_reporting_menu
+msgid "Reporting"
+msgstr "Berichte"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+msgid "Requested operation"
+msgstr "Angeforderter Vorgang"
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Required field(s):%s"
+msgstr "Erforderliche(s) Feld(er): %s"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr "Verantwortlich"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+msgid "Responsible User"
+msgstr "Verantwortlicher Benutzer"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking
+msgid "Return Picking"
+msgstr "Inbound Kommissionierung"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Return to customer"
+msgstr "Zurück zum Kunden"
+
+#. module: rma
+#: 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."
+msgstr ""
+"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
+msgid "Returned"
+msgstr "Ist zurückgekommen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr "Rma"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+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"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
+msgid "Scheduled Date"
+msgstr "Geplantes Datum"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr "Sicherheitstoken"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr "RMA-Bestätigung senden"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr "RMA-Empfangsbestätigung senden"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr "RMA-Bestätigungsentwurf senden"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr "Senden Sie automatische RMA-Informationen an den Kunden"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+"Senden Sie eine automatische Benachrichtigung über den Empfang von RMA-"
+"Produkten an den Kunden"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+"Senden Sie eine automatische Benachrichtigung, wenn der Kunde eine RMA "
+"aufgibt"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr "Per E-Mail gesendet"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr "Per Post versenden"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr "Gesendet"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+msgid "Sequence"
+msgstr "Sequenz"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA in"
+msgstr "Reihenfolge RMA ein"
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA out"
+msgstr "Sequenz RMA outgoing"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr "Auf Entwurf setzen"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr "Teilen"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr "Lieferanschrift"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr "Lieferadresse für aktuelle RMA."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr "Quelldokument"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr "Split"
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+msgid "Split RMA"
+msgstr "Geteilter RMA"
+
+#. module: rma
+#: 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."
+msgstr ""
+"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
+"a> wurde erstellt."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__state
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "State"
+msgstr "Status"
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:0
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#, python-format
+msgid "Status"
+msgstr "Status"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+"Status basierend auf Aktivitäten\n"
+"Überfällig: Fälligkeitsdatum ist bereits überschritten\n"
+"Heute: Aktivitätsdatum ist heute\n"
+"Geplant: Zukünftige Aktivitäten."
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr "Lagerbewegungen"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr "Lagerregel"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr "Tag Name"
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr "Tag-Name existiert bereits!"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr "Tags"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr "Tags..."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr "Teamleiter"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr "Teammitglieder"
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
+msgid "That operation name already exists !"
+msgstr "Dieser Vorgangsname existiert bereits!"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+"Das aktive Feld ermöglicht es Ihnen, die Kategorie auszublenden, ohne sie zu "
+"entfernen."
+
+#. 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)"
+msgstr ""
+"Das Modell (Art des Odoo-Dokuments), dem dieser Alias entspricht. Jede "
+"eingehende E-Mail, die nicht auf einen vorhandenen Datensatz antwortet, "
+"führt zur Erstellung eines neuen Datensatzes dieses Modells (z. B. einer "
+"Projektaufgabe)."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+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"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+"Der Eigentümer von Datensätzen, die beim Empfang von E-Mails unter diesem "
+"Alias erstellt wurden. Wenn dieses Feld nicht gesetzt ist, versucht das "
+"System, den richtigen Eigentümer anhand der Absenderadresse (Von) zu finden, "
+"oder verwendet das Administratorkonto, wenn kein Systembenutzer für diese "
+"Adresse gefunden wird."
+
+#. module: rma
+#: code:addons/rma/models/stock_move.py:0
+#, python-format
+msgid ""
+"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 ""
+"Die für das Produkt '%(id)s' fertig gestellte Menge muss gleich der "
+"ursprünglichen Nachfrage sein, da die Bestandsumlagerung mit einer RMA "
+"(%(name)s) verknüpft ist."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "The quantity to return is greater than remaining quantity."
+msgstr "Die zurückzugebende Menge ist größer als die verbleibende Menge."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+msgid "The tag is visible in the portal view"
+msgstr "Das Tag ist in der Portalansicht sichtbar"
+
+#. module: rma
+#: 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."
+msgstr ""
+"Es gibt mindestens einen Rechnungsposten, dessen Menge geringer ist als die "
+"Menge, die in der verknüpften RMA angegeben ist."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot be split."
+msgstr "Diese RMA kann nicht aufgeteilt werden."
+
+#. module: rma
+#: 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
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a return."
+msgstr "Diese RMA kann keine Rücksendung durchführen."
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr "Rückerstattung"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+msgid "Transfer"
+msgstr "Transfer"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr "Typ"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr "Art der Operation"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr "Art der aufgezeichneten Ausnahmeaktivität."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr "Nicht zugewiesene RMAs"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr "Maßeinheit"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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"
+msgstr "Ungelöste RMAs"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr "UoM (ME)"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+msgid "Urgent"
+msgstr "Dringend"
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_all
+msgid "User: All Documents"
+msgstr "Benutzer: Alle Dokumente"
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+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"
+msgstr "Warten auf Ersatz"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
+msgid "Waiting for return"
+msgstr "Warten auf Rückkehr"
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr "Lager"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr "Website-Nachrichten"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr "Kommunikationsgeschichte der Website"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr "Wenn ein Kunde eine RMA aufgibt, senden Sie eine Benachrichtigung mit"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+"Wenn Kunden selbst eine RMA über das Portal aufgeben, senden Sie eine "
+"automatische Benachrichtigung, die dies bestätigt."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr ""
+"Wenn die RMA bestätigt ist, senden Sie eine automatische Informations-E-Mail."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+"Wenn die RMA eingegangen ist, können Sie sie manuell abschließen, \n"
+"                               indem Sie einen Abschlussgrund auswählen."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+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."
+
+#. 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."
+msgstr ""
+"Wenn der RMA-Eingang bestätigt ist, senden Sie eine Bestätigungs-E-Mail an "
+"den Kunden."
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+msgstr ""
+"Wenn die Lieferung bestätigt ist, senden Sie eine Bestätigungs-E-Mail an den "
+"Kunden."
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "You cannot delete RMAs that are not in draft state"
+msgstr ""
+"RMAs, die sich nicht im Entwurfsstatus befinden, können nicht gelöscht werden"
+
+#. module: rma
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
+msgstr ""
+"Sie müssen den „Kunden“ in der „Lagerkommissionierung“ angeben, von dem RMAs "
+"erstellt werden"
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+"Der Benutzer hat Zugriff auf alle Aufzeichnungen aller Personen in der RMA-"
+"Anwendung."
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr "Der Benutzer hat Zugriff auf seine eigenen Daten in der RMA-Anwendung."
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+msgid ""
+"the user will have an access to the RMA configuration as well as statistic "
+"reports."
+msgstr ""
+"Der Benutzer hat Zugriff auf die RMA-Konfiguration sowie auf "
+"Statistikberichte."
+
+#. 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 ""
+"{{object.company_id.name}} RMA-Produkte (Ref {{object.name or 'n/a' }}) "
+"erhalten"
+
+#. 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}} Ihre RMA wurde erfolgreich erstellt (Ref {{"
+"object.name or 'n/a' }})"
diff --git a/rma/i18n/de_AT.po b/rma/i18n/de_AT.po
new file mode 100644
index 000000000..3ee7866bc
--- /dev/null
+++ b/rma/i18n/de_AT.po
@@ -0,0 +1,2162 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 15.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de_AT\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. module: rma
+#: code:addons/rma/models/rma_team.py:0
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+msgid "(object._get_report_base_filename())"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+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\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 ""
+
+#. 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\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 ""
+
+#. 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\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 ""
+
+#. 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\"/>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
+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\" "
+"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"
+"                                            Cancelled\n"
+"                                        </span>"
+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"
+"                                    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\">\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-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
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin delivery</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Accept Emails From"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Active"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "Archived"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
+msgid "Canceled"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Confirmed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered Qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered Qty Done"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Description"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
+#: 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
+msgid "Display Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Draft"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email sent to the customer when they place an RMA from the portal"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/rma_split.py:0
+#, python-format
+msgid "Extracted RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+msgid "Followers"
+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
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Group RMA returns by customer and warehouse."
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_operation__id
+#: 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
+msgid "ID"
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+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 ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Incoming e-mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entry"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
+#: 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
+msgid "Last Modified on"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
+msgid "Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+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
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "None of the selected RMAs can perform a return."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
+msgid "Normal"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of errors"
+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 ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+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 ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+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) and task (model))"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Quantity"
+msgstr ""
+
+#. module: rma
+#: 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
+msgid "Quantity must be greater than 0."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid ""
+"Quantity to extract cannot be greater than remaining delivery quantity "
+"(%(remaining_qty)s %(product_uom)s)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/res_company.py:0
+#, python-format
+msgid "RMA Code"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr ""
+
+#. module: 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
+msgid "RMA Finalization Reasons"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+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 ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+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
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Receipts"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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
+msgid "RMA Tags"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Received"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+msgid "Reference of the document that generated this RMA."
+msgstr ""
+
+#. module: rma
+#: 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#, python-format
+msgid "Refund"
+msgstr ""
+
+#. 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 ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
+msgid "Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr ""
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
+#: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Replace"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
+msgid "Replaced"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid ""
+"Replacement:<br/>Product <a href=\"#\" data-oe-model=\"product.product\" "
+"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
+#: model:ir.ui.menu,name:rma.rma_reporting_menu
+msgid "Reporting"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+msgid "Requested operation"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Required field(s):%s"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Return to customer"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
+msgid "Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA in"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "Sequence RMA out"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+msgid "Split RMA"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__state
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "State"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/controllers/main.py:0
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#, python-format
+msgid "Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
+msgid "That operation name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/stock_move.py:0
+#, python-format
+msgid ""
+"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
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "The quantity to return is greater than remaining quantity."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+msgid "The tag is visible in the portal view"
+msgstr ""
+
+#. module: rma
+#: 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."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot be split."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a replacement."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "This RMA cannot perform a return."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+msgid "Urgent"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_all
+msgid "User: All Documents"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
+msgid "Waiting for return"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "You cannot delete RMAs that are not in draft state"
+msgstr ""
+
+#. module: rma
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+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 ""

From e9ba2b4e9ab7e2292a997f3a9d9d51f4287b15d1 Mon Sep 17 00:00:00 2001
From: David <david.vidal@tecnativa.com>
Date: Wed, 26 Oct 2022 16:23:53 +0200
Subject: [PATCH 064/108] [FIX] rma: multiple substitution moves

The product replacement could explode into several moves like in the
case of MRP BoM kits.

TT40194
---
 rma/__manifest__.py |  2 +-
 rma/models/rma.py   | 48 ++++++++++++++++++++++++---------------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index a0e44aa1c..4f85e0324 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "15.0.1.1.0",
+    "version": "15.0.1.1.1",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 8f2101b55..811d2546d 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1210,10 +1210,13 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
         self._ensure_can_be_replaced()
         moves_before = self.delivery_move_ids
         self._action_launch_stock_rule(scheduled_date, warehouse, product, qty, uom)
-        new_move = self.delivery_move_ids - moves_before
-        if new_move:
-            self.message_post(
-                body=_(
+        new_moves = self.delivery_move_ids - moves_before
+        body = ""
+        # The product replacement could explode into several moves like in the case of
+        # MRP BoM Kits
+        for new_move in new_moves:
+            body += (
+                _(
                     '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"'
@@ -1228,26 +1231,27 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
                         "picking_name": new_move.picking_id.name,
                     }
                 )
+                + "\n"
             )
-        else:
-            self.message_post(
-                body=_(
-                    "Replacement:<br/>"
-                    'Product <a href="#" data-oe-model="product.product" '
-                    '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."
-                )
-                % (
-                    {
-                        "id": product.id,
-                        "name": product.display_name,
-                        "qty": qty,
-                        "uom": uom.name,
-                    }
-                )
+        self.message_post(
+            body=body
+            or _(
+                "Replacement:<br/>"
+                'Product <a href="#" data-oe-model="product.product" '
+                '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."
             )
+            % (
+                {
+                    "id": product.id,
+                    "name": product.display_name,
+                    "qty": qty,
+                    "uom": uom.name,
+                }
+            )
+        )
         if self.state != "waiting_replacement":
             self.state = "waiting_replacement"
 

From ee2d79e976541ac140d433633ce163f5eb6ef917 Mon Sep 17 00:00:00 2001
From: Sergio Zanchetta <primes2h@gmail.com>
Date: Thu, 1 Dec 2022 15:42:25 +0000
Subject: [PATCH 065/108] Translated using Weblate (Italian)

Currently translated at 99.4% (346 of 348 strings)

Translation: rma-15.0/rma-15.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-15-0/rma-15-0-rma/it/
---
 rma/i18n/it.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 8fb7f7c35..cdea7cbee 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-05-18 10:05+0000\n"
-"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
+"PO-Revision-Date: 2022-12-01 17:44+0000\n"
+"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: rma
 #: model:mail.template,report_name:rma.mail_template_rma_draft_notification
@@ -882,7 +882,7 @@ msgstr "Seguito da (canali)"
 #: 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
 msgid "Followers (Partners)"
-msgstr "Seguito da (Clienti)"
+msgstr "Seguito da (partner)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_type_icon

From 1640e5af0bedb3a53d5964dc61aed07a2df4368c Mon Sep 17 00:00:00 2001
From: David <david.vidal@tecnativa.com>
Date: Thu, 9 Mar 2023 17:29:45 +0100
Subject: [PATCH 066/108] [FIX] rma: avoid reopening a cancelled RMA when the
 reception is deleted

When we delete the reception for an RMA, we're setting it to draft
automatically so we can confirm it again and create a new reception.
This is unconvenient when the RMA is cancelled, as we don't wan't to
reopen it automatically.

TT41943
---
 rma/__manifest__.py      | 2 +-
 rma/models/stock_move.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 4f85e0324..e3ff4ba9c 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "15.0.1.1.1",
+    "version": "15.0.1.1.2",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index 1e846eec6..8d9925615 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -35,7 +35,9 @@ def unlink(self):
         rma_receiver = self.sudo().mapped("rma_receiver_ids")
         rma = self.sudo().mapped("rma_id")
         res = super().unlink()
-        rma_receiver.write({"state": "draft"})
+        rma_receiver.filtered(lambda x: x.state != "cancelled").write(
+            {"state": "draft"}
+        )
         rma.update_received_state()
         rma.update_replaced_state()
         return res

From 80d8a2696bdc2e60db3dbede280bb8966dd90aa8 Mon Sep 17 00:00:00 2001
From: Nikolaus Weingartmair <nikolaus.weingartmair@grueneerde.com>
Date: Wed, 5 Apr 2023 06:41:18 +0000
Subject: [PATCH 067/108] Translated using Weblate (German)

Currently translated at 100.0% (354 of 354 strings)

Translation: rma-15.0/rma-15.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-15-0/rma-15-0-rma/de/
---
 rma/i18n/de.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rma/i18n/de.po b/rma/i18n/de.po
index 7a706b1ba..29804a248 100644
--- a/rma/i18n/de.po
+++ b/rma/i18n/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 15.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-09-26 10:58+0000\n"
+"PO-Revision-Date: 2023-04-05 07:26+0000\n"
 "Last-Translator: Nikolaus Weingartmair <nikolaus.weingartmair@grueneerde.com>"
 "\n"
 "Language-Team: none\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2\n"
+"X-Generator: Weblate 4.14.1\n"
 
 #. module: rma
 #: code:addons/rma/models/rma_team.py:0
@@ -1687,7 +1687,7 @@ msgstr "Name des Grundes"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
-msgstr "Kassenbon"
+msgstr "Rückgabebeleg"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__received

From 4eb228800d430d141f3a9c398fea50a4a2759cc4 Mon Sep 17 00:00:00 2001
From: David <david.vidal@tecnativa.com>
Date: Tue, 21 Mar 2023 13:54:44 +0100
Subject: [PATCH 068/108] [FIX] rma: avoid refunding in picking return wizard

If we place an RMA from the stock picking return wizard, we want to
avoid setting the new moves to refund as that will affect the related
sale lines delivered quantities count.

TT42021
---
 rma/__manifest__.py                | 2 +-
 rma/wizard/stock_picking_return.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index e3ff4ba9c..0f46d6e63 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -3,7 +3,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "15.0.1.1.2",
+    "version": "15.0.1.1.3",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
index 786795626..7e16ea6dd 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -20,6 +20,9 @@ def _onchange_create_rma(self):
                 [("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.

From 2810681038ac835a5bb3f0e5d69b726ebbda55b0 Mon Sep 17 00:00:00 2001
From: Francesco Foresti <francesco.foresti@ooops404.com>
Date: Thu, 29 Dec 2022 14:21:12 +0000
Subject: [PATCH 069/108] Translated using Weblate (Italian)

Currently translated at 100.0% (348 of 348 strings)

Translation: rma-15.0/rma-15.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-15-0/rma-15-0-rma/it/
---
 rma/i18n/it.po | 67 +++++++++++++++++++++++++++-----------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index cdea7cbee..628bd0f3d 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2022-12-01 17:44+0000\n"
-"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>\n"
+"PO-Revision-Date: 2023-07-12 15:10+0000\n"
+"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -423,7 +423,7 @@ msgstr "Decorazione eccezione attività"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_state
 msgid "Activity State"
-msgstr "Stato Attività"
+msgstr "Stato attività"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
@@ -470,7 +470,7 @@ msgstr "Permetti di chiudere un RMA senza restituire un prodotto o rimborso"
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "Archived"
-msgstr "Archiviato"
+msgstr "In archivio"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -481,7 +481,7 @@ msgstr "Sei sicuro di voler cancellare questo RMA"
 #: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
 msgid "Attachment Count"
-msgstr "Conteggio Allegati"
+msgstr "Numero allegati"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
@@ -550,7 +550,7 @@ msgstr "Fai click per aggiungere un nuovo RMA."
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__color
 msgid "Color Index"
-msgstr "Indice Colore"
+msgstr "Indice colore"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
@@ -577,7 +577,7 @@ msgstr "Azienda"
 #. module: rma
 #: model:ir.model,name:rma.model_res_config_settings
 msgid "Config Settings"
-msgstr "Impostazioni di Configurazione"
+msgstr "Impostazioni di configurazione"
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_configuration_menu
@@ -608,8 +608,9 @@ msgid ""
 "Conversion between Units of Measure can only occur if they belong to the "
 "same category. The conversion will be made based on the ratios."
 msgstr ""
-"La conversione tra Unità di Misura può avvenire solo se appartengono alla "
-"stessa categoria. La conversione sarà effettuata in base ai rapporti."
+"Le conversioni tra unità di misura possono avvenire solo se appartengono "
+"alla stessa categoria. La conversione verrà effettuata in base alle "
+"proporzioni."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
@@ -690,7 +691,7 @@ msgstr "Scadenza"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
 msgid "Default Values"
-msgstr "Valori Predefiniti"
+msgstr "Valori predefiniti"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
@@ -954,7 +955,7 @@ msgstr "Icona per indicare un'attività eccezione."
 #: 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 attivo, nuovi messaggi richiedono la tua attenzione."
+msgstr "Se selezionata, nuovi messaggi richiedono attenzione."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
@@ -962,7 +963,7 @@ msgstr "Se attivo, nuovi messaggi richiedono la tua attenzione."
 #: 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 attivo, alcuni messaggi hanno un errore di consegna."
+msgstr "Se selezionata, alcuni messaggi hanno un errore di consegna."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
@@ -991,7 +992,7 @@ msgstr "Email in arrivo"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
 msgid "Invoice Address"
-msgstr "Indirizzo di Fatturazione"
+msgstr "Indirizzo di fatturazione"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
@@ -1007,17 +1008,17 @@ msgstr "Indirizzo di fatturazione e spedizione:"
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
 msgid "Is Follower"
-msgstr "E' un follower"
+msgstr "Sta seguendo"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
 msgid "Journal Entry"
-msgstr "Registrazione Contabile"
+msgstr "Registrazione contabile"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move_line
 msgid "Journal Item"
-msgstr "Oggetto Registro"
+msgstr "Movimento contabile"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_account_move____last_update
@@ -1123,7 +1124,11 @@ msgstr "Responsabile"
 #: model:ir.model.fields,field_description:rma.field_rma__message_has_error
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
 msgid "Message Delivery error"
+<<<<<<< HEAD
 msgstr "Messaggio di Errore Consegna"
+=======
+msgstr "Errore di consegna messaggio"
+>>>>>>> 4498ae0 (Translated using Weblate (Italian))
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_ids
@@ -1134,7 +1139,7 @@ msgstr "Messaggi"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
 msgid "My Activity Deadline"
-msgstr "Scadenza della mia attività"
+msgstr "Scadenza mia attività"
 
 #. module: rma
 #: code:addons/rma/controllers/main.py:0
@@ -1164,7 +1169,7 @@ msgstr "Riepilogo prossima attività"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
 msgid "Next Activity Type"
-msgstr "Tipo prossima attività"
+msgstr "Tipologia prossima attività"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1199,13 +1204,13 @@ msgstr "Numero di Errore"
 #: 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 una azione"
+msgstr "Numero di messaggi che richiedono un'azione"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
 msgid "Number of messages with delivery error"
-msgstr "Numero di messaggi con errori di consegna"
+msgstr "Numero di messaggi con errore di consegna"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_unread_counter
@@ -1319,7 +1324,7 @@ msgstr "Prodotto"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
 msgid "Product qty"
-msgstr "Quantità Prodotto"
+msgstr "Q.tà prodotto"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
@@ -1710,7 +1715,7 @@ msgstr "Reporting"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__operation_id
 msgid "Requested operation"
-msgstr "Operazione Richiesta"
+msgstr "Operazione richiesta"
 
 #. module: rma
 #: code:addons/rma/models/rma.py:0
@@ -1727,7 +1732,7 @@ msgstr "Responsabile"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
 msgid "Responsible User"
-msgstr "Utente Responsabile"
+msgstr "Utente responsabile"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
@@ -1770,12 +1775,12 @@ msgstr "Conteggio 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 Errore Consegna"
+msgstr "Errore consegna SMS"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
-msgstr "Data Prevista"
+msgstr "Data programmata"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_token
@@ -1861,12 +1866,12 @@ msgstr "Condividi"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
 msgid "Shipping Address"
-msgstr "Indirizzo di Spedizione"
+msgstr "Indirizzo di spedizione"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
 msgid "Shipping address for current RMA."
-msgstr "Indirizzo spedizione per questo RMA."
+msgstr "Indirizzo di spedizione per questo RMA."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
@@ -1923,12 +1928,12 @@ msgstr ""
 #. module: rma
 #: model:ir.model,name:rma.model_stock_move
 msgid "Stock Move"
-msgstr "Movimento di Magazzino"
+msgstr "Movimento di magazzino"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_rule
 msgid "Stock Rule"
-msgstr "Regola di Magazzino"
+msgstr "Regola di giacenza"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__name
@@ -2078,7 +2083,7 @@ msgstr "Tipo di operazione"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
 msgid "Type of the exception activity on record."
-msgstr "Tipo di attività di eccezione nel record."
+msgstr "Tipo di attività eccezione sul record."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -2106,7 +2111,7 @@ msgstr "Messaggi non letti"
 #: 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 "Conteggio messaggi non letti"
+msgstr "Numero messaggi non letti"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search

From 6677539b09a8aa44967879c07e7d84126cc65354 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Tue, 20 Dec 2022 13:43:08 +0000
Subject: [PATCH 070/108] Translated using Weblate (Italian)

Currently translated at 100.0% (348 of 348 strings)

Translation: rma-15.0/rma-15.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-15-0/rma-15-0-rma/it/
---
 rma/i18n/it.po | 50 +++++++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 628bd0f3d..8c248320c 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-07-12 15:10+0000\n"
-"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
+"PO-Revision-Date: 2023-07-24 13:10+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.14.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: rma
 #: model:mail.template,report_name:rma.mail_template_rma_draft_notification
@@ -251,8 +251,8 @@ msgid ""
 "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
 "specific.\" groups=\"base.group_multi_company\"/>"
 msgstr ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati sono "
-"specifici per Azienda.\" groups=\"base.group_multi_company\"/>"
+"<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui sono "
+"specifici per azienda.\" groups=\"base.group_multi_company\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -398,7 +398,7 @@ msgstr "Avviso accesso"
 #: model:ir.model.fields,field_description:rma.field_rma__message_needaction
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
 msgid "Action Needed"
-msgstr "Azione Necessaria"
+msgstr "Azione richiesta"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__active
@@ -750,7 +750,7 @@ msgstr "Descrizione"
 #: 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"
+msgstr "Nome visualizzato"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
@@ -767,7 +767,7 @@ msgstr "Bozza RMA"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
@@ -777,7 +777,7 @@ msgstr "Alias Email"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Email Template"
-msgstr "Modello Email"
+msgstr "Modello e-mail"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
@@ -900,12 +900,12 @@ msgstr "Raggruppa per"
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
 msgid "Group RMA returns by customer address and warehouse"
-msgstr ""
+msgstr "Raggruppa resi RMA per indirizzo cliente e magazzino"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Group RMA returns by customer and warehouse."
-msgstr ""
+msgstr "Raggruppa resi RMA per cliente e magazzino."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_account_move__id
@@ -1091,7 +1091,7 @@ msgstr "Bloccato"
 #: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
 msgid "Main Attachment"
-msgstr "Allegato Principale"
+msgstr "Allegato principale"
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
@@ -1124,11 +1124,7 @@ msgstr "Responsabile"
 #: model:ir.model.fields,field_description:rma.field_rma__message_has_error
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
 msgid "Message Delivery error"
-<<<<<<< HEAD
-msgstr "Messaggio di Errore Consegna"
-=======
-msgstr "Errore di consegna messaggio"
->>>>>>> 4498ae0 (Translated using Weblate (Italian))
+msgstr "Errore consegna messaggio"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_ids
@@ -1192,13 +1188,13 @@ msgstr "Normale"
 #: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
 msgid "Number of Actions"
-msgstr "Numero di Azioni"
+msgstr "Numero di azioni"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
 msgid "Number of errors"
-msgstr "Numero di Errore"
+msgstr "Numero di errori"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction_counter
@@ -1710,7 +1706,7 @@ msgstr ""
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
 msgid "Reporting"
-msgstr "Reporting"
+msgstr "Rendicontazione"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__operation_id
@@ -1764,7 +1760,7 @@ msgstr "Restituito"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
-msgstr "Rma"
+msgstr "RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
@@ -1920,9 +1916,9 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
-"Stato basato sulle attività\n"
-"Scaduto: la data di scadenza è già passata\n"
-"Oggi: la data dell'attività è oggi\n"
+"Stato in base alle attività\n"
+"Scaduto: la data richiesta è trascorsa\n"
+"Oggi: la data attività è oggi\n"
 "Pianificato: attività future."
 
 #. module: rma
@@ -1938,12 +1934,12 @@ msgstr "Regola di giacenza"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__name
 msgid "Tag Name"
-msgstr "Nome Etichetta"
+msgstr "Nome etichetta"
 
 #. module: rma
 #: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
 msgid "Tag name already exists !"
-msgstr "Nome Etichetta già Esiste!"
+msgstr "Il nome etichetta esiste già!"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__tag_ids
@@ -2131,7 +2127,7 @@ msgstr "Urgente"
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
-msgstr "Utente: Tutti i documenti"
+msgstr "Utente: tutti i documenti"
 
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_own

From 5febc7ba61552547a4f9f2dcce65d7dd41e29c44 Mon Sep 17 00:00:00 2001
From: Carlos Roca Zaragoza <carlos.roca@tecnativa.com>
Date: Fri, 11 Aug 2023 10:34:00 +0000
Subject: [PATCH 071/108] Translated using Weblate (Spanish)

Currently translated at 90.5% (317 of 350 strings)

Translation: rma-15.0/rma-15.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-15-0/rma-15-0-rma/es/
---
 rma/i18n/es.po | 158 +++++++++++++++++++++----------------------------
 1 file changed, 67 insertions(+), 91 deletions(-)

diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 5218c230c..b595ad868 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-08-09 08:07+0000\n"
-"PO-Revision-Date: 2022-08-09 10:16+0200\n"
-"Last-Translator: xavigutipujol <jgutierrez@pyming.com>\n"
+"PO-Revision-Date: 2023-08-11 10:37+0000\n"
+"Last-Translator: Carlos Roca Zaragoza <carlos.roca@tecnativa.com>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: rma
 #: code:addons/rma/models/rma_team.py:0
@@ -40,23 +40,6 @@ msgstr ""
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
-#, fuzzy
-#| 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"
-#| "        "
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
@@ -82,38 +65,31 @@ msgid ""
 "        "
 msgstr ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Estimado ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    Aquí tiene el RMA <strong>${object.name}</strong> Desde ${object."
-"company_id.name}.\n"
-"    <br/><br/>\n"
-"    No dude en ponerse en contacto con nosotros si tiene alguna pregunta.\n"
-"</p>\n"
-"</div>\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
-#, fuzzy
-#| 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"
-#| "        "
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
@@ -139,40 +115,31 @@ msgid ""
 "        "
 msgstr ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Estimado ${object.partner_id.name}\n"
-"    % if object.partner_id.parent_id:\n"
-"        (${object.partner_id.parent_id.name})\n"
-"    % endif\n"
-"    <br/><br/>\n"
-"    Los productos de su RMA <strong>${object.name}</strong>\n"
-"    from ${object.company_id.name} han sido recibidos en nuestro almacén.\n"
-"    <br/><br/>\n"
-"    Póngase en contacto con nosotros para cualquier duda al respecto.\n"
-"</p>\n"
-"</div>\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
-#, fuzzy
-#| 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"
-#| "        "
 msgid ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
@@ -199,19 +166,28 @@ msgid ""
 "        "
 msgstr ""
 "<div style=\"margin: 0px; padding: 0px;\">\n"
-"<p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
-"    Estimado ${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 solicitado con éxito su RMA <strong>${object.name}</strong>\n"
-"    en ${object.company_id.name}. Nuestro equipo la comprobará y validará\n"
-"    tan pronto como sea posible.\n"
-"    <br/><br/>\n"
-"    Póngase en contacto con nosotros para cualquier duda al respecto.\n"
-"</p>\n"
-"</div>\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

From 4a5ea6aa09cf85a2e243ae1f11350313c3372205 Mon Sep 17 00:00:00 2001
From: "Pedro M. Baeza" <pedro.baeza@tecnativa.com>
Date: Thu, 24 Aug 2023 10:04:56 +0200
Subject: [PATCH 072/108] [MIG] rma: Migration to 16.0

* Standard procedure.
* Transfer view groups to nodes.
* Adjusted upstream changed field names.
* Converted onchanges to computed writable fields.
* Replace `Form` by direct dictionary vals in record creation, as they
  don't handle now properly multiple existing fields in the view, and
  computed writable improve the compatibility on new values.
* Replace domain returned on onchange by static domain in field.
* Change maintainer.

TT44213

[UPD] Update rma.pot

[UPD] README.rst

[UPD] README.rst

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/
---
 rma/README.rst                                |  31 +-
 rma/__manifest__.py                           |   6 +-
 rma/i18n/de.po                                | 509 ++++++++-----
 rma/i18n/de_AT.po                             | 194 ++---
 rma/i18n/es.po                                | 476 ++++++++----
 rma/i18n/it.po                                | 705 ++++++++++++------
 rma/i18n/nl.po                                | 388 ++++++----
 rma/i18n/pt.po                                | 534 ++++++++-----
 rma/i18n/pt_BR.po                             | 534 ++++++++-----
 rma/i18n/rma.pot                              | 126 ++--
 rma/i18n/ro.po                                | 524 ++++++++-----
 rma/i18n/zh_CN.po                             | 388 ++++++----
 .../15.0.1.0.0/noupdate_changes.xml           |  99 ---
 rma/migrations/15.0.1.0.0/post-migration.py   |  18 -
 rma/models/res_company.py                     |  14 +-
 rma/models/rma.py                             | 408 +++++-----
 rma/models/stock_picking.py                   |  17 +-
 rma/static/description/index.html             |  52 +-
 rma/tests/test_rma.py                         | 121 ++-
 rma/views/res_partner_views.xml               |   3 +-
 rma/views/rma_finalization_views.xml          |   2 +
 rma/views/rma_team_views.xml                  |   2 +
 rma/views/rma_views.xml                       |  31 +-
 rma/views/stock_picking_views.xml             |   2 +-
 rma/views/stock_warehouse_views.xml           |   7 +-
 rma/wizard/rma_delivery_views.xml             |   2 +
 rma/wizard/rma_split_views.xml                |   2 +
 rma/wizard/stock_picking_return.py            |  42 +-
 rma/wizard/stock_picking_return_views.xml     |   9 +-
 29 files changed, 3145 insertions(+), 2101 deletions(-)
 delete mode 100644 rma/migrations/15.0.1.0.0/noupdate_changes.xml
 delete mode 100644 rma/migrations/15.0.1.0.0/post-migration.py

diff --git a/rma/README.rst b/rma/README.rst
index d0ef4f577..a229daba2 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 0f46d6e63..9b3d4a1d3 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 29804a248..9b360b2fb 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"
-"                    .\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"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
 "                    .\n"
 "                    <br>\n"
 "                    <br>\n"
-"                    Zögern Sie nicht uns zu kontaktieren.\n"
+"                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
 "        "
+msgstr ""
 
 #. 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"
-"                    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"
+"                    <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"
-"                    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"
+"                    Do not hesitate to contact us if you have any question.\n"
 "                </p>\n"
 "            </div>\n"
 "        "
+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 ""
 "<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."
-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 "
+"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 "
 "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 3ee7866bc..0c6573e9e 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\"/>"
+"<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\"/>"
+"<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 b595ad868..55dac8fde 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 ""
+
+#. 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"
+"                                    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\">\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-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparation\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-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
+"                                            Shipped\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-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Shipped\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-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 8c248320c..6dbdf82b6 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 a30dcbc3f..95bea25da 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-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\">\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-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-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparation</span>"
+"<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\"><i class=\"fa fa-fw fa-"
-"truck\"/> Shipped</span>"
+"<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\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Partially Available</span>"
+"<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 b80fca206..e6b1d7010 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 ""
+
+#. 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"
+"                                    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\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Preparation\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-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparation\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-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
+"                                            Shipped\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-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 a87e7285f..82bcfdc95 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 ""
+
+#. 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"
+"                                    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\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\"/"
+">\n"
+"                                            Preparation\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-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparation\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-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/"
+">\n"
+"                                            Shipped\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-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 598eb8486..ed42fa18b 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 bb122b14d..e23220d54 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 6fd693ee2..ba54d9f83 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-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\">\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-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-info label-text-align\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Preparation</span>"
+"<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\"><i class=\"fa fa-fw fa-"
-"truck\"/> Shipped</span>"
+"<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\"><i class=\"fa fa-fw fa-"
-"clock-o\"/> Partially Available</span>"
+"<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 7937b11e7..000000000
--- 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 d83f6aba0..000000000
--- 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 94d274dfb..2b55930a3 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 @@ def _default_rma_mail_draft_template(self):
         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 811d2546d..f00a0724d 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 @@ def _domain_location_id(self):
             "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 @@ def _domain_location_id(self):
     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 @@ def _domain_location_id(self):
             "    ('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 @@ def _domain_location_id(self):
     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 @@ def _compute_warehouse_id(self):
                 [("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 @@ def _check_required_after_draft(self):
         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 @@ def action_refund(self):
             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_line_id": line.id,
-                        "refund_id": refund.id,
-                        "state": "refunded",
-                    }
+                refund_vals["invoice_line_ids"].append(
+                    (0, 0, rma._prepare_refund_line_vals())
                 )
-            refund.invoice_origin = origin
+            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",
+                    }
+                )
 
     def action_replace(self):
         """Invoked when 'Replace' button in rma form view is clicked."""
@@ -880,7 +884,6 @@ def _ensure_required_fields(self):
         rma._check_required_after_draft
         rma.action_confirm
         """
-        ir_translation = self.env["ir.translation"]
         required = [
             "partner_id",
             "partner_shipping_id",
@@ -891,7 +894,17 @@ def _ensure_required_fields(self):
         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 @@ def _create_receptions_from_picking(self):
                 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 @@ def _create_receptions_from_picking(self):
         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 @@ def _create_receptions_from_picking(self):
         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 @@ def _create_receptions_from_product(self):
             values={"self": picking, "origin": self},
             subtype_id=self.env.ref("mail.mt_note").id,
         )
-        return picking.move_lines
-
-    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
+        return picking.move_ids
+
+    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 @@ def extract_quantity(self, qty, uom):
         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 @@ def _prepare_refund(self, invoice_form, origin):
         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 @@ def _prepare_refund_line(self, line_form):
         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 @@ def create_return(self, scheduled_date, qty=None, uom=None):
             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 @@ def create_return(self, scheduled_date, qty=None, uom=None):
             )
         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 242871d5b..edbc03008 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 d26b5a0cc..1d2e96797 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 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! 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 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 <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 @@ <h1><a class="toc-backref" href="#id1">Configuration</a></h1>
 <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 @@ <h1><a class="toc-backref" href="#id2">Usage</a></h1>
 </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 @@ <h1><a class="toc-backref" href="#id3">Known issues / Roadmap</a></h1>
 </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 @@ <h2><a class="toc-backref" href="#id7">Contributors</a></h2>
 </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 63363b290..89c6c56d6 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 @@ def setUpClass(cls):
         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 @@ def setUpClass(cls):
         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 @@ def _create_confirm_receive(
         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 @@ def _create_delivery(self):
             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 @@ def test_onchange(self):
         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 @@ def test_ensure_required_fields_on_confirm(self):
             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 @@ def test_confirm_and_receive(self):
         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 @@ def test_confirm_and_receive(self):
         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 @@ def test_action_refund(self):
         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 @@ def test_replace(self):
         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 @@ def test_replace(self):
         # 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 @@ def test_return_to_customer(self):
         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 @@ def test_return_to_customer(self):
         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 @@ def test_mass_return_to_customer(self):
         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 @@ def test_rma_from_picking_return(self):
         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 @@ def test_split(self):
         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 45d9474c4..6eb1f4616 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 45b3c9bcf..3772660b8 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 100b5e660..ae08ba9d4 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 934b7f755..256484baa 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 4f1e8aadf..16022033f 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 059efa05a..238f61981 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 112523f62..ae0cf63af 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 688075039..b141e47e3 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 7e16ea6dd..4599f1cf4 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 @@ def create_returns(self):
             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 d899ee3f7..fbd467227 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>

From 486d106c012cd2aaa48805a6aeda7b086179e6d6 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Mon, 4 Sep 2023 16:22:12 +0000
Subject: [PATCH 073/108] Translated using Weblate (Italian)

Currently translated at 90.9% (320 of 352 strings)

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/it/
---
 rma/i18n/it.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 6dbdf82b6..adba31d9a 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-07-24 13:10+0000\n"
+"PO-Revision-Date: 2023-09-04 18:38+0000\n"
 "Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -661,7 +661,7 @@ msgstr "Cliente"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__access_url
 msgid "Customer Portal URL"
-msgstr "URL Portale Cliente"
+msgstr "URL portale cliente"
 
 #. module: rma
 #. odoo-python
@@ -1253,7 +1253,7 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_url
 msgid "Portal Access URL"
-msgstr "URL Accesso Portale"
+msgstr "URL accesso portale"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -1753,7 +1753,7 @@ msgstr "Data programmata"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_token
 msgid "Security Token"
-msgstr "Token di Sicurezza"
+msgstr "Token di sicurezza"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation

From bc299dfbe502795d93743f37deacf812eaec107c Mon Sep 17 00:00:00 2001
From: David <david.vidal@tecnativa.com>
Date: Wed, 6 Sep 2023 13:37:05 +0200
Subject: [PATCH 074/108] [FIX] rma: _get_sequence_values signature

Respect the orignal method signature

https://github.com/odoo/odoo/blame/6bb68d9f3263c2154eb87ec22559d142e880c084/addons/stock/models/stock_warehouse.py#L1017
---
 rma/README.rst                    | 2 +-
 rma/__manifest__.py               | 2 +-
 rma/models/stock_warehouse.py     | 4 ++--
 rma/static/description/index.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index a229daba2..2e928f8e3 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -7,7 +7,7 @@ Return Merchandise Authorization Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:4b518f08c3f67013102d103bf4cfa29044b508456a38a8405d92ae01faa8d88e
+   !! source digest: sha256:d52a3b34c6923f1a427f0fedf32b0c140b2dc555636444355e1bdc4e51f59d95
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 9b3d4a1d3..5a8bdedfb 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "16.0.1.0.0",
+    "version": "16.0.1.0.1",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py
index 1398faecb..f37592743 100644
--- a/rma/models/stock_warehouse.py
+++ b/rma/models/stock_warehouse.py
@@ -56,8 +56,8 @@ def _get_rma_location_values(self):
             "location_id": self.env.ref("rma.stock_location_rma").id,
         }
 
-    def _get_sequence_values(self):
-        values = super()._get_sequence_values()
+    def _get_sequence_values(self, name=False, code=False):
+        values = super()._get_sequence_values(name=name, code=code)
         values.update(
             {
                 "rma_in_type_id": {
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index 1d2e96797..38915bf94 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:4b518f08c3f67013102d103bf4cfa29044b508456a38a8405d92ae01faa8d88e
+!! source digest: sha256:d52a3b34c6923f1a427f0fedf32b0c140b2dc555636444355e1bdc4e51f59d95
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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>.

From f84ab916825614483e2787a628b30db5a297a459 Mon Sep 17 00:00:00 2001
From: Ivorra78 <informatica@totmaterial.es>
Date: Thu, 7 Sep 2023 15:24:50 +0000
Subject: [PATCH 075/108] Translated using Weblate (Spanish)

Currently translated at 100.0% (352 of 352 strings)

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/es/
---
 rma/i18n/es.po | 197 ++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 161 insertions(+), 36 deletions(-)

diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 55dac8fde..f2cb8b8a1 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-08-09 08:07+0000\n"
-"PO-Revision-Date: 2023-08-11 10:37+0000\n"
-"Last-Translator: Carlos Roca Zaragoza <carlos.roca@tecnativa.com>\n"
+"PO-Revision-Date: 2023-09-07 17:37+0000\n"
+"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -27,12 +27,12 @@ msgstr "%s (copia)"
 #. module: rma
 #: model:ir.actions.report,print_report_name:rma.report_rma_action
 msgid "(object._get_report_base_filename())"
-msgstr ""
+msgstr "(object._get_report_base_filename())"
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/rma.py:0
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
@@ -65,6 +65,28 @@ msgid ""
 "            </div>\n"
 "        "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Estimado\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"
+"                    Aquí está el 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"
+"                    No dude en contactar con nosotros si tiene alguna duda.\n"
+"                </p>\n"
+"            </div>\n"
+"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
@@ -92,6 +114,28 @@ msgid ""
 "            </div>\n"
 "        "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Estimado\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"
+"                    Losproductos para su RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    han sido recibidos en el almacén.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    No dude en contactar con nosotros si tiene alguna duda.\n"
+"                </p>\n"
+"            </div>\n"
+"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
@@ -120,6 +164,29 @@ msgid ""
 "            </div>\n"
 "        "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Estimado\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"
+"                    Has colocado exitosamente tu RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    on\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    Nuestro equipo lo comprobará y validará lo antes "
+"posible..\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    No dude en contactarnos si tiene alguna pregunta.\n"
+"                </p>\n"
+"            </div>\n"
+"        "
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -135,14 +202,20 @@ msgstr ""
 msgid ""
 "<i class=\"fa fa-fw fa-check\"/>\n"
 "                                <b>Paid</b>"
-msgstr "<i class=\"fa fa-fw fa-check\"/><b>Pagado</b>"
+msgstr ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                                                       "
+"<b>Pagado</b>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid ""
 "<i class=\"fa fa-fw fa-clock-o\"/>\n"
 "                                <b>Waiting Payment</b>"
-msgstr "<i class=\"fa fa-fw fa-clock-o\"/><b>Esperando Pago</b>"
+msgstr ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                                                          "
+"<b>Esperando Pago</b>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -171,6 +244,11 @@ msgid ""
 "                                            Cancelled\n"
 "                                        </span>"
 msgstr ""
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/>"
+"\n"
+"                                            Cancelado\n"
+"                                        </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -180,6 +258,10 @@ msgid ""
 "                                    Cancelled\n"
 "                                </span>"
 msgstr ""
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Cancelado\n"
+"                                </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -190,6 +272,11 @@ msgid ""
 "                                            Preparation\n"
 "                                        </span>"
 msgstr ""
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\""
+"/>\n"
+"                                            Preparación\n"
+"                                        </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -199,6 +286,10 @@ msgid ""
 "                                    Preparation\n"
 "                                </span>"
 msgstr ""
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparación\n"
+"                                </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -209,6 +300,11 @@ msgid ""
 "                                            Shipped\n"
 "                                        </span>"
 msgstr ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/>"
+"\n"
+"                                            Enviado\n"
+"                                        </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -218,6 +314,10 @@ msgid ""
 "                                    Shipped\n"
 "                                </span>"
 msgstr ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Enviado\n"
+"                                </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -228,6 +328,11 @@ msgid ""
 "                                            Partially Available\n"
 "                                        </span>"
 msgstr ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\""
+"/>\n"
+"                                            Disponible Parcialmente\n"
+"                                        </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -237,6 +342,10 @@ msgid ""
 "                                    Partially Available\n"
 "                                </span>"
 msgstr ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Disponible Parcialmente\n"
+"                                </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -421,7 +530,7 @@ msgstr "Estado de la actividad"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
 msgid "Activity Type Icon"
-msgstr ""
+msgstr "Icono para el Tipo de Actividad"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
@@ -451,12 +560,13 @@ msgstr "Modelo con seudónimo"
 #. module: rma
 #: model:res.groups,name:rma.group_rma_manual_finalization
 msgid "Allow RMA manual finalization"
-msgstr ""
+msgstr "Permitir la finalización manual de RMA"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
 msgid "Allow to finish an RMA without returning back a product or refunding"
 msgstr ""
+"Permitir la finalización de un RMA sin devolución de un producto o reembolso"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
@@ -479,12 +589,12 @@ msgstr "Conteo de archivos adjuntos"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Avatar"
-msgstr ""
+msgstr "Avatar"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
 msgid "Can Be Finished"
-msgstr ""
+msgstr "Se puede acabar"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
@@ -532,7 +642,7 @@ msgstr "Categoría"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
 msgid "Category UoM"
-msgstr ""
+msgstr "Categoría de la UdM"
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.rma_action
@@ -543,7 +653,7 @@ msgstr "Click para agregar un nuevo RMA."
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__color
 msgid "Color Index"
-msgstr ""
+msgstr "Índice de Color"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
@@ -601,6 +711,9 @@ msgid ""
 "Conversion between Units of Measure can only occur if they belong to the "
 "same category. The conversion will be made based on the ratios."
 msgstr ""
+"La conversión entre Unidades de Medida sólo puede producirse si pertenecen a "
+"la misma categoría. La conversión se realizará en función de las "
+"proporciones."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
@@ -644,7 +757,7 @@ msgstr "Creado el"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
 msgid "Custom Bounced Message"
-msgstr ""
+msgstr "Mensaje de rebote personalizado"
 
 #. module: rma
 #. odoo-python
@@ -838,12 +951,12 @@ msgstr "Finalizar RMA manualmente"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
 msgid "Finish RMA manually choosing a reason"
-msgstr ""
+msgstr "Finalizar RMA manualmente eligiendo un motivo"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Finish RMAs manually"
-msgstr ""
+msgstr "Finalizar RMAs manualmente"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
@@ -865,7 +978,7 @@ msgstr "Seguidores (Empresas)"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_type_icon
 msgid "Font awesome icon e.g. fa-tasks"
-msgstr ""
+msgstr "Icono de fuente impresionante, por ejemplo fa-tasks"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -884,13 +997,13 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Group RMA returns by customer and warehouse."
 msgstr ""
-"Agrupar las devoluciones de RMA a cliente por dirección de envío y almacén"
+"Agrupar las devoluciones de RMA a cliente por dirección de envío y almacén."
 
 #. module: rma
 #: 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 ""
+msgstr "Tiene mensaje"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__id
@@ -941,6 +1054,8 @@ msgid ""
 "If set, this content will automatically be sent out to unauthorized users "
 "instead of the default message."
 msgstr ""
+"Si se configura, este contenido se enviará automáticamente a usuarios no "
+"autorizados en lugar del mensaje predeterminado."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
@@ -1093,7 +1208,7 @@ msgstr "Mensajes"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
 msgid "My Activity Deadline"
-msgstr ""
+msgstr "Fecha Límite de mi Actividad"
 
 #. module: rma
 #. odoo-python
@@ -1162,7 +1277,7 @@ msgstr "Número de errores"
 #: 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 requiring action"
-msgstr ""
+msgstr "Número de mensajes que requieren una acción"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
@@ -1329,7 +1444,7 @@ msgstr "Cantidad a extraer en nuevo RMA."
 #: model_terms:ir.ui.view,arch_db:rma.view_partner_form
 #: model_terms:ir.ui.view,arch_db:rma.view_picking_form
 msgid "RMA"
-msgstr ""
+msgstr "RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
@@ -1374,7 +1489,7 @@ msgstr "Asistente de entrega de RMA"
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_draft_notification
 msgid "RMA Draft Notification"
-msgstr ""
+msgstr "Borrador de notificación de la RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
@@ -1411,7 +1526,7 @@ msgstr "Ubicación de RMA"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA Manual Finalization"
-msgstr ""
+msgstr "Finalización del Manual RMA"
 
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
@@ -1445,7 +1560,7 @@ msgstr "Correo de confirmación de recepción de RMA"
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
-msgstr ""
+msgstr "Notificación de recepción de RMA"
 
 #. module: rma
 #. odoo-python
@@ -1544,7 +1659,7 @@ msgstr "Equipo de RMA"
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
 msgid "RMAs"
-msgstr ""
+msgstr "RMAs"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
@@ -1605,7 +1720,7 @@ msgstr "Factura rectificativa"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
 msgid "Refund Line"
-msgstr ""
+msgstr "Línea de devolución"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
@@ -1675,7 +1790,7 @@ msgid ""
 "moves was updated with this data."
 msgstr ""
 "Reemplazo:<br/>Producto <a href=\"#\" data-oe-model=\"product.product\" data-"
-"oe-id=\"%(id)d\">%(name)s</a><br/>Cantidad %(qty) s%(uom)s<br/>El reemplazo "
+"oe-id=\"%(id)d\">%(name)s</a><br/>Cantidad %(qty)s%(uom)s<br/>El reemplazo "
 "realizado no creó un movimiento nuevo, pero uno de los movimientos creados "
 "anteriormente fué actualizado con estos datos."
 
@@ -1710,7 +1825,7 @@ msgstr "Usuario responsable"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
 msgid "Return Location"
-msgstr ""
+msgstr "Lugar de devolución"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
@@ -1743,7 +1858,7 @@ msgstr "Devuelto"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
-msgstr ""
+msgstr "Rma"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
@@ -1753,7 +1868,7 @@ msgstr "Cantidad de RMAs"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
 msgid "Rma Location"
-msgstr ""
+msgstr "Ubicación de Rma"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
@@ -1791,12 +1906,12 @@ msgstr "Enviar información automática de RMA al cliente"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA products reception notification to customer"
-msgstr ""
+msgstr "Enviar notificación automática de recepción de productos RMA al cliente"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic notification when the customer places an RMA"
-msgstr ""
+msgstr "Enviar una notificación automática cuando el cliente solicita un RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -1850,7 +1965,7 @@ msgstr "Dirección de envío"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
 msgid "Shipping address for current RMA."
-msgstr "Dirección de envío para el RMA en curso"
+msgstr "Dirección de envío para el RMA en curso."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
@@ -2106,7 +2221,7 @@ msgstr "Urgente"
 #. module: rma
 #: model:ir.model,name:rma.model_res_users
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
@@ -2151,7 +2266,7 @@ msgstr "Historial de comunicaciones del sitio web"
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
 msgid "When a customer places an RMA, send a notification with it"
-msgstr ""
+msgstr "Cuando un cliente solicite un RMA, envíe una notificación con él"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -2159,11 +2274,13 @@ msgid ""
 "When customers themselves place an RMA from the portal, send an automatic "
 "notification acknowleging it."
 msgstr ""
+"Cuando los propios clientes realicen una RMA desde el portal, envíe una "
+"notificación automática acusando recibo de la misma."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
-msgstr ""
+msgstr "Cuando se confirme un RMA, enviar un correo informativo automático."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -2171,12 +2288,16 @@ msgid ""
 "When the RMA is receive, allow to finsish it manually choosing\n"
 "                            a finalization reason."
 msgstr ""
+"Cuando se recibe el RMA, permite finalizarlo manualmente eligiendo\n"
+"                            un motivo de finalización."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
 "When the RMA products are received, send an automatic information email."
 msgstr ""
+"Cuando se reciban los productos RMA, envíe un correo electrónico automático "
+"de información."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_receipt_confirmation
@@ -2184,6 +2305,8 @@ msgstr ""
 msgid ""
 "When the RMA receipt is confirmed, send a confirmation email to the customer."
 msgstr ""
+"Cuando se confirme la recepción del RMA, envíe un correo electrónico de "
+"confirmación al cliente."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
@@ -2191,6 +2314,8 @@ msgstr ""
 msgid ""
 "When the delivery is confirmed, send a confirmation email to the customer."
 msgstr ""
+"Cuando se confirme la entrega, envíe un correo electrónico de confirmación "
+"al cliente."
 
 #. module: rma
 #. odoo-python

From 763fb708df7554bcfd53c807b6f9114de4bdb377 Mon Sep 17 00:00:00 2001
From: sofien-moalla <s.moalla@cadrinsitu.com>
Date: Tue, 12 Sep 2023 15:21:58 +0000
Subject: [PATCH 076/108] Added translation using Weblate (French)

---
 rma/i18n/fr.po | 2305 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2305 insertions(+)
 create mode 100644 rma/i18n/fr.po

diff --git a/rma/i18n/fr.po b/rma/i18n/fr.po
new file mode 100644
index 000000000..aec2e3921
--- /dev/null
+++ b/rma/i18n/fr.po
@@ -0,0 +1,2305 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* rma
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2023-09-20 05:02+0000\n"
+"Last-Translator: sofien-moalla <s.moalla@cadrinsitu.com>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. module: rma
+#. odoo-python
+#: code:addons/rma/models/rma_team.py:0
+#, python-format
+msgid "%s (copy)"
+msgstr "%s (copie)"
+
+#. module: rma
+#: model:ir.actions.report,print_report_name:rma.report_rma_action
+#, fuzzy
+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> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
+msgstr ""
+"<b>Objet de l'e-mail:</b> %(subject)s<br/><br/><b>Corps de l'e-mail:</b><br/"
+">%(body)s"
+
+#. 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\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"
+"                    Chère\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"
+"                    Voici le RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    de\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    .\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    N'hésitez pas à nous contacter si vous avez des "
+"questions.\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\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"
+"                    Chère\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"
+"                    Les produits pour votre RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    de\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    ont été reçus dans notre entrepôt.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    N'hésitez pas à nous contacter si vous avez des "
+"questions.\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\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"
+"                    Chère\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"
+"                    Vous avez placé avec succès votre RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    sur \n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    . Notre équipe va le vérifier et le valider dans les "
+"plus brefs délais.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    N'hésitez pas à nous contacter pour toute question. \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\"/>"
+msgstr ""
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
+"\"Télécharger\"/>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Paid</b>"
+msgstr ""
+"<i class=\"fa fa-fw fa-check\"/>\n"
+"                                <b>Payé</b>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Waiting Payment</b>"
+msgstr ""
+"<i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                <b>Attente de paiement</b>"
+
+#. 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 ""
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Télécharger\"/>"
+
+#. 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 ""
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
+"\"Télécharger\"/>"
+
+#. 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"
+"                                            Cancelled\n"
+"                                        </span>"
+msgstr ""
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/>"
+"\n"
+"                                            Annulé\n"
+"                                        </span>"
+
+#. 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"
+"                                    Cancelled\n"
+"                                </span>"
+msgstr ""
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Annulé\n"
+"                                </span>"
+
+#. module: rma
+#: 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"
+"                                            Preparation\n"
+"                                        </span>"
+msgstr ""
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\""
+"/>\n"
+"                                            Préparation\n"
+"                                        </span>"
+
+#. module: rma
+#: 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"
+"                                    Preparation\n"
+"                                </span>"
+msgstr ""
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Préparation\n"
+"                                </span>"
+
+#. 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 ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/>"
+"\n"
+"                                            Expédié\n"
+"                                        </span>"
+
+#. 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 ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Expédié\n"
+"                                </span>"
+
+#. 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\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\""
+"/>\n"
+"                                            Partiellement disponible\n"
+"                                        </span>"
+
+#. 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\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Partiellement disponible\n"
+"                                </span>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
+"specific.\" groups=\"base.group_multi_company\"/>"
+msgstr ""
+"<span class=\"fa fa-lg fa-building-o\" title=\"Les valeurs définies ici sont "
+"propres à l'entreprise.\" groups=\"base.group_multi_company\"/>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
+msgstr "<strong class=\"d-block mb-1\">Livraison</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Reception</strong>"
+msgstr "<strong class=\"d-block mb-1\">Réception</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong class=\"d-block mb-1\">Refund</strong>"
+msgstr "<strong class=\"d-block mb-1\">Remboursement</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Customer:</strong>"
+msgstr "<strong>Client:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Date:</strong>"
+msgstr "<strong>Date:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Deadline:</strong>"
+msgstr "<strong>Date limite:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Deadline</strong>"
+msgstr "<strong>Date limite</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Delivered qty:</strong>"
+msgstr "<strong>Quantité livrée:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Delivered quantity</strong>"
+msgstr "<strong>Quantité livrée</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Move:</strong>"
+msgstr "<strong>Déplacer:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin delivery:</strong>"
+msgstr "<strong>livraison Origine:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin delivery</strong>"
+msgstr "<strong>livraison Origine</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Origin:</strong>"
+msgstr "<strong>Origine:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Origin</strong>"
+msgstr "<strong>Origine</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Product:</strong>"
+msgstr "<strong>Produit:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Product</strong>"
+msgstr "<strong>Produit</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Quantity:</strong>"
+msgstr "<strong>Quantité:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Quantity</strong>"
+msgstr "<strong>Quantité</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>RMA Date</strong>"
+msgstr "<strong>Date RMA</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>RMA Note:</strong>"
+msgstr "<strong>Remarque RMA:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Responsible:</strong>"
+msgstr "<strong>Responsable:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>Shipping Address:</strong>"
+msgstr "<strong>Adresse de livraison:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "<strong>Shipping address:</strong>"
+msgstr "<strong>Adresse de livraison:</strong>"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "<strong>State:</strong>"
+msgstr "<strong>État:</strong>"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_defaults
+#, fuzzy
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+"Un dictionnaire Python qui sera interprété pour fournir les valeurs par "
+"défaut lors de la création des nouveaux enregistrements pour cet alias."
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+#, fuzzy
+msgid "Accept Emails From"
+msgstr "Accepter les emails de"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_warning
+msgid "Access warning"
+msgstr "Avertissement d’accès"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction
+msgid "Action Needed"
+msgstr "Action Nécessaire"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__active
+#: model:ir.model.fields,field_description:rma.field_rma_operation__active
+#: model:ir.model.fields,field_description:rma.field_rma_tag__active
+#: model:ir.model.fields,field_description:rma.field_rma_team__active
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+msgid "Active"
+msgstr "Active"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_ids
+msgid "Activities"
+msgstr "Activités"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr "Décoration de l’activité en exception"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_state
+msgid "Activity State"
+msgstr "Status de l'activité"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_icon
+msgid "Activity Type Icon"
+msgstr "Icône type d'activité"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_id
+msgid "Alias"
+msgstr "Alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
+msgid "Alias Contact Security"
+msgstr "Alias Contact Sécurité"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
+msgid "Alias Name"
+msgstr "Nom de l'alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias domain"
+msgstr "Domaine de l'alias"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
+msgid "Aliased Model"
+msgstr "Modèle d'Alias"
+
+#. module: rma
+#: model:res.groups,name:rma.group_rma_manual_finalization
+msgid "Allow RMA manual finalization"
+msgstr "Permettre la finalisation manuelle de RMA"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Allow to finish an RMA without returning back a product or refunding"
+msgstr "Permettre de terminer un RMA sans renvoyer un produit ou le rembourser"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_view_search
+#: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
+msgid "Archived"
+msgstr "Archivé"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Are you sure you want to cancel this RMA"
+msgstr "Êtes-vous sûr de vouloir annuler ce RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_attachment_count
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_attachment_count
+msgid "Attachment Count"
+msgstr "Nombre de pièce jointe"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Avatar"
+msgstr "Avatar"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_finished
+msgid "Can Be Finished"
+msgstr "Peut être terminé"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_locked
+msgid "Can Be Locked"
+msgstr "Peut être verrouillé"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_refunded
+msgid "Can Be Refunded"
+msgstr "Peut être remboursé"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_replaced
+msgid "Can Be Replaced"
+msgstr "Peut être remplacé"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_returned
+msgid "Can Be Returned"
+msgstr "Peut être retourné"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__can_be_split
+msgid "Can Be Split"
+msgstr "Peut être divisé"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__cancelled
+msgid "Canceled"
+msgstr "Annulé"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
+msgid "Category"
+msgstr "Catégorie"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
+msgid "Category UoM"
+msgstr "Catégorie UdM"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.rma_action
+#: model_terms:ir.actions.act_window,help:rma.rma_team_action
+msgid "Click to add a new RMA."
+msgstr "Cliquez pour ajouter un nouveau RMA."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__color
+msgid "Color Index"
+msgstr "Index de la couleur"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
+msgid "Commercial Entity"
+msgstr "Entité commerciale"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Communication"
+msgstr "Motif"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__company_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__company_id
+msgid "Company"
+msgstr "Société"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_config_settings
+msgid "Config Settings"
+msgstr "Paramètres de config"
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_configuration_menu
+msgid "Configuration"
+msgstr "Configuration"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Confirm"
+msgstr "Confirmer"
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__confirmed
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Confirmed"
+msgstr "Confirmé"
+
+#. module: rma
+#: model:ir.model,name:rma.model_res_partner
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Contact"
+msgstr "Contact"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__uom_category_id
+#: model:ir.model.fields,help:rma.field_rma_delivery_wizard__uom_category_id
+msgid ""
+"Conversion between Units of Measure can only occur if they belong to the "
+"same category. The conversion will be made based on the ratios."
+msgstr ""
+"Les conversions entre unités de mesures ne peuvent se faire qu'entre unités "
+"d'une même catégorie. La conversion se fait en utilisant des ratios."
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__create_rma
+msgid "Create RMAs"
+msgstr "Créer des RMA"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid "Create a new RMA finalization"
+msgstr "Créer une nouvelle finalisation RMA"
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid "Create a new RMA tag"
+msgstr "Créer une nouvelle étiquette RMA"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_uid
+msgid "Created by"
+msgstr "Crée par"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__create_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__create_date
+msgid "Created on"
+msgstr "Crée le"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
+msgid "Custom Bounced Message"
+msgstr "Message personnalisé"
+
+#. module: rma
+#. odoo-python
+#: code:addons/rma/models/rma.py:0
+#: model:ir.model.fields,field_description:rma.field_rma__partner_id
+#, python-format
+msgid "Customer"
+msgstr "Client"
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__access_url
+msgid "Customer Portal URL"
+msgstr "URl du portail 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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+#, python-format
+msgid "Date"
+msgstr "Date"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Date:"
+msgstr "Date:"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__deadline
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Deadline"
+msgstr "Echéance"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_defaults
+msgid "Default Values"
+msgstr "Valeurs par défaut"
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_redelivery_wizard_view_form
+msgid "Deliver"
+msgstr "Livrer"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
+msgid "Delivered Qty"
+msgstr "Qté livrée"
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
+msgid "Delivered Qty Done"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
+msgid "Delivery count"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
+msgid "Delivery reservation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__description
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "Description"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__display_name
+#: model:ir.model.fields,field_description:rma.field_rma_operation__display_name
+#: 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
+msgid "Display Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Draft"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,name:rma.mt_rma_draft
+#: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
+msgid "Draft RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Email Alias"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Email Template"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email Template confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+msgid "Email Template draft notification for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email Template receipt confirmation for RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
+msgid "Email sent to the customer once the RMA is confirmed."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
+msgid "Email sent to the customer once the RMA products are received."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
+#: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
+msgid "Extracted from"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__finalization_id
+msgid "Finalization Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
+msgid "Finalization name already exists !"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
+msgid "Finish"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
+msgid "Finish RMA"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
+msgid "Finish RMA Manualy"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
+msgid "Finish RMA manually choosing a reason"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Finish RMAs manually"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
+msgid "Finished"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
+msgid "Followers"
+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
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Group By"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
+msgid "Group RMA returns by customer address and warehouse"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Group RMA returns by customer and warehouse."
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__id
+#: model:ir.model.fields,field_description:rma.field_rma_operation__id
+#: 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
+msgid "ID"
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_needaction
+#: model:ir.model.fields,help:rma.field_rma_team__message_needaction
+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_team__message_has_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
+msgid ""
+"If set, this content will automatically be sent out to unauthorized users "
+"instead of the default message."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__active
+msgid ""
+"If the active field is set to false, it will allow you to hide the RMA Team "
+"without removing it."
+msgstr ""
+
+#. module: rma
+#. odoo-python
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Incoming e-mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
+msgid "Invoice Address"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing Address:"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Invoicing and Shipping Address:"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move
+msgid "Journal Entry"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: rma
+#: 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
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
+#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
+#: 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
+msgid "Last Modified on"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_operation__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
+#: model:ir.model.fields,field_description:rma.field_rma_team__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Late RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__location_id
+msgid "Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Lock"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
+msgid "Locked"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
+msgid "Main Attachment"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
+msgid ""
+"Manage RMA finalization reasons to better classify them for tracking and "
+"analysis purposes."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.actions.act_window,help:rma.action_rma_tag
+msgid ""
+"Manage RMA tags to better classify them for tracking and analysis purposes."
+msgstr ""
+
+#. module: rma
+#: model:ir.module.category,description:rma.rma_module_category
+msgid "Manage Return Merchandise Authorizations (RMAs)."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_manager
+msgid "Manager"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
+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
+#: model:ir.model.fields,field_description:rma.field_rma_team__name
+#, python-format
+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
+msgid "New"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
+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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
+msgid "Normal"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
+msgid "Number of errors"
+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 requiring action"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
+#: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
+msgid ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: rma
+#: model:ir.ui.menu,name:rma.rma_orders_menu
+msgid "Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__picking_id
+msgid "Origin Delivery"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__move_id
+msgid "Origin move"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Other Information"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
+msgid "Owner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
+msgid "Parent Model"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
+msgid "Parent Record Thread ID"
+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) and task (model))"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Partner"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_contact
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_url
+msgid "Portal Access URL"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Preview"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__priority
+msgid "Priority"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
+msgid "Procurement group"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_id
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "Product"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
+msgid "Product qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
+msgid "Public Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+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
+msgid "Quantity must be greater than 0."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
+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 "
+"(%(remaining_qty)s %(product_uom)s)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
+msgid "Quantity to extract to a new RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_action
+#: model:ir.model,name:rma.model_rma
+#: model:ir.model.fields,field_description:rma.field_account_move_line__rma_id
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__rma_id
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma
+#: model:ir.module.category,name:rma.rma_module_category
+#: model:ir.ui.menu,name:rma.rma_menu
+#: model_terms:ir.ui.view,arch_db:rma.view_partner_form
+#: model_terms:ir.ui.view,arch_db:rma.view_picking_form
+msgid "RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "RMA #"
+msgstr ""
+
+#. module: rma
+#. odoo-python
+#: code:addons/rma/models/res_company.py:0
+#, python-format
+msgid "RMA Code"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Confirmation Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Date"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMA Deadline"
+msgstr ""
+
+#. module: rma
+#. odoo-python
+#: code:addons/rma/models/stock_warehouse.py:0
+#, python-format
+msgid "RMA Delivery Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_delivery_wizard
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization
+msgid "RMA Finalization Reason"
+msgstr ""
+
+#. module: 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
+msgid "RMA Finalization Reasons"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_finalization_wizard
+msgid "RMA Finalization Wizard"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
+msgid "RMA In Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
+msgid "RMA Location"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA Manual Finalization"
+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 ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
+msgid "RMA Order -"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_menu_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
+#: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
+msgid "RMA Orders"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
+msgid "RMA Out Type"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.report,name:rma.report_rma_action
+msgid "RMA Report"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_split_wizard
+msgid "RMA Split Wizard"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
+msgid "RMA Tag"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.action_rma_tag
+#: 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
+msgid "RMA Tags"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_team
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_team_id
+#: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "RMA Team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_users__rma_team_id
+msgid "RMA Team the user is member of."
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_notification
+msgid "RMA automatic customer notifications"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_count
+#: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
+msgid "RMA count"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "RMA draft notification Email"
+msgstr ""
+
+#. module: rma
+#: model:mail.message.subtype,description:rma.mt_rma_draft
+msgid "RMA in draft state"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
+msgid "RMA receivers"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_stock_warehouse__rma
+msgid "RMA related products can be stored in this warehouse."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_rma_operation
+msgid "RMA requested operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
+msgid "RMA return"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_team_action
+#: model:ir.model.fields,field_description:rma.field_rma__team_id
+msgid "RMA team"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
+#: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
+#: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
+msgid "RMAs"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs which deadline has passed"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "RMAs yet to be fully processed"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
+msgid "Reason"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_finalization__name
+msgid "Reason Name"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Receipt"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__received
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Received"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
+msgid "Reception move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__origin
+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
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+#, python-format
+msgid "Refund"
+msgstr ""
+
+#. 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 ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
+msgid "Refunded"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
+msgid "Remaining delivered qty"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
+msgid "Remaining delivered qty to done"
+msgstr ""
+
+#. module: rma
+#: model:rma.operation,name:rma.rma_operation_return
+msgid "Repair"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
+#: model:rma.operation,name:rma.rma_operation_replace
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Replace"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
+msgid "Replace Product"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
+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."
+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=\"%(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
+#: model:ir.ui.menu,name:rma.rma_reporting_menu
+msgid "Reporting"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__operation_id
+msgid "Requested operation"
+msgstr ""
+
+#. module: rma
+#. odoo-python
+#: code:addons/rma/models/rma.py:0
+#, python-format
+msgid "Required field(s):%s"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__user_id
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Responsible"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
+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"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
+#: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
+msgid "Returned"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
+msgid "Rma"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
+msgid "Rma Count"
+msgstr ""
+
+#. module: rma
+#: 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
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__access_token
+msgid "Security Token"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
+msgid "Send RMA Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
+msgid "Send RMA Receipt Confirmation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "Send RMA draft Confirmation"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA info to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic RMA products reception notification to customer"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Send automatic notification when the customer places an RMA"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Email"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Send by Mail"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__sent
+msgid "Sent"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__sequence
+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"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Set to draft"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Share"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
+msgid "Shipping Address"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
+msgid "Shipping address for current RMA."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__origin
+msgid "Source Document"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Split"
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.act_window,name:rma.rma_split_wizard_action
+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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__state
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+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
+msgid "Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_rule
+msgid "Stock Rule"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_tag__name
+msgid "Tag Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
+msgid "Tag name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__tag_ids
+msgid "Tags"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Tags..."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__user_id
+msgid "Team Leader"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
+#: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
+msgid "Team Members"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
+msgid "That operation name already exists !"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__active
+msgid "The active field allows you to hide the category without removing it."
+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)"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_name
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.odoo.com>"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+
+#. module: rma
+#. odoo-python
+#: code:addons/rma/models/stock_move.py:0
+#, python-format
+msgid ""
+"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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_tag__is_public
+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."
+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."
+msgstr ""
+
+#. module: rma
+#: model:ir.actions.server,name:rma.rma_refund_action_server
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "To Refund"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_picking
+msgid "Transfer"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
+msgid "Type"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
+msgid "Type of Operation"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unassigned RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
+#: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
+msgid "Unit of measure"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_form
+msgid "Unlock"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.rma_view_search
+msgid "Unresolved RMAs"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__product_uom
+msgid "UoM"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
+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"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,name:rma.rma_group_user_own
+msgid "User: Own Documents Only"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
+msgid "Waiting for replacement"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
+msgid "Waiting for return"
+msgstr ""
+
+#. module: rma
+#: model:ir.model,name:rma.model_stock_warehouse
+#: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
+#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
+msgid "Warehouse"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
+#: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma__website_message_ids
+#: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
+msgid "When a customer places an RMA, send a notification with it"
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When customers themselves place an RMA from the portal, send an automatic "
+"notification acknowleging it."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "When the RMA is confirmed, send an automatic information email."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA is receive, allow to finsish it manually choosing\n"
+"                            a finalization reason."
+msgstr ""
+
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid ""
+"When the RMA products are received, send an automatic information email."
+msgstr ""
+
+#. 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."
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
+#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_confirmation
+msgid ""
+"When the delivery is confirmed, send a confirmation email to the customer."
+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 ""
+"You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
+"be created"
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_all
+msgid ""
+"the user will have access to all records of everyone in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_user_own
+msgid "the user will have access to his own data in the RMA application."
+msgstr ""
+
+#. module: rma
+#: model:res.groups,comment:rma.rma_group_manager
+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 ""

From ec4ed718fd1e57bf7aed9e8c7963efba95cbeb1d Mon Sep 17 00:00:00 2001
From: Ivorra78 <informatica@totmaterial.es>
Date: Wed, 20 Sep 2023 17:54:55 +0000
Subject: [PATCH 077/108] Translated using Weblate (Spanish)

Currently translated at 100.0% (352 of 352 strings)

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/es/

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/
---
 rma/i18n/es.po | 31 ++++++++---------
 rma/i18n/fr.po | 90 +++++++++++++++++++++++++++-----------------------
 2 files changed, 64 insertions(+), 57 deletions(-)

diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index f2cb8b8a1..22d6c182e 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-08-09 08:07+0000\n"
-"PO-Revision-Date: 2023-09-07 17:37+0000\n"
+"PO-Revision-Date: 2023-09-20 17:54+0000\n"
 "Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
 "Language-Team: \n"
 "Language: es\n"
@@ -204,8 +204,8 @@ msgid ""
 "                                <b>Paid</b>"
 msgstr ""
 "<i class=\"fa fa-fw fa-check\"/>\n"
-"                                                                       "
-"<b>Pagado</b>"
+"                                                                       <b>Pagado</"
+"b>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -214,8 +214,8 @@ msgid ""
 "                                <b>Waiting Payment</b>"
 msgstr ""
 "<i class=\"fa fa-fw fa-clock-o\"/>\n"
-"                                                                          "
-"<b>Esperando Pago</b>"
+"                                                                          <b>Esperando "
+"Pago</b>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -245,8 +245,8 @@ msgid ""
 "                                        </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"
 "                                            Cancelado\n"
 "                                        </span>"
 
@@ -273,8 +273,8 @@ msgid ""
 "                                        </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"
 "                                            Preparación\n"
 "                                        </span>"
 
@@ -301,8 +301,8 @@ msgid ""
 "                                        </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"
 "                                            Enviado\n"
 "                                        </span>"
 
@@ -329,8 +329,8 @@ msgid ""
 "                                        </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"
 "                                            Disponible Parcialmente\n"
 "                                        </span>"
 
@@ -973,7 +973,7 @@ msgstr "Seguidores"
 #: 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
 msgid "Followers (Partners)"
-msgstr "Seguidores (Empresas)"
+msgstr "Seguidores (Socios)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_type_icon
@@ -1906,7 +1906,8 @@ msgstr "Enviar información automática de RMA al cliente"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA products reception notification to customer"
-msgstr "Enviar notificación automática de recepción de productos RMA al cliente"
+msgstr ""
+"Enviar notificación automática de recepción de productos RMA al cliente"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
diff --git a/rma/i18n/fr.po b/rma/i18n/fr.po
index aec2e3921..35159fcfc 100644
--- a/rma/i18n/fr.po
+++ b/rma/i18n/fr.po
@@ -36,8 +36,8 @@ msgstr "(object._get_report_base_filename())"
 msgid ""
 "<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
-"<b>Objet de l'e-mail:</b> %(subject)s<br/><br/><b>Corps de l'e-mail:</b><br/"
-">%(body)s"
+"<b>Objet de l'e-mail:</b> %(subject)s<br/><br/><b>Corps de l'e-mail:</b><br/>"
+"%(body)s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
@@ -158,7 +158,8 @@ msgid ""
 "                    </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"
+"                    . 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"
@@ -192,7 +193,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 ""
 "<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
 "\"Télécharger\"/>"
@@ -218,8 +221,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=\"Télécharger\"/>"
@@ -227,8 +230,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="
 "\"Télécharger\"/>"
@@ -237,13 +240,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"
 "                                            Annulé\n"
 "                                        </span>"
 
@@ -264,13 +268,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"
 "                                            Préparation\n"
 "                                        </span>"
 
@@ -291,13 +296,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"
 "                                            Expédié\n"
 "                                        </span>"
 
@@ -318,13 +324,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"
 "                                            Partiellement disponible\n"
 "                                        </span>"
 
@@ -1010,8 +1017,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
@@ -1202,8 +1209,7 @@ 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
+#: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
 msgstr ""
@@ -1312,8 +1318,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 ""
 
@@ -1328,7 +1334,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
@@ -1735,10 +1742,10 @@ msgstr ""
 #: 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
@@ -1802,8 +1809,8 @@ msgstr ""
 #: 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
@@ -1944,8 +1951,8 @@ msgstr ""
 #: 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
@@ -2025,9 +2032,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
@@ -2072,8 +2079,8 @@ msgstr ""
 #: 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
@@ -2233,8 +2240,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

From 6f54a8f843f4cfcbc81c85f2c5b1034248a2bea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miquel=20Ra=C3=AFch?= <miquel.raich@forgeflow.com>
Date: Tue, 10 Oct 2023 10:44:32 +0200
Subject: [PATCH 078/108] [FIX] rma: `image_128` -> `avatar_128`

[BOT] post-merge updates
---
 rma/README.rst                    | 2 +-
 rma/__manifest__.py               | 2 +-
 rma/static/description/index.html | 2 +-
 rma/views/rma_team_views.xml      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index 2e928f8e3..2d8604c8c 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -7,7 +7,7 @@ Return Merchandise Authorization Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d52a3b34c6923f1a427f0fedf32b0c140b2dc555636444355e1bdc4e51f59d95
+   !! source digest: sha256:6a3edc8e17cad866190342b8f2626811cdbe979b8cfe919160d2e314f519b080
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 5a8bdedfb..b66eb52be 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "16.0.1.0.1",
+    "version": "16.0.1.1.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index 38915bf94..cdc9b1405 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -367,7 +367,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d52a3b34c6923f1a427f0fedf32b0c140b2dc555636444355e1bdc4e51f59d95
+!! source digest: sha256:6a3edc8e17cad866190342b8f2626811cdbe979b8cfe919160d2e314f519b080
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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>.
diff --git a/rma/views/rma_team_views.xml b/rma/views/rma_team_views.xml
index ae08ba9d4..f3454c49c 100644
--- a/rma/views/rma_team_views.xml
+++ b/rma/views/rma_team_views.xml
@@ -59,7 +59,7 @@
                                             >
                                                 <div class="o_kanban_record_top">
                                                     <img
-                                                        t-att-src="kanban_image('res.users', 'image_small', record.id.raw_value)"
+                                                        t-att-src="kanban_image('res.users', 'avatar_128', record.id.raw_value)"
                                                         height="40"
                                                         width="40"
                                                         class="oe_avatar oe_kanban_avatar_smallbox mb0"

From ed17e2b9f6deb84b104e0ec428744dc820cb08c3 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Wed, 11 Oct 2023 08:28:47 +0000
Subject: [PATCH 079/108] Translated using Weblate (Italian)

Currently translated at 90.9% (320 of 352 strings)

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/it/
---
 rma/i18n/it.po | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index adba31d9a..2dab713da 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-09-04 18:38+0000\n"
+"PO-Revision-Date: 2023-10-12 10:36+0000\n"
 "Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -381,7 +381,7 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Accept Emails From"
-msgstr "Accetta Email da"
+msgstr "Accetta email da"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_warning
@@ -432,12 +432,12 @@ msgstr "Alias"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_contact
 msgid "Alias Contact Security"
-msgstr "Contatto di Sicurezza Alias"
+msgstr "Alias contatto sicurezza"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
-msgstr "Nome Alias"
+msgstr "Nome alias"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
@@ -648,7 +648,7 @@ msgstr "Creato il"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_bounced_content
 msgid "Custom Bounced Message"
-msgstr "Messaggio rimbalzato personalizzato"
+msgstr "Messaggio personalizzato per il rifiuto"
 
 #. module: rma
 #. odoo-python
@@ -757,7 +757,7 @@ msgstr "E-mail"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
-msgstr "Alias Email"
+msgstr "Alias email"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -1180,8 +1180,8 @@ msgid ""
 "attached, even if they did not reply to it. If set, this will disable the "
 "creation of new records completely."
 msgstr ""
-"ID facoltativo di un filo (record) a cui verranno allegati tutti i messaggi "
-"in arrivo, anche se non hanno risposto. Se impostato, disabiliterà "
+"ID facoltativo di un thread (record) a cui verranno allegati tutti i "
+"messaggi in arrivo, anche se non hanno risposto. Se impostato, disabiliterà "
 "completamente la creazione di nuovi record."
 
 #. module: rma
@@ -1217,7 +1217,7 @@ msgstr "Modello padre"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
 msgid "Parent Record Thread ID"
-msgstr "ID Filo Record Padre"
+msgstr "ID record thread padre"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_model_id
@@ -1226,7 +1226,7 @@ msgid ""
 "necessarily the model given by alias_model_id (example: project "
 "(parent_model) and task (model))"
 msgstr ""
-"Modello genitore che detiene l'alias. Il modello che contiene il riferimento "
+"Modello padre che detiene l'alias. Il modello che contiene il riferimento "
 "alias non è necessariamente il modello fornito da alias_model_id (esempio: "
 "progetto (parent_model) e task (model))"
 
@@ -1247,7 +1247,7 @@ msgstr ""
 "Politica per inviare un messaggio sul documento utilizzando il mailgateway.\n"
 "- chiunque: chiunque può inviare\n"
 "- clienti: solo i clienti autenticati\n"
-"- followers: solo chi segue il documento collegato o i membri dei seguenti "
+"- chi segue: solo chi segue il documento collegato o i membri dei seguenti "
 "canali\n"
 
 #. module: rma
@@ -1585,7 +1585,7 @@ msgstr "Trasferimento di ricezione"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
 msgid "Record Thread ID"
-msgstr "ID record filo"
+msgstr "ID thread record"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__origin
@@ -1963,8 +1963,8 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
 msgstr ""
-"Il nome dell'email alias, es. 'lavoro' se vuoi ricevere email per "
-"<jobs@example.odoo.com>"
+"Il nome dell'alias email, ad es. 'lavori' se vuoi ricevere email per "
+"<lavori@example.odoo.com>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id

From 0f227dbd547274ec17e8f3c4eb0967560ef3ec04 Mon Sep 17 00:00:00 2001
From: Francesco Foresti <francesco.foresti@ooops404.com>
Date: Tue, 17 Oct 2023 16:58:13 +0000
Subject: [PATCH 080/108] Translated using Weblate (Italian)

Currently translated at 90.9% (320 of 352 strings)

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/it/
---
 rma/i18n/it.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 2dab713da..d965a8e21 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-10-12 10:36+0000\n"
-"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
+"PO-Revision-Date: 2023-10-17 19:38+0000\n"
+"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -549,7 +549,7 @@ msgstr "Indice colore"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__commercial_partner_id
 msgid "Commercial Entity"
-msgstr "Entità Commerciale"
+msgstr "Entità commerciale"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page

From 1a25b1af4c2b3f2465cd33f63944b172de847f69 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Tue, 31 Oct 2023 07:07:43 +0000
Subject: [PATCH 081/108] Translated using Weblate (Italian)

Currently translated at 90.9% (320 of 352 strings)

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/it/
---
 rma/i18n/it.po | 172 ++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 149 insertions(+), 23 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index d965a8e21..1df3841f9 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-10-17 19:38+0000\n"
-"Last-Translator: Francesco Foresti <francesco.foresti@ooops404.com>\n"
+"PO-Revision-Date: 2023-12-27 16:36+0000\n"
+"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -35,6 +35,8 @@ msgstr "(object._get_report_base_filename())"
 msgid ""
 "<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
+"<b>Soggetto e-mail:</b> %(subject)s<br/><br/><b>Corpo e-mail:</b><br/"
+">%(body)s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
@@ -62,6 +64,28 @@ msgid ""
 "            </div>\n"
 "        "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Spettabile\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"
+"                    di seguito la 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"
+"                    Non esitate a contattarci in caso di dubbi.\n"
+"                </p>\n"
+"            </div>\n"
+"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_receipt_notification
@@ -89,6 +113,28 @@ msgid ""
 "            </div>\n"
 "        "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Spettabile\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"
+"                    I prodotti per la sua RMA\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    from\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    sono stati ricevuti nel nostro magazzino.\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Non esitate a contattarci in caso di dubbi.\n"
+"                </p>\n"
+"            </div>\n"
+"        "
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_draft_notification
@@ -117,6 +163,29 @@ msgid ""
 "            </div>\n"
 "        "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"                    Spettabile\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"
+"                    la sua RMA è stato correttamnte inserita\n"
+"                    <strong>\n"
+"                        <t t-out=\"object.name\"></t>\n"
+"                    </strong>\n"
+"                    on\n"
+"                    <t t-out=\"object.company_id.name\"></t>\n"
+"                    . Il nostro team la controllerà e validerà quanto prima."
+"\n"
+"                    <br>\n"
+"                    <br>\n"
+"                    Non esistate a contattarci in caso di dubbi.\n"
+"                </p>\n"
+"            </div>\n"
+"        "
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -172,6 +241,11 @@ msgid ""
 "                                            Cancelled\n"
 "                                        </span>"
 msgstr ""
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-times\"/>"
+"\n"
+"                                            Annullata\n"
+"                                        </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -181,6 +255,10 @@ msgid ""
 "                                    Cancelled\n"
 "                                </span>"
 msgstr ""
+"<span class=\"badge badge-danger label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-times\"/>\n"
+"                                    Annullata\n"
+"                                </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -191,6 +269,11 @@ msgid ""
 "                                            Preparation\n"
 "                                        </span>"
 msgstr ""
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\""
+"/>\n"
+"                                            Preparazione\n"
+"                                        </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -200,6 +283,10 @@ msgid ""
 "                                    Preparation\n"
 "                                </span>"
 msgstr ""
+"<span class=\"badge badge-info label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Preparazione\n"
+"                                </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -210,6 +297,11 @@ msgid ""
 "                                            Shipped\n"
 "                                        </span>"
 msgstr ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-truck\"/>"
+"\n"
+"                                            Spedita\n"
+"                                        </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -219,6 +311,10 @@ msgid ""
 "                                    Shipped\n"
 "                                </span>"
 msgstr ""
+"<span class=\"badge badge-success label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-truck\"/>\n"
+"                                    Spedita\n"
+"                                </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -229,6 +325,11 @@ msgid ""
 "                                            Partially Available\n"
 "                                        </span>"
 msgstr ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                            <i class=\"fa fa-fw fa-clock-o\""
+"/>\n"
+"                                            Parzialmente disponibile\n"
+"                                        </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -238,6 +339,10 @@ msgid ""
 "                                    Partially Available\n"
 "                                </span>"
 msgstr ""
+"<span class=\"badge badge-warning label-text-align\">\n"
+"                                    <i class=\"fa fa-fw fa-clock-o\"/>\n"
+"                                    Parzialmente disponibile\n"
+"                                </span>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -697,12 +802,12 @@ msgstr "Consegna"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty
 msgid "Delivered Qty"
-msgstr ""
+msgstr "Q.tà consegnata"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
 msgid "Delivered Qty Done"
-msgstr ""
+msgstr "Quantità consegnata fatta"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
@@ -891,7 +996,7 @@ msgstr "Raggruppa resi RMA per cliente e magazzino."
 #: 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 ""
+msgstr "Ha un messaggio"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__id
@@ -1165,7 +1270,7 @@ msgstr "Numero di errori"
 #: 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 requiring action"
-msgstr ""
+msgstr "Numero di messaggi che richiedono un'azione"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
@@ -1313,6 +1418,8 @@ msgid ""
 "Quantity to extract cannot be greater than remaining delivery quantity "
 "(%(remaining_qty)s %(product_uom)s)"
 msgstr ""
+"La quantità da estrarre non può essere maggiore della quantità consegna "
+"rimanente (%(remaining_qty)s %(product_uom)s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
@@ -1375,7 +1482,7 @@ msgstr "Wizard Consegna RMA"
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_draft_notification
 msgid "RMA Draft Notification"
-msgstr ""
+msgstr "Noifica bozza RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
@@ -1446,7 +1553,7 @@ msgstr "E-mail di conferma ricevuta RMA"
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
-msgstr ""
+msgstr "Notifica ricevuta RMA"
 
 #. module: rma
 #. odoo-python
@@ -1605,7 +1712,7 @@ msgstr "Rimborso"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
 msgid "Refund Line"
-msgstr ""
+msgstr "Riga rimborso"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
@@ -1659,6 +1766,10 @@ msgid ""
 "\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) has "
 "been created."
 msgstr ""
+"Sostituzione: Movimento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
+"id=\"%(move_id)d\">%(move_name)s</a> (prelievo <a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) "
+"creato."
 
 #. module: rma
 #. odoo-python
@@ -1670,6 +1781,10 @@ msgid ""
 "replacement did not create a new move, but one of the previously created "
 "moves was updated with this data."
 msgstr ""
+"Sostituzione:<br/>Prodotto <a href=\"#\" data-oe-model=\"product.product\" "
+"data-oe-id=\"%(id)d\">%(name)s</a><br/>Quantità %(qty)s %(uom)s<br/>Questa "
+"sostituzione non crea un nuovo movimento, ma uno dei movimenti creati in "
+"precedenza è stato aggiornato con questa quantità."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
@@ -1702,12 +1817,12 @@ msgstr "Utente responsabile"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
 msgid "Return Location"
-msgstr ""
+msgstr "Ubicazione di reso"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
-msgstr "Picking Reso"
+msgstr "Prelievo di reso"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
@@ -1724,6 +1839,8 @@ msgid ""
 "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=\"%(id)d\""
+">%(name)s</a> creato."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1743,7 +1860,7 @@ msgstr "Conteggio Rma"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
 msgid "Rma Location"
-msgstr ""
+msgstr "Ubicazione RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
@@ -1792,12 +1909,12 @@ msgstr "Invia una notifica automatica quando il cliente inserisce un RMA"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
-msgstr "Invia per Email"
+msgstr "Invia per e-mail"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Mail"
-msgstr "Invia per mail"
+msgstr "Invia per posta"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__sent
@@ -1846,7 +1963,7 @@ msgstr "Indirizzo di spedizione per questo RMA."
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
 msgid "Source Document"
-msgstr "Documento di Origine"
+msgstr "Documento di origine"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
@@ -1867,6 +1984,8 @@ msgid ""
 "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=\"%(id)d\""
+">%(name)s</a> creata."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -1928,7 +2047,7 @@ msgstr "Etichette..."
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__user_id
 msgid "Team Leader"
-msgstr "Team Leader"
+msgstr "Team leader"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
@@ -1953,9 +2072,9 @@ msgid ""
 "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 ""
-"Il modello (Odoo Document Kind) a cui corrisponde questo alias. Qualsiasi "
-"email in arrivo che non risponde a un record esistente causerà la creazione "
-"di un nuovo record di questo modello (es. una task progetto)"
+"Il modello (tipo documento Odoo) a cui corrisponde questo alias. Qualsiasi e-"
+"mail in arrivo che non risponde a un record esistente causerà la creazione "
+"di un nuovo record di questo modello (es. un task progetto)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_name
@@ -1988,6 +2107,9 @@ msgid ""
 "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 '%(id)s' deve essere uguale alla sua "
+"richiesta iniziale perché il movimento di magazzino è legato ad una RMA "
+"(%(name)s)."
 
 #. module: rma
 #. odoo-python
@@ -2037,7 +2159,7 @@ msgstr "Questo RMA non può eseguire un reso."
 #: model:ir.actions.server,name:rma.rma_refund_action_server
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "To Refund"
-msgstr "Da Rimborsare"
+msgstr "Da rimborsare"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_picking
@@ -2093,7 +2215,7 @@ msgstr "Urgente"
 #. module: rma
 #: model:ir.model,name:rma.model_res_users
 msgid "User"
-msgstr ""
+msgstr "Utente"
 
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
@@ -2230,12 +2352,12 @@ msgstr "l'utente avrà accesso alla configurazione RMA e ai report statistici."
 #: 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 ""
+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 ""
+msgstr "{{object.company_id.name}} RMA (rif. {{object.name or 'n/a' }})"
 
 #. module: rma
 #: model:mail.template,subject:rma.mail_template_rma_receipt_notification
@@ -2243,6 +2365,8 @@ msgid ""
 "{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) products "
 "received"
 msgstr ""
+"Prodotti ricevuti per RMA (rif. {{object.name or 'n/a' }}) di {{object."
+"company_id.name}}"
 
 #. module: rma
 #: model:mail.template,subject:rma.mail_template_rma_draft_notification
@@ -2250,6 +2374,8 @@ msgid ""
 "{{object.company_id.name}} Your RMA has been succesfully created (Ref "
 "{{object.name or 'n/a' }})"
 msgstr ""
+"{{object.company_id.name}} La vostra RMA è stata creata con successo (rif. {{"
+"object.name or 'n/a' }})"
 
 #~ msgid "${(object.name or '')}"
 #~ msgstr "${(object.name or '')}"

From 01724952f5ba78e8b205fd0a7a58c010827ffe92 Mon Sep 17 00:00:00 2001
From: kbentaleb <k.bentaleb@gmail.com>
Date: Thu, 4 Jan 2024 15:51:21 +0000
Subject: [PATCH 082/108] Translated using Weblate (French)

Currently translated at 48.2% (170 of 352 strings)

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/fr/
---
 rma/i18n/fr.po | 484 +++++++++++++++++++++++++++----------------------
 1 file changed, 269 insertions(+), 215 deletions(-)

diff --git a/rma/i18n/fr.po b/rma/i18n/fr.po
index 35159fcfc..402983821 100644
--- a/rma/i18n/fr.po
+++ b/rma/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-09-20 05:02+0000\n"
-"Last-Translator: sofien-moalla <s.moalla@cadrinsitu.com>\n"
+"PO-Revision-Date: 2024-01-08 21:34+0000\n"
+"Last-Translator: kbentaleb <k.bentaleb@gmail.com>\n"
 "Language-Team: none\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -490,7 +490,6 @@ msgstr ""
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
-#, fuzzy
 msgid "Accept Emails From"
 msgstr "Accepter les emails de"
 
@@ -812,28 +811,28 @@ msgstr "Qté livrée"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
 msgid "Delivered Qty Done"
-msgstr ""
+msgstr "Quantité livrée Terminé"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
-msgstr ""
+msgstr "Livraison"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivery_picking_count
 msgid "Delivery count"
-msgstr ""
+msgstr "NB. Livraison"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__delivery_move_ids
 msgid "Delivery reservation"
-msgstr ""
+msgstr "Réservation de livraison"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__description
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__display_name
@@ -845,134 +844,134 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_tag__display_name
 #: model:ir.model.fields,field_description:rma.field_rma_team__display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Nom d'affichage"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__draft
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
 
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_draft
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_draft
 msgid "Draft RMA"
-msgstr ""
+msgstr "RMA Brouillon"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
-msgstr ""
+msgstr "Alias d'email"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Email Template"
-msgstr ""
+msgstr "Modèle d'email"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email Template confirmation for RMA"
-msgstr ""
+msgstr "Modèle d'email de confirmation de la RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_draft_confirmation_template_id
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
 msgid "Email Template draft notification for RMA"
-msgstr ""
+msgstr "Modèle d'email de botification de la RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_mail_receipt_confirmation_template_id
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
 msgid "Email Template receipt confirmation for RMA"
-msgstr ""
+msgstr "Modèle d'email de confirmation de réception de la RMA"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
 msgid "Email sent to the customer once the RMA is confirmed."
-msgstr ""
+msgstr "E-mail envoyé au client une fois le RMA confirmé."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_receipt_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_receipt_confirmation_template_id
 msgid "Email sent to the customer once the RMA products are received."
-msgstr ""
+msgstr "Email envoyé au client une fois les produits RMA reçus."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_draft_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_draft_confirmation_template_id
 msgid "Email sent to the customer when they place an RMA from the portal"
-msgstr ""
+msgstr "E-mail envoyé au client lorsqu'il passe un RMA depuis le portail"
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/wizard/rma_split.py:0
 #, python-format
 msgid "Extracted RMA"
-msgstr ""
+msgstr "RMA extrait"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin_split_rma_id
 msgid "Extracted from"
-msgstr ""
+msgstr "Extrait de"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__finalization_id
 msgid "Finalization Reason"
-msgstr ""
+msgstr "Raison de finalisation"
 
 #. module: rma
 #: model:ir.model.constraint,message:rma.constraint_rma_finalization_name_company_uniq
 msgid "Finalization name already exists !"
-msgstr ""
+msgstr "Le nom de la finalisation existe déjà !"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
 msgid "Finish"
-msgstr ""
+msgstr "Terminer"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
 msgid "Finish RMA"
-msgstr ""
+msgstr "Terminer RMA"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_finalization_wizard_action
 msgid "Finish RMA Manualy"
-msgstr ""
+msgstr "Terminer RMA manuellement"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__group_rma_manual_finalization
 msgid "Finish RMA manually choosing a reason"
-msgstr ""
+msgstr "Terminer RMA manuellement en choisissant une raison"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Finish RMAs manually"
-msgstr ""
+msgstr "Terminer RMA manuellement"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__finished
 msgid "Finished"
-msgstr ""
+msgstr "Terminé"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_follower_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_follower_ids
 msgid "Followers"
-msgstr ""
+msgstr "Abonnés"
 
 #. 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
 msgid "Followers (Partners)"
-msgstr ""
+msgstr "Abonnés (Partenaires)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_type_icon
@@ -982,25 +981,25 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Group By"
-msgstr ""
+msgstr "Groupé par"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__rma_return_grouping
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__rma_return_grouping
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_return_grouping
 msgid "Group RMA returns by customer address and warehouse"
-msgstr ""
+msgstr "Retours RMA groupés par adresse client et entrepôt"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Group RMA returns by customer and warehouse."
-msgstr ""
+msgstr "Retours RMA groupés par client et par entrepôt."
 
 #. module: rma
 #: 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 ""
+msgstr "A un message"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__id
@@ -1012,7 +1011,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_tag__id
 #: model:ir.model.fields,field_description:rma.field_rma_team__id
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_thread_id
@@ -1020,28 +1019,31 @@ msgid ""
 "ID of the parent record holding the alias (example: project holding the task "
 "creation alias)"
 msgstr ""
+"ID de l'enregistrement parent détenant l'alias (exemple : projet détenant "
+"l'alias de création de tâche)"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_exception_icon
 msgid "Icon"
-msgstr ""
+msgstr "Icon"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_exception_icon
 msgid "Icon to indicate an exception activity."
-msgstr ""
+msgstr "Icône pour indiquer une activité d'exception."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_needaction
 #: model:ir.model.fields,help:rma.field_rma_team__message_needaction
 msgid "If checked, new messages require your attention."
 msgstr ""
+"Si cette case est cochée, les nouveaux messages nécessitent votre attention."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error
 msgid "If checked, some messages have a delivery error."
-msgstr ""
+msgstr "Si coché, certains messages ont une erreur de livraison."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_bounced_content
@@ -1049,6 +1051,8 @@ msgid ""
 "If set, this content will automatically be sent out to unauthorized users "
 "instead of the default message."
 msgstr ""
+"S'il est défini, ce contenu sera automatiquement envoyé aux utilisateurs non "
+"autorisés au lieu du message par défaut."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__active
@@ -1056,44 +1060,46 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the RMA Team "
 "without removing it."
 msgstr ""
+"Si le champ actif est défini sur false, cela vous permettra de masquer "
+"l'équipe RMA sans la supprimer."
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Incoming e-mail"
-msgstr ""
+msgstr "E-mail entrant"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__partner_invoice_id
 msgid "Invoice Address"
-msgstr ""
+msgstr "Adresse de facturation"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "Invoicing Address:"
-msgstr ""
+msgstr "Adresse de facturation:"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "Invoicing and Shipping Address:"
-msgstr ""
+msgstr "Adresse de facturation et livraison:"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
 msgid "Is Follower"
-msgstr ""
+msgstr "Est un abonné"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
 msgid "Journal Entry"
-msgstr ""
+msgstr "Pièce comptable"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move_line
 msgid "Journal Item"
-msgstr ""
+msgstr "Écriture comptable"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma____last_update
@@ -1105,7 +1111,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_tag____last_update
 #: model:ir.model.fields,field_description:rma.field_rma_team____last_update
 msgid "Last Modified on"
-msgstr ""
+msgstr "Dernière Modification le"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
@@ -1117,7 +1123,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_uid
 msgid "Last Updated by"
-msgstr ""
+msgstr "Dernière mise à jour par"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_date
@@ -1129,33 +1135,33 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_tag__write_date
 #: model:ir.model.fields,field_description:rma.field_rma_team__write_date
 msgid "Last Updated on"
-msgstr ""
+msgstr "Dernière mise à jour le"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Late RMAs"
-msgstr ""
+msgstr "RMAs en retard"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
-msgstr ""
+msgstr "Emplacement"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Lock"
-msgstr ""
+msgstr "Verrouiller"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__locked
 msgid "Locked"
-msgstr ""
+msgstr "Verrouillé"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
 msgid "Main Attachment"
-msgstr ""
+msgstr "Pièce jointe principale"
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
@@ -1163,39 +1169,43 @@ msgid ""
 "Manage RMA finalization reasons to better classify them for tracking and "
 "analysis purposes."
 msgstr ""
+"Gérez les motifs de finalisation du RMA pour mieux les classer à des fins de "
+"suivi et d’analyse."
 
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_tag
 msgid ""
 "Manage RMA tags to better classify them for tracking and analysis purposes."
 msgstr ""
+"Gérez les étiquettes RMA pour mieux les classer à des fins de suivi et "
+"d'analyse."
 
 #. module: rma
 #: model:ir.module.category,description:rma.rma_module_category
 msgid "Manage Return Merchandise Authorizations (RMAs)."
-msgstr ""
+msgstr "Gérer les autorisations de retour de marchandise (RMA)."
 
 #. module: rma
 #: model:res.groups,name:rma.rma_group_manager
 msgid "Manager"
-msgstr ""
+msgstr "Responsable"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_has_error
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error
 msgid "Message Delivery error"
-msgstr ""
+msgstr "Erreur de livraison du message"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_ids
 msgid "Messages"
-msgstr ""
+msgstr "Messages"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__my_activity_date_deadline
 msgid "My Activity Deadline"
-msgstr ""
+msgstr "Date limite de mon activité"
 
 #. module: rma
 #. odoo-python
@@ -1205,72 +1215,72 @@ msgstr ""
 #: model:ir.model.fields,field_description:rma.field_rma_team__name
 #, python-format
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_date_deadline
 msgid "Next Activity Deadline"
-msgstr ""
+msgstr "Date limite de la prochaine activité"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_summary
 msgid "Next Activity Summary"
-msgstr ""
+msgstr "Résumé de l'activité suivante"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Type d'activité suivante"
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a replacement."
-msgstr ""
+msgstr "Aucun des RMA sélectionnés ne peut effectuer un remplacement."
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "None of the selected RMAs can perform a return."
-msgstr ""
+msgstr "Aucun des RMA sélectionnés ne peut effectuer de retour."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__priority__0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_needaction_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_needaction_counter
 msgid "Number of Actions"
-msgstr ""
+msgstr "Nombre d'actions"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__message_has_error_counter
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_has_error_counter
 msgid "Number of errors"
-msgstr ""
+msgstr "Nombre des erreurs"
 
 #. 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 requiring action"
-msgstr ""
+msgstr "Nombre de message nécessitant une action"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__message_has_error_counter
 #: model:ir.model.fields,help:rma.field_rma_team__message_has_error_counter
 msgid "Number of messages with delivery error"
-msgstr ""
+msgstr "Nombre de messages avec une erreur de distribution"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_force_thread_id
@@ -1283,37 +1293,37 @@ msgstr ""
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_orders_menu
 msgid "Orders"
-msgstr ""
+msgstr "Commandes"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__picking_id
 msgid "Origin Delivery"
-msgstr ""
+msgstr "Livraison de provenance"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__move_id
 msgid "Origin move"
-msgstr ""
+msgstr "Opération d'origine"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Other Information"
-msgstr ""
+msgstr "Autres informations"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
 msgid "Owner"
-msgstr ""
+msgstr "Propriétaire"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
-msgstr ""
+msgstr "Modèle parent"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_thread_id
 msgid "Parent Record Thread ID"
-msgstr ""
+msgstr "ID de l'enregistrement du fil"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_parent_model_id
@@ -1326,7 +1336,7 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_contact
@@ -1341,44 +1351,44 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_url
 msgid "Portal Access URL"
-msgstr ""
+msgstr "URL d'accès au portail"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Preview"
-msgstr ""
+msgstr "Aperçu"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__priority
 msgid "Priority"
-msgstr ""
+msgstr "Priorité"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__procurement_group_id
 msgid "Procurement group"
-msgstr ""
+msgstr "Groupe d'approvisionnement"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_id
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 msgid "Product"
-msgstr ""
+msgstr "Produit"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom_qty
 msgid "Product qty"
-msgstr ""
+msgstr "Qté de produit"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__is_public
 msgid "Public Tag"
-msgstr ""
+msgstr "Est public"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom_qty
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 msgid "Quantity"
-msgstr ""
+msgstr "Quantité"
 
 #. module: rma
 #. odoo-python
@@ -1386,12 +1396,12 @@ msgstr ""
 #: model:ir.model.constraint,message:rma.constraint_rma_split_wizard_check_product_uom_qty_positive
 #, python-format
 msgid "Quantity must be greater than 0."
-msgstr ""
+msgstr "La quantité doit être supérieure à 0."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom_qty
 msgid "Quantity to extract"
-msgstr ""
+msgstr "Quantité à retourner"
 
 #. module: rma
 #. odoo-python
@@ -1401,11 +1411,13 @@ msgid ""
 "Quantity to extract cannot be greater than remaining delivery quantity "
 "(%(remaining_qty)s %(product_uom)s)"
 msgstr ""
+"La quantité à retourner ne peut pas être supérieure à la quantité restante à "
+"livrer (%(remaining_qty)s %(product_uom)s)"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_split_wizard__product_uom_qty
 msgid "Quantity to extract to a new RMA."
-msgstr ""
+msgstr "Quantité à ajouter à un nouveau RMA."
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_action
@@ -1418,96 +1430,96 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.view_partner_form
 #: model_terms:ir.ui.view,arch_db:rma.view_picking_form
 msgid "RMA"
-msgstr ""
+msgstr "RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "RMA #"
-msgstr ""
+msgstr "# RMA"
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/res_company.py:0
 #, python-format
 msgid "RMA Code"
-msgstr ""
+msgstr "Code RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA Confirmation Email"
-msgstr ""
+msgstr "Email de confirmation RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
-msgstr ""
+msgstr "Date RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Deadline"
-msgstr ""
+msgstr "Date limite RMA"
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Delivery Orders"
-msgstr ""
+msgstr "Bons de livraison RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_delivery_wizard
 msgid "RMA Delivery Wizard"
-msgstr ""
+msgstr "Assistant de livraison RMA"
 
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_draft_notification
 msgid "RMA Draft Notification"
-msgstr ""
+msgstr "Notification brouillon RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_finalization_form
 msgid "RMA Finalization"
-msgstr ""
+msgstr "Finalisation RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_finalization
 msgid "RMA Finalization Reason"
-msgstr ""
+msgstr "Motif de clôture RMA"
 
 #. module: 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
 msgid "RMA Finalization Reasons"
-msgstr ""
+msgstr "Motifs de clôture RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_finalization_wizard
 msgid "RMA Finalization Wizard"
-msgstr ""
+msgstr "Assistant de clôture RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_type_id
 msgid "RMA In Type"
-msgstr ""
+msgstr "Type d'entrée RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_loc_id
 msgid "RMA Location"
-msgstr ""
+msgstr "Emplacement RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA Manual Finalization"
-msgstr ""
+msgstr "Clôture manuelle 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 ""
+msgstr "Notification RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -1519,44 +1531,44 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_home_rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 msgid "RMA Orders"
-msgstr ""
+msgstr "Bons de commande RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_type_id
 msgid "RMA Out Type"
-msgstr ""
+msgstr "Type de sortie RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA Receipt Confirmation Email"
-msgstr ""
+msgstr "Email de confirmation de réception RMA"
 
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
-msgstr ""
+msgstr "Notification de réception RMA"
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "RMA Receipts"
-msgstr ""
+msgstr "Réception RMA"
 
 #. module: rma
 #: model:ir.actions.report,name:rma.report_rma_action
 msgid "RMA Report"
-msgstr ""
+msgstr "Rapport RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_split_wizard
 msgid "RMA Split Wizard"
-msgstr ""
+msgstr "Assistant de répartition RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.view_rma_tag_form
 msgid "RMA Tag"
-msgstr ""
+msgstr "Étiquette RMA"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.action_rma_tag
@@ -1564,7 +1576,7 @@ msgstr ""
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_tag_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_tag_view_search
 msgid "RMA Tags"
-msgstr ""
+msgstr "Étiquettes RMA"
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_team
@@ -1572,34 +1584,34 @@ msgstr ""
 #: model:ir.ui.menu,name:rma.rma_configuration_rma_team_menu
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "RMA Team"
-msgstr ""
+msgstr "Équipe RMA"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_users__rma_team_id
 msgid "RMA Team the user is member of."
-msgstr ""
+msgstr "Équipe RMA dont l'utilisateur fait partie."
 
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_notification
 msgid "RMA automatic customer notifications"
-msgstr ""
+msgstr "Notifications RMA automatiques au client"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_count
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_count
 #: model:ir.model.fields,field_description:rma.field_stock_picking__rma_count
 msgid "RMA count"
-msgstr ""
+msgstr "Nombre de RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "RMA draft notification Email"
-msgstr ""
+msgstr "Email de notification brouillon RMA"
 
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
-msgstr ""
+msgstr "RMA au statut brouillon"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
@@ -1609,76 +1621,77 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,help:rma.field_stock_warehouse__rma
 msgid "RMA related products can be stored in this warehouse."
-msgstr ""
+msgstr "Produits RMA liés peuvent être stockés dans cet entrepôt."
 
 #. module: rma
 #: model:ir.model,name:rma.model_rma_operation
+#, fuzzy
 msgid "RMA requested operation"
-msgstr ""
+msgstr "Opération RMA demandée"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_id
 msgid "RMA return"
-msgstr ""
+msgstr "Retour RMA"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_team_action
 #: model:ir.model.fields,field_description:rma.field_rma__team_id
 msgid "RMA team"
-msgstr ""
+msgstr "Équipe RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_partner__rma_ids
 #: model:ir.model.fields,field_description:rma.field_res_users__rma_ids
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_ids
 msgid "RMAs"
-msgstr ""
+msgstr "RMAs"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMAs which deadline has passed"
-msgstr ""
+msgstr "RMA dont la date limite est dépassée"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMAs yet to be fully processed"
-msgstr ""
+msgstr "RMAs encore à traiter"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard__finalization_id
 msgid "Reason"
-msgstr ""
+msgstr "Motif"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__name
 msgid "Reason Name"
-msgstr ""
+msgstr "Nom du motif"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Receipt"
-msgstr ""
+msgstr "Réception"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__received
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Received"
-msgstr ""
+msgstr "Reçu"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__reception_move_id
 msgid "Reception move"
-msgstr ""
+msgstr "Mouvement de réception"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_force_thread_id
 msgid "Record Thread ID"
-msgstr ""
+msgstr "ID de l'enregistrement du fil"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__origin
 msgid "Reference of the document that generated this RMA."
-msgstr ""
+msgstr "Référence du document à l'origine de cet RMA."
 
 #. module: rma
 #. odoo-python
@@ -1688,54 +1701,54 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 #, python-format
 msgid "Refund"
-msgstr ""
+msgstr "Remboursement"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__refund_line_id
 msgid "Refund Line"
-msgstr ""
+msgstr "Ligne de remboursement"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_invoice_id
 msgid "Refund address for current RMA."
-msgstr ""
+msgstr "Adresse de remboursement pour cet RMA."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__refunded
 msgid "Refunded"
-msgstr ""
+msgstr "Remboursé"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__remaining_qty
 msgid "Remaining delivered qty"
-msgstr ""
+msgstr "Qté restante à livrer"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
 msgid "Remaining delivered qty to done"
-msgstr ""
+msgstr "Qté restante à livrer avant de terminer"
 
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
-msgstr ""
+msgstr "Réparation"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__replace
 #: model:rma.operation,name:rma.rma_operation_replace
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Replace"
-msgstr ""
+msgstr "Remplacer"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_id
 msgid "Replace Product"
-msgstr ""
+msgstr "Produit de remplacement"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__replaced
 msgid "Replaced"
-msgstr ""
+msgstr "Remplacé"
 
 #. module: rma
 #. odoo-python
@@ -1747,6 +1760,10 @@ msgid ""
 "\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) has "
 "been created."
 msgstr ""
+"Remplacement: Mouvement <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
+"id=\"%(move_id)d\">%(move_name)s</a> (Transfert<a href=\"#\" data-oe-model="
+"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) a été "
+"créé."
 
 #. module: rma
 #. odoo-python
@@ -1758,51 +1775,55 @@ msgid ""
 "replacement did not create a new move, but one of the previously created "
 "moves was updated with this data."
 msgstr ""
+"Remplacement:<br/>Produit <a href=\"#\" data-oe-model=\"product.product\" "
+"data-oe-id=\"%(id)d\">%(name)s</a><br/>Quantité %(qty)s %(uom)s<br/>Ce "
+"remplacement n'a pas créé de nouveau mouvement, mais un des mouvements créé "
+"précédemment a été mis à jour avec ces données."
 
 #. module: rma
 #: model:ir.ui.menu,name:rma.rma_reporting_menu
 msgid "Reporting"
-msgstr ""
+msgstr "Rapport"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__operation_id
 msgid "Requested operation"
-msgstr ""
+msgstr "Opération demandée"
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "Required field(s):%s"
-msgstr ""
+msgstr "Champ(s) requis:%s"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__user_id
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_user_id
 msgid "Responsible User"
-msgstr ""
+msgstr "Utilisateur responsable"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__location_id
 msgid "Return Location"
-msgstr ""
+msgstr "Emplacement de retour"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking
 msgid "Return Picking"
-msgstr ""
+msgstr "Ordres de retour"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Return to customer"
-msgstr ""
+msgstr "Retourner au client"
 
 #. module: rma
 #. odoo-python
@@ -1812,139 +1833,144 @@ msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
 "%(name)s</a> has been created."
 msgstr ""
+"Retour : <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\""
+">%(name)s</a> a été créé."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
 msgid "Returned"
-msgstr ""
+msgstr "Retourné"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
-msgstr ""
+msgstr "RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__rma_count
 msgid "Rma Count"
-msgstr ""
+msgstr "Nombre de RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__rma_location_ids
 msgid "Rma Location"
-msgstr ""
+msgstr "Emplacement RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Date planifiée"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_token
 msgid "Security Token"
-msgstr ""
+msgstr "Jeton de sécurité"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__send_rma_confirmation
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_confirmation
 msgid "Send RMA Confirmation"
-msgstr ""
+msgstr "Envoyer confirmation RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__send_rma_receipt_confirmation
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_receipt_confirmation
 msgid "Send RMA Receipt Confirmation"
-msgstr ""
+msgstr "Envoyer confirmation de réception RMA"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_res_company__send_rma_draft_confirmation
 #: model:ir.model.fields,field_description:rma.field_res_config_settings__send_rma_draft_confirmation
 msgid "Send RMA draft Confirmation"
-msgstr ""
+msgstr "Envoyer confirmation brouillon RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA info to customer"
-msgstr ""
+msgstr "Envoyer automatiquement les infos RMA au client"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic RMA products reception notification to customer"
 msgstr ""
+"Envoyer automatiquement les notifications de réceptions produits RMA au "
+"client"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Send automatic notification when the customer places an RMA"
 msgstr ""
+"Envoyer automatiquement une notification quand le client demande une RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Email"
-msgstr ""
+msgstr "Envoyer par Email"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Send by Mail"
-msgstr ""
+msgstr "Envoyer par courrier électronique"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__sent
 msgid "Sent"
-msgstr ""
+msgstr "Envoyé"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__sequence
 msgid "Sequence"
-msgstr ""
+msgstr "Séquence"
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA in"
-msgstr ""
+msgstr "Séquence entrée RMA"
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_warehouse.py:0
 #, python-format
 msgid "Sequence RMA out"
-msgstr ""
+msgstr "Séquence sortie RMA"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Set to draft"
-msgstr ""
+msgstr "Remettre en brouillon"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Share"
-msgstr ""
+msgstr "Partager"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__partner_shipping_id
 msgid "Shipping Address"
-msgstr ""
+msgstr "Adresse de livraison"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__partner_shipping_id
 msgid "Shipping address for current RMA."
-msgstr ""
+msgstr "Adresse de livraison pour la RMA actuelle."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__origin
 msgid "Source Document"
-msgstr ""
+msgstr "Document d'origine"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_split_wizard_view_form2
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Split"
-msgstr ""
+msgstr "Diviser"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_split_wizard_action
 msgid "Split RMA"
-msgstr ""
+msgstr "Diviser la RMA"
 
 #. module: rma
 #. odoo-python
@@ -1954,12 +1980,14 @@ msgid ""
 "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
 "a> has been created."
 msgstr ""
+"Division : <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\""
+">%(name)s</a> a été créé."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: rma
 #. odoo-python
@@ -1967,7 +1995,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:rma.portal_my_rmas
 #, python-format
 msgid "Status"
-msgstr ""
+msgstr "Statut"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_state
@@ -1977,57 +2005,61 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Statut basé sur les activités\n"
+"En retard: Data limite déjà dépassée\n"
+"Aujourd'hui: Date limite de l'activité aujourd'hui\n"
+"Planifié: Activités futures."
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Mouvement de stock"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_rule
 msgid "Stock Rule"
-msgstr ""
+msgstr "Règle de stock"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__name
 msgid "Tag Name"
-msgstr ""
+msgstr "Nom de l'étiquette"
 
 #. module: rma
 #: model:ir.model.constraint,message:rma.constraint_rma_tag_name_uniq
 msgid "Tag name already exists !"
-msgstr ""
+msgstr "Le nom de l'étiquette existe déjà !"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__tag_ids
 msgid "Tags"
-msgstr ""
+msgstr "Étiquettes"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Tags..."
-msgstr ""
+msgstr "Étiquettes..."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__user_id
 msgid "Team Leader"
-msgstr ""
+msgstr "Chef d'équipe"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Team Members"
-msgstr ""
+msgstr "Membres"
 
 #. module: rma
 #: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq
 msgid "That operation name already exists !"
-msgstr ""
+msgstr "Ce nom d'opération existe déjà !"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_tag__active
 msgid "The active field allows you to hide the category without removing it."
-msgstr ""
+msgstr "Le champ actif vous permet de cacher la catégorie sans l'enlever."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
@@ -2043,6 +2075,8 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
 msgstr ""
+"Le nom de l'alias d'email, e.g. 'travail' si vous voulez catch les emails de "
+"<travail@example.odoo.com>"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
@@ -2067,12 +2101,12 @@ msgstr ""
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "The quantity to return is greater than remaining quantity."
-msgstr ""
+msgstr "La quantité à retourner est supérieure à la quantité restante."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_tag__is_public
 msgid "The tag is visible in the portal view"
-msgstr ""
+msgstr "Le libellé est visible dans la vue portail"
 
 #. module: rma
 #. odoo-python
@@ -2082,38 +2116,40 @@ msgid ""
 "There is at least one invoice lines whose quantity is less than the quantity "
 "specified in its linked RMA."
 msgstr ""
+"Il y a au moins une ligne de facture dont la quantité est inférieure à la "
+"quantité spécifiée dans la RMA liée."
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot be split."
-msgstr ""
+msgstr "La RMA ne peut pas être divisée."
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a replacement."
-msgstr ""
+msgstr "Cette RMA ne peut pas réaliser de remplacement."
 
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/rma.py:0
 #, python-format
 msgid "This RMA cannot perform a return."
-msgstr ""
+msgstr "Cette RMA ne peut pas réaliser un retour."
 
 #. module: rma
 #: model:ir.actions.server,name:rma.rma_refund_action_server
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "To Refund"
-msgstr ""
+msgstr "À rembourser"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_picking
 msgid "Transfer"
-msgstr ""
+msgstr "Transfert"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__type
@@ -2123,38 +2159,38 @@ msgstr ""
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_return_picking__picking_type_code
 msgid "Type of Operation"
-msgstr ""
+msgstr "Type d'opération"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__activity_exception_decoration
 msgid "Type of the exception activity on record."
-msgstr ""
+msgstr "Type de l'activité d'exception enregistré."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unassigned RMAs"
-msgstr ""
+msgstr "RMA non assignées"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__product_uom
 #: model:ir.model.fields,field_description:rma.field_rma_split_wizard__product_uom
 msgid "Unit of measure"
-msgstr ""
+msgstr "Unité de mesure"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Unlock"
-msgstr ""
+msgstr "Déverrouiller"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "Unresolved RMAs"
-msgstr ""
+msgstr "RMA non résolues"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__product_uom
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__priority__1
@@ -2164,52 +2200,52 @@ msgstr ""
 #. module: rma
 #: model:ir.model,name:rma.model_res_users
 msgid "User"
-msgstr ""
+msgstr "Utilisateur"
 
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_all
 msgid "User: All Documents"
-msgstr ""
+msgstr "Utilisateur : tous les documents"
 
 #. module: rma
 #: model:res.groups,name:rma.rma_group_user_own
 msgid "User: Own Documents Only"
-msgstr ""
+msgstr "Utilisateur : mes documents seulement"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
-msgstr ""
+msgstr "En attente de remplacement"
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_return
 msgid "Waiting for return"
-msgstr ""
+msgstr "En attente de retour"
 
 #. module: rma
 #: model:ir.model,name:rma.model_stock_warehouse
 #: model:ir.model.fields,field_description:rma.field_rma__warehouse_id
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__warehouse_id
 msgid "Warehouse"
-msgstr ""
+msgstr "Entrepôt"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__website_message_ids
 #: model:ir.model.fields,field_description:rma.field_rma_team__website_message_ids
 msgid "Website Messages"
-msgstr ""
+msgstr "Messages du site web"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma__website_message_ids
 #: model:ir.model.fields,help:rma.field_rma_team__website_message_ids
 msgid "Website communication history"
-msgstr ""
+msgstr "Historique de communication du site web"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_draft_confirmation
 #: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_draft_confirmation
 msgid "When a customer places an RMA, send a notification with it"
-msgstr ""
+msgstr "Quand un utilisateur effectue une RMA, envoyer une notification"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -2217,11 +2253,13 @@ msgid ""
 "When customers themselves place an RMA from the portal, send an automatic "
 "notification acknowleging it."
 msgstr ""
+"Quand un utilisateur effectue une demande RMA depuis le portail, envoyer "
+"automatiquement une notification d'accusé de réception."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
-msgstr ""
+msgstr "Quand la RMA est confirmée, envoyer un email d'information automatique."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -2229,12 +2267,17 @@ msgid ""
 "When the RMA is receive, allow to finsish it manually choosing\n"
 "                            a finalization reason."
 msgstr ""
+"Quand une RMA est reçue, permet de la terminer manuellement en "
+"sélectionnant\n"
+"                             comme motif de clôture."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
 "When the RMA products are received, send an automatic information email."
 msgstr ""
+"Quand les produits RMA sont reçus, envoyer un email d'information "
+"automatique."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_receipt_confirmation
@@ -2242,6 +2285,8 @@ msgstr ""
 msgid ""
 "When the RMA receipt is confirmed, send a confirmation email to the customer."
 msgstr ""
+"Quand la réception RMA est confirmée, envoyer un email de confirmation au "
+"client."
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__send_rma_confirmation
@@ -2249,6 +2294,7 @@ msgstr ""
 msgid ""
 "When the delivery is confirmed, send a confirmation email to the customer."
 msgstr ""
+"Quand la livraison est confirmée, envoyer un email de confirmation au client."
 
 #. module: rma
 #. odoo-python
@@ -2256,6 +2302,7 @@ msgstr ""
 #, python-format
 msgid "You cannot delete RMAs that are not in draft state"
 msgstr ""
+"Vous ne pouvez pas supprimer les RMA qui ne sont pas au statut brouillon"
 
 #. module: rma
 #. odoo-python
@@ -2265,17 +2312,20 @@ msgid ""
 "You must specify the 'Customer' in the 'Stock Picking' from which RMAs will "
 "be created"
 msgstr ""
+"Vous devez préciser le 'Client' dans le 'Transfer' duquel le RMA sera créé"
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_all
 msgid ""
 "the user will have access to all records of everyone in the RMA application."
 msgstr ""
+"l'utilisateur aura accès à l'ensemble des enregistrements de l'application "
+"RMA."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_user_own
 msgid "the user will have access to his own data in the RMA application."
-msgstr ""
+msgstr "l'utilisateur aura accès à ses propres données dans l'application RMA."
 
 #. module: rma
 #: model:res.groups,comment:rma.rma_group_manager
@@ -2283,6 +2333,7 @@ msgid ""
 "the user will have an access to the RMA configuration as well as statistic "
 "reports."
 msgstr ""
+"l'utilisateur aura accès à la configuration RMA et aux rapports statistiques."
 
 #. module: rma
 #: model:mail.template,report_name:rma.mail_template_rma_draft_notification
@@ -2302,6 +2353,7 @@ 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' }}) produits reçus"
 
 #. module: rma
 #: model:mail.template,subject:rma.mail_template_rma_draft_notification
@@ -2309,3 +2361,5 @@ msgid ""
 "{{object.company_id.name}} Your RMA has been succesfully created (Ref "
 "{{object.name or 'n/a' }})"
 msgstr ""
+"{{object.company_id.name}} Votre RMA a été crée avec succès(Ref {{"
+"object.name or 'n/a' }})"

From 1e98d638aaccef06d40fc36954ecf34852e8c704 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Mon, 22 Jan 2024 10:34:04 +0000
Subject: [PATCH 083/108] Translated using Weblate (Italian)

Currently translated at 100.0% (352 of 352 strings)

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/it/
---
 rma/i18n/it.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 1df3841f9..898df8dd2 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2023-12-27 16:36+0000\n"
+"PO-Revision-Date: 2024-01-25 16:37+0000\n"
 "Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -1085,7 +1085,7 @@ msgstr "Indirizzo di fatturazione e spedizione:"
 #: model:ir.model.fields,field_description:rma.field_rma__message_is_follower
 #: model:ir.model.fields,field_description:rma.field_rma_team__message_is_follower
 msgid "Is Follower"
-msgstr "Sta seguendo"
+msgstr "Segue"
 
 #. module: rma
 #: model:ir.model,name:rma.model_account_move
@@ -1865,7 +1865,7 @@ msgstr "Ubicazione RMA"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
-msgstr "Data programmata"
+msgstr "Data schedulata"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__access_token

From 983782ea571dedd6e035fff1da1b907c475cc457 Mon Sep 17 00:00:00 2001
From: David <david.vidal@tecnativa.com>
Date: Tue, 30 Jan 2024 10:43:23 +0100
Subject: [PATCH 084/108] [FIX] rma: unresolved and late filters

Included finished state to discard those manually finished RMAs

TT47471
---
 rma/views/rma_views.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 256484baa..8ad666162 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -30,13 +30,13 @@
                 <filter
                     string="Unresolved RMAs"
                     name="undone_rma"
-                    domain="[('state', 'not in', ['refunded', 'returned', 'replaced', 'locked', 'cancelled'])]"
+                    domain="[('state', 'not in', ['refunded', 'returned', 'replaced', 'locked', 'cancelled', 'finished'])]"
                     help="RMAs yet to be fully processed"
                 />
                 <filter
                     string="Late RMAs"
                     name="late_rma"
-                    domain="[('deadline', '&lt;', context_today().strftime('%Y-%m-%d')), ('state', 'not in', ['refunded', 'returned', 'replaced', 'locked', 'cancelled'])]"
+                    domain="[('deadline', '&lt;', context_today().strftime('%Y-%m-%d')), ('state', 'not in', ['refunded', 'returned', 'replaced', 'locked', 'cancelled', 'finished'])]"
                     help="RMAs which deadline has passed"
                 />
                 <separator />

From b7bbad568379a419ff1b36c719761a2868cd0a3a Mon Sep 17 00:00:00 2001
From: David <david.vidal@tecnativa.com>
Date: Tue, 30 Jan 2024 13:34:28 +0100
Subject: [PATCH 085/108] [IMP] rma: mantainers

[BOT] post-merge updates
---
 rma/README.rst                    | 9 ++++++---
 rma/__manifest__.py               | 4 ++--
 rma/static/description/index.html | 7 +++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index 2d8604c8c..217afd8a4 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -7,7 +7,7 @@ Return Merchandise Authorization Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:6a3edc8e17cad866190342b8f2626811cdbe979b8cfe919160d2e314f519b080
+   !! source digest: sha256:4883b701d44a55d02e769bdbf411c649efc42341792b63e965630e712a6406d9
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -182,10 +182,13 @@ promote its widespread use.
 .. |maintainer-pedrobaeza| image:: https://github.com/pedrobaeza.png?size=40px
     :target: https://github.com/pedrobaeza
     :alt: pedrobaeza
+.. |maintainer-chienandalu| image:: https://github.com/chienandalu.png?size=40px
+    :target: https://github.com/chienandalu
+    :alt: chienandalu
 
-Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
-|maintainer-pedrobaeza| 
+|maintainer-pedrobaeza| |maintainer-chienandalu| 
 
 This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/16.0/rma>`_ project on GitHub.
 
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index b66eb52be..cd86ac43b 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -5,12 +5,12 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "16.0.1.1.0",
+    "version": "16.0.1.2.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
     "author": "Tecnativa, Odoo Community Association (OCA)",
-    "maintainers": ["pedrobaeza"],
+    "maintainers": ["pedrobaeza", "chienandalu"],
     "license": "AGPL-3",
     "depends": ["stock_account"],
     "data": [
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index cdc9b1405..cef1e1aa1 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -1,4 +1,3 @@
-<?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>
@@ -367,7 +366,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:6a3edc8e17cad866190342b8f2626811cdbe979b8cfe919160d2e314f519b080
+!! source digest: sha256:4883b701d44a55d02e769bdbf411c649efc42341792b63e965630e712a6406d9
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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>.
@@ -528,8 +527,8 @@ <h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
 <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 image-reference" href="https://github.com/pedrobaeza"><img alt="pedrobaeza" src="https://github.com/pedrobaeza.png?size=40px" /></a></p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</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> <a class="reference external image-reference" href="https://github.com/chienandalu"><img alt="chienandalu" src="https://github.com/chienandalu.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>

From 5e49679e30a20892fdb2cce5bef04ee100564bc5 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Fri, 1 Mar 2024 08:17:30 +0000
Subject: [PATCH 086/108] Translated using Weblate (Italian)

Currently translated at 100.0% (352 of 352 strings)

Translation: rma-16.0/rma-16.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma/it/
---
 rma/i18n/it.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 898df8dd2..3a3ffd23a 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-01-25 16:37+0000\n"
+"PO-Revision-Date: 2024-04-03 12:43+0000\n"
 "Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -1233,7 +1233,7 @@ msgstr "Riepilogo prossima attività"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__activity_type_id
 msgid "Next Activity Type"
-msgstr "Tipologia prossima attività"
+msgstr "Tipo prossima attività"
 
 #. module: rma
 #. odoo-python
@@ -2053,7 +2053,7 @@ msgstr "Team leader"
 #: model:ir.model.fields,field_description:rma.field_rma_team__member_ids
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Team Members"
-msgstr "Membri del Team"
+msgstr "Membri del team"
 
 #. module: rma
 #: model:ir.model.constraint,message:rma.constraint_rma_operation_name_uniq

From 3e40788c5507b663a93e39709085f61e599d4fd7 Mon Sep 17 00:00:00 2001
From: Antoni Marroig Campomar <amarroig@apsl.net>
Date: Fri, 3 May 2024 13:12:08 +0200
Subject: [PATCH 087/108] [IMP] rma: pre-commit auto fixes

---
 rma/README.rst                                | 160 +++++++++---------
 rma/controllers/main.py                       |   3 +-
 rma/models/rma.py                             |   8 +-
 rma/pyproject.toml                            |   3 +
 rma/readme/CONFIGURE.md                       |  22 +++
 rma/readme/CONFIGURE.rst                      |  21 ---
 rma/readme/CONTRIBUTORS.md                    |   7 +
 rma/readme/CONTRIBUTORS.rst                   |   9 -
 .../{DESCRIPTION.rst => DESCRIPTION.md}       |   8 +-
 rma/readme/ROADMAP.md                         |   3 +
 rma/readme/ROADMAP.rst                        |   3 -
 rma/readme/USAGE.md                           |  59 +++++++
 rma/readme/USAGE.rst                          |  57 -------
 rma/static/description/index.html             |  95 ++++++-----
 14 files changed, 238 insertions(+), 220 deletions(-)
 create mode 100644 rma/pyproject.toml
 create mode 100644 rma/readme/CONFIGURE.md
 delete mode 100644 rma/readme/CONFIGURE.rst
 create mode 100644 rma/readme/CONTRIBUTORS.md
 delete mode 100644 rma/readme/CONTRIBUTORS.rst
 rename rma/readme/{DESCRIPTION.rst => DESCRIPTION.md} (52%)
 create mode 100644 rma/readme/ROADMAP.md
 delete mode 100644 rma/readme/ROADMAP.rst
 create mode 100644 rma/readme/USAGE.md
 delete mode 100644 rma/readme/USAGE.rst

diff --git a/rma/README.rst b/rma/README.rst
index 217afd8a4..2b56f5158 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -17,25 +17,25 @@ 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/16.0/rma
+    :target: https://github.com/OCA/rma/tree/17.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-16-0/rma-16-0-rma
+    :target: https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma
     :alt: Translate me on Weblate
 .. |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
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/rma&target_branch=17.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
 
-This module allows you to manage `Return Merchandise Authorization (RMA)
-<https://en.wikipedia.org/wiki/Return_merchandise_authorization>`_.
+This module allows you to manage `Return Merchandise Authorization
+(RMA) <https://en.wikipedia.org/wiki/Return_merchandise_authorization>`__.
 RMA documents can be created from scratch, from a delivery order or from
 an incoming email. Product receptions and returning delivery operations
 of the RMA module are fully integrated with the Receipts and Deliveries
 Operations of Odoo inventory core module. It also allows you to generate
-refunds in the same way as Odoo generates it.
-Besides, you have full integration of the RMA documents in the customer portal.
+refunds in the same way as Odoo generates it. Besides, you have full
+integration of the RMA documents in the customer portal.
 
 **Table of contents**
 
@@ -47,23 +47,24 @@ Configuration
 
 If you want RMAs to be created from incoming emails, you need to:
 
-#. Go to *Settings > General Settings*.
-#. Check 'External Email Servers' checkbox under *Discuss* section.
-#. Set an 'alias domain' and an incoming server.
-#. Go to *RMA > Configuration > RMA Team* and select a team or create a new
-   one.
-#. Go to 'Email' tab and set an 'Email Alias'.
+1. Go to *Settings > General Settings*.
+2. Check 'External Email Servers' checkbox under *Discuss* section.
+3. Set an 'alias domain' and an incoming server.
+4. Go to *RMA > Configuration > RMA Team* and select a team or create a
+   new one.
+5. Go to 'Email' tab and set an 'Email Alias'.
 
 If you want to manually finish RMAs, you need to:
 
-#. Go to *Settings > Inventory*.
-#. Set *Finish RMAs manually* checkbox on.
+1. Go to *Settings > Inventory*.
+2. Set *Finish RMAs manually* checkbox on.
 
-By default, returns to customer are grouped by shipping address, warehouse and company.
-If you want to avoid this grouping you can:
+By default, returns to customer are grouped by shipping address,
+warehouse and company. If you want to avoid this grouping you can:
 
-#. Go to *Settings > Inventory*.
-#. Set *Group RMA returns by customer address and warehouse* checkbox off.
+1. Go to *Settings > Inventory*.
+2. Set *Group RMA returns by customer address and warehouse* checkbox
+   off.
 
 The users will still be able to group those pickings from the wizard.
 
@@ -72,68 +73,73 @@ Usage
 
 To use this module, you need to:
 
-#. Go to *RMA > Orders* and create a new RMA.
-#. Select a partner, an invoice address, select a product
-   (or select a picking and a move instead), write a quantity, fill the rest
-   of the form and click on 'confirm' button in the status bar.
-#. You will see an smart button labeled 'Receipt'. Click on that button to see
-   the reception operation form.
-#. If everything is right, validate the operation and go back to the RMA to
-   see it in a 'received' state.
-#. Now you are able to generate a refund, generate a delivery order to return
-   to the customer the same product or another product as a replacement, split
-   the RMA by extracting a part of the remaining quantity to another RMA,
-   preview the RMA in the website. All of these operations can be done by
-   clicking on the buttons in the status bar.
-
-   * If you click on 'Refund' button, a refund will be created, and it will be
-     accessible via the smart button labeled Refund. The RMA will be set
-     automatically to 'Refunded' state when the refund is validated.
-   * If you click on 'Replace' or 'Return to customer' button instead,
-     a popup wizard will guide you to create a Delivery order to the client
-     and this order will be accessible via the smart button labeled Delivery.
-     The RMA will be set automatically to 'Replaced' or 'Returned' state when
-     the RMA quantity is equal or lower than the quantity in done delivery
-     orders linked to it.
-#. You can also finish the RMA without further ado. To do so click on the *Finish*
-   button. A wizard will ask you for the reason from a selection of preconfigured ones.
-   Be sure to configure them in advance on *RMA > Configuration > Finalization Reasons*.
-   Once the RMA is finished, it will be set to that state and the reason will be
+1. Go to *RMA > Orders* and create a new RMA.
+2. Select a partner, an invoice address, select a product (or select a
+   picking and a move instead), write a quantity, fill the rest of the
+   form and click on 'confirm' button in the status bar.
+3. You will see an smart button labeled 'Receipt'. Click on that button
+   to see the reception operation form.
+4. If everything is right, validate the operation and go back to the RMA
+   to see it in a 'received' state.
+5. Now you are able to generate a refund, generate a delivery order to
+   return to the customer the same product or another product as a
+   replacement, split the RMA by extracting a part of the remaining
+   quantity to another RMA, preview the RMA in the website. All of these
+   operations can be done by clicking on the buttons in the status bar.
+
+   -  If you click on 'Refund' button, a refund will be created, and it
+      will be accessible via the smart button labeled Refund. The RMA
+      will be set automatically to 'Refunded' state when the refund is
+      validated.
+   -  If you click on 'Replace' or 'Return to customer' button instead,
+      a popup wizard will guide you to create a Delivery order to the
+      client and this order will be accessible via the smart button
+      labeled Delivery. The RMA will be set automatically to 'Replaced'
+      or 'Returned' state when the RMA quantity is equal or lower than
+      the quantity in done delivery orders linked to it.
+
+6. You can also finish the RMA without further ado. To do so click on
+   the *Finish* button. A wizard will ask you for the reason from a
+   selection of preconfigured ones. Be sure to configure them in advance
+   on *RMA > Configuration > Finalization Reasons*. Once the RMA is
+   finished, it will be set to that state and the reason will be
    registered.
 
 An RMA can also be created from a return of a delivery order:
 
-#. Select a delivery order and click on 'Return' button to create a return.
-#. Check "Create RMAs" checkbox in the returning wizard, select the RMA
+1. Select a delivery order and click on 'Return' button to create a
+   return.
+2. Check "Create RMAs" checkbox in the returning wizard, select the RMA
    stock location and click on 'Return' button.
-#. An RMA will be created for each product returned in the previous step.
-   Every RMA will be in confirmed state and they will
-   be linked to the returning operation generated previously.
+3. An RMA will be created for each product returned in the previous
+   step. Every RMA will be in confirmed state and they will be linked to
+   the returning operation generated previously.
 
 There are Optional RMA Teams that can be used for:
 
-  - Organize RMAs in sections.
-  - Subscribe users to notifications.
-  - Create RMAs from incoming mail to special aliases (See configuration
-    section).
+   -  Organize RMAs in sections.
+   -  Subscribe users to notifications.
+   -  Create RMAs from incoming mail to special aliases (See
+      configuration section).
 
 To create an RMA Team (RMA Responsible user level required):
 
-  #. Go to *RMA > Configuration > RMA Teams*
-  #. Create a new team and assign a name, a responsible and members.
-  #. Subscribe users to notifications, that can be of these subtypes:
+   1. Go to *RMA > Configuration > RMA Teams*
+   2. Create a new team and assign a name, a responsible and members.
+   3. Subscribe users to notifications, that can be of these subtypes:
 
-     - RMA draft. When a new RMA is created.
-     - Notes, Debates, Activities. As in standard Odoo.
-  #. In the list view, use the cross handle to sort RMA Teams. The top team
-     will be the default one if no team is set.
+      -  RMA draft. When a new RMA is created.
+      -  Notes, Debates, Activities. As in standard Odoo.
+
+   4. In the list view, use the cross handle to sort RMA Teams. The top
+      team will be the default one if no team is set.
 
 Known issues / Roadmap
 ======================
 
-* 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
-  the product of that move is.
+-  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 the product of that move is.
 
 Bug Tracker
 ===========
@@ -141,7 +147,7 @@ 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 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**>`_.
+`feedback <https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2017.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.
 
@@ -149,25 +155,25 @@ Credits
 =======
 
 Authors
-~~~~~~~
+-------
 
 * Tecnativa
 
 Contributors
-~~~~~~~~~~~~
+------------
 
-* `Tecnativa <https://www.tecnativa.com>`_:
+-  `Tecnativa <https://www.tecnativa.com>`__:
 
-  * Ernesto Tejeda
-  * Pedro M. Baeza
-  * David Vidal
-  * Víctor Martínez
+   -  Ernesto Tejeda
+   -  Pedro M. Baeza
+   -  David Vidal
+   -  Víctor Martínez
 
-* Chafique Delli <chafique.delli@akretion.com>
-* Giovanni Serra - Ooops <giovanni@ooops404.com>
+-  Chafique Delli <chafique.delli@akretion.com>
+-  Giovanni Serra - Ooops <giovanni@ooops404.com>
 
 Maintainers
-~~~~~~~~~~~
+-----------
 
 This module is maintained by the OCA.
 
@@ -190,6 +196,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-pedrobaeza| |maintainer-chienandalu| 
 
-This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/16.0/rma>`_ project on GitHub.
+This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/17.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/controllers/main.py b/rma/controllers/main.py
index e87bd82ec..7549882fa 100644
--- a/rma/controllers/main.py
+++ b/rma/controllers/main.py
@@ -7,7 +7,8 @@
 from odoo.http import request
 from odoo.tools import consteq
 
-from odoo.addons.portal.controllers.portal import CustomerPortal, pager as portal_pager
+from odoo.addons.portal.controllers.portal import CustomerPortal
+from odoo.addons.portal.controllers.portal import pager as portal_pager
 
 
 class PortalRma(CustomerPortal):
diff --git a/rma/models/rma.py b/rma/models/rma.py
index f00a0724d..fb6b43dd3 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -555,7 +555,7 @@ def _compute_location_id(self):
 
     def _compute_access_url(self):
         for record in self:
-            record.access_url = "/my/rmas/{}".format(record.id)
+            record.access_url = f"/my/rmas/{record.id}"
 
     # Constrains methods (@api.constrains)
     @api.constrains(
@@ -1017,7 +1017,7 @@ def _create_receptions_from_picking(self):
         ).create_returns()
         picking_id = picking_action["res_id"]
         picking = self.env["stock.picking"].browse(picking_id)
-        picking.origin = "{} ({})".format(self.name, picking.origin)
+        picking.origin = f"{self.name} ({picking.origin})"
         move = picking.move_ids
         move.priority = self.priority
         return move
@@ -1052,7 +1052,9 @@ def _prepare_picking_vals(self):
                         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_id": (
+                            self.partner_shipping_id.property_stock_customer.id
+                        ),
                         "location_dest_id": self.location_id.id,
                         "product_uom_qty": self.product_uom_qty,
                     },
diff --git a/rma/pyproject.toml b/rma/pyproject.toml
new file mode 100644
index 000000000..4231d0ccc
--- /dev/null
+++ b/rma/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/rma/readme/CONFIGURE.md b/rma/readme/CONFIGURE.md
new file mode 100644
index 000000000..3892e4677
--- /dev/null
+++ b/rma/readme/CONFIGURE.md
@@ -0,0 +1,22 @@
+If you want RMAs to be created from incoming emails, you need to:
+
+1.  Go to *Settings \> General Settings*.
+2.  Check 'External Email Servers' checkbox under *Discuss* section.
+3.  Set an 'alias domain' and an incoming server.
+4.  Go to *RMA \> Configuration \> RMA Team* and select a team or create
+    a new one.
+5.  Go to 'Email' tab and set an 'Email Alias'.
+
+If you want to manually finish RMAs, you need to:
+
+1.  Go to *Settings \> Inventory*.
+2.  Set *Finish RMAs manually* checkbox on.
+
+By default, returns to customer are grouped by shipping address,
+warehouse and company. If you want to avoid this grouping you can:
+
+1.  Go to *Settings \> Inventory*.
+2.  Set *Group RMA returns by customer address and warehouse* checkbox
+    off.
+
+The users will still be able to group those pickings from the wizard.
diff --git a/rma/readme/CONFIGURE.rst b/rma/readme/CONFIGURE.rst
deleted file mode 100644
index 288531b1b..000000000
--- a/rma/readme/CONFIGURE.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-If you want RMAs to be created from incoming emails, you need to:
-
-#. Go to *Settings > General Settings*.
-#. Check 'External Email Servers' checkbox under *Discuss* section.
-#. Set an 'alias domain' and an incoming server.
-#. Go to *RMA > Configuration > RMA Team* and select a team or create a new
-   one.
-#. Go to 'Email' tab and set an 'Email Alias'.
-
-If you want to manually finish RMAs, you need to:
-
-#. Go to *Settings > Inventory*.
-#. Set *Finish RMAs manually* checkbox on.
-
-By default, returns to customer are grouped by shipping address, warehouse and company.
-If you want to avoid this grouping you can:
-
-#. Go to *Settings > Inventory*.
-#. Set *Group RMA returns by customer address and warehouse* checkbox off.
-
-The users will still be able to group those pickings from the wizard.
diff --git a/rma/readme/CONTRIBUTORS.md b/rma/readme/CONTRIBUTORS.md
new file mode 100644
index 000000000..85856a266
--- /dev/null
+++ b/rma/readme/CONTRIBUTORS.md
@@ -0,0 +1,7 @@
+- [Tecnativa](https://www.tecnativa.com):
+  - Ernesto Tejeda
+  - Pedro M. Baeza
+  - David Vidal
+  - Víctor Martínez
+- Chafique Delli \<<chafique.delli@akretion.com>\>
+- Giovanni Serra - Ooops \<<giovanni@ooops404.com>\>
diff --git a/rma/readme/CONTRIBUTORS.rst b/rma/readme/CONTRIBUTORS.rst
deleted file mode 100644
index 75646b6d3..000000000
--- a/rma/readme/CONTRIBUTORS.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-* `Tecnativa <https://www.tecnativa.com>`_:
-
-  * Ernesto Tejeda
-  * Pedro M. Baeza
-  * David Vidal
-  * Víctor Martínez
-
-* Chafique Delli <chafique.delli@akretion.com>
-* Giovanni Serra - Ooops <giovanni@ooops404.com>
diff --git a/rma/readme/DESCRIPTION.rst b/rma/readme/DESCRIPTION.md
similarity index 52%
rename from rma/readme/DESCRIPTION.rst
rename to rma/readme/DESCRIPTION.md
index 0c0c6fd82..5dbefa060 100644
--- a/rma/readme/DESCRIPTION.rst
+++ b/rma/readme/DESCRIPTION.md
@@ -1,8 +1,8 @@
-This module allows you to manage `Return Merchandise Authorization (RMA)
-<https://en.wikipedia.org/wiki/Return_merchandise_authorization>`_.
+This module allows you to manage [Return Merchandise Authorization
+(RMA)](https://en.wikipedia.org/wiki/Return_merchandise_authorization).
 RMA documents can be created from scratch, from a delivery order or from
 an incoming email. Product receptions and returning delivery operations
 of the RMA module are fully integrated with the Receipts and Deliveries
 Operations of Odoo inventory core module. It also allows you to generate
-refunds in the same way as Odoo generates it.
-Besides, you have full integration of the RMA documents in the customer portal.
+refunds in the same way as Odoo generates it. Besides, you have full
+integration of the RMA documents in the customer portal.
diff --git a/rma/readme/ROADMAP.md b/rma/readme/ROADMAP.md
new file mode 100644
index 000000000..198642962
--- /dev/null
+++ b/rma/readme/ROADMAP.md
@@ -0,0 +1,3 @@
+- 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 the product of that move is.
diff --git a/rma/readme/ROADMAP.rst b/rma/readme/ROADMAP.rst
deleted file mode 100644
index c6cb60298..000000000
--- a/rma/readme/ROADMAP.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-* 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
-  the product of that move is.
diff --git a/rma/readme/USAGE.md b/rma/readme/USAGE.md
new file mode 100644
index 000000000..44e6093ee
--- /dev/null
+++ b/rma/readme/USAGE.md
@@ -0,0 +1,59 @@
+To use this module, you need to:
+
+1.  Go to *RMA \> Orders* and create a new RMA.
+2.  Select a partner, an invoice address, select a product (or select a
+    picking and a move instead), write a quantity, fill the rest of the
+    form and click on 'confirm' button in the status bar.
+3.  You will see an smart button labeled 'Receipt'. Click on that button
+    to see the reception operation form.
+4.  If everything is right, validate the operation and go back to the
+    RMA to see it in a 'received' state.
+5.  Now you are able to generate a refund, generate a delivery order to
+    return to the customer the same product or another product as a
+    replacement, split the RMA by extracting a part of the remaining
+    quantity to another RMA, preview the RMA in the website. All of
+    these operations can be done by clicking on the buttons in the
+    status bar.
+    - If you click on 'Refund' button, a refund will be created, and it
+      will be accessible via the smart button labeled Refund. The RMA
+      will be set automatically to 'Refunded' state when the refund is
+      validated.
+    - If you click on 'Replace' or 'Return to customer' button instead,
+      a popup wizard will guide you to create a Delivery order to the
+      client and this order will be accessible via the smart button
+      labeled Delivery. The RMA will be set automatically to 'Replaced'
+      or 'Returned' state when the RMA quantity is equal or lower than
+      the quantity in done delivery orders linked to it.
+6.  You can also finish the RMA without further ado. To do so click on
+    the *Finish* button. A wizard will ask you for the reason from a
+    selection of preconfigured ones. Be sure to configure them in
+    advance on *RMA \> Configuration \> Finalization Reasons*. Once the
+    RMA is finished, it will be set to that state and the reason will be
+    registered.
+
+An RMA can also be created from a return of a delivery order:
+
+1.  Select a delivery order and click on 'Return' button to create a
+    return.
+2.  Check "Create RMAs" checkbox in the returning wizard, select the RMA
+    stock location and click on 'Return' button.
+3.  An RMA will be created for each product returned in the previous
+    step. Every RMA will be in confirmed state and they will be linked
+    to the returning operation generated previously.
+
+There are Optional RMA Teams that can be used for:
+
+> - Organize RMAs in sections.
+> - Subscribe users to notifications.
+> - Create RMAs from incoming mail to special aliases (See configuration
+>   section).
+
+To create an RMA Team (RMA Responsible user level required):
+
+> 1.  Go to *RMA \> Configuration \> RMA Teams*
+> 2.  Create a new team and assign a name, a responsible and members.
+> 3.  Subscribe users to notifications, that can be of these subtypes:
+>     - RMA draft. When a new RMA is created.
+>     - Notes, Debates, Activities. As in standard Odoo.
+> 4.  In the list view, use the cross handle to sort RMA Teams. The top
+>     team will be the default one if no team is set.
diff --git a/rma/readme/USAGE.rst b/rma/readme/USAGE.rst
deleted file mode 100644
index 1381ebc45..000000000
--- a/rma/readme/USAGE.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-To use this module, you need to:
-
-#. Go to *RMA > Orders* and create a new RMA.
-#. Select a partner, an invoice address, select a product
-   (or select a picking and a move instead), write a quantity, fill the rest
-   of the form and click on 'confirm' button in the status bar.
-#. You will see an smart button labeled 'Receipt'. Click on that button to see
-   the reception operation form.
-#. If everything is right, validate the operation and go back to the RMA to
-   see it in a 'received' state.
-#. Now you are able to generate a refund, generate a delivery order to return
-   to the customer the same product or another product as a replacement, split
-   the RMA by extracting a part of the remaining quantity to another RMA,
-   preview the RMA in the website. All of these operations can be done by
-   clicking on the buttons in the status bar.
-
-   * If you click on 'Refund' button, a refund will be created, and it will be
-     accessible via the smart button labeled Refund. The RMA will be set
-     automatically to 'Refunded' state when the refund is validated.
-   * If you click on 'Replace' or 'Return to customer' button instead,
-     a popup wizard will guide you to create a Delivery order to the client
-     and this order will be accessible via the smart button labeled Delivery.
-     The RMA will be set automatically to 'Replaced' or 'Returned' state when
-     the RMA quantity is equal or lower than the quantity in done delivery
-     orders linked to it.
-#. You can also finish the RMA without further ado. To do so click on the *Finish*
-   button. A wizard will ask you for the reason from a selection of preconfigured ones.
-   Be sure to configure them in advance on *RMA > Configuration > Finalization Reasons*.
-   Once the RMA is finished, it will be set to that state and the reason will be
-   registered.
-
-An RMA can also be created from a return of a delivery order:
-
-#. Select a delivery order and click on 'Return' button to create a return.
-#. Check "Create RMAs" checkbox in the returning wizard, select the RMA
-   stock location and click on 'Return' button.
-#. An RMA will be created for each product returned in the previous step.
-   Every RMA will be in confirmed state and they will
-   be linked to the returning operation generated previously.
-
-There are Optional RMA Teams that can be used for:
-
-  - Organize RMAs in sections.
-  - Subscribe users to notifications.
-  - Create RMAs from incoming mail to special aliases (See configuration
-    section).
-
-To create an RMA Team (RMA Responsible user level required):
-
-  #. Go to *RMA > Configuration > RMA Teams*
-  #. Create a new team and assign a name, a responsible and members.
-  #. Subscribe users to notifications, that can be of these subtypes:
-
-     - RMA draft. When a new RMA is created.
-     - Notes, Debates, Activities. As in standard Odoo.
-  #. In the list view, use the cross handle to sort RMA Teams. The top team
-     will be the default one if no team is set.
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index cef1e1aa1..e5794af3c 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -368,14 +368,15 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:4883b701d44a55d02e769bdbf411c649efc42341792b63e965630e712a6406d9
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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>.
+<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/17.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module allows you to manage <a class="reference external" href="https://en.wikipedia.org/wiki/Return_merchandise_authorization">Return Merchandise Authorization
+(RMA)</a>.
 RMA documents can be created from scratch, from a delivery order or from
 an incoming email. Product receptions and returning delivery operations
 of the RMA module are fully integrated with the Receipts and Deliveries
 Operations of Odoo inventory core module. It also allows you to generate
-refunds in the same way as Odoo generates it.
-Besides, you have full integration of the RMA documents in the customer portal.</p>
+refunds in the same way as Odoo generates it. Besides, you have full
+integration of the RMA documents in the customer portal.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
@@ -398,8 +399,8 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 <li>Go to <em>Settings &gt; General Settings</em>.</li>
 <li>Check ‘External Email Servers’ checkbox under <em>Discuss</em> section.</li>
 <li>Set an ‘alias domain’ and an incoming server.</li>
-<li>Go to <em>RMA &gt; Configuration &gt; RMA Team</em> and select a team or create a new
-one.</li>
+<li>Go to <em>RMA &gt; Configuration &gt; RMA Team</em> and select a team or create a
+new one.</li>
 <li>Go to ‘Email’ tab and set an ‘Email Alias’.</li>
 </ol>
 <p>If you want to manually finish RMAs, you need to:</p>
@@ -407,11 +408,12 @@ <h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
 <li>Go to <em>Settings &gt; Inventory</em>.</li>
 <li>Set <em>Finish RMAs manually</em> checkbox on.</li>
 </ol>
-<p>By default, returns to customer are grouped by shipping address, warehouse and company.
-If you want to avoid this grouping you can:</p>
+<p>By default, returns to customer are grouped by shipping address,
+warehouse and company. If you want to avoid this grouping you can:</p>
 <ol class="arabic simple">
 <li>Go to <em>Settings &gt; Inventory</em>.</li>
-<li>Set <em>Group RMA returns by customer address and warehouse</em> checkbox off.</li>
+<li>Set <em>Group RMA returns by customer address and warehouse</em> checkbox
+off.</li>
 </ol>
 <p>The users will still be able to group those pickings from the wizard.</p>
 </div>
@@ -420,51 +422,54 @@ <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>
-<li>Select a partner, an invoice address, select a product
-(or select a picking and a move instead), write a quantity, fill the rest
-of the form and click on ‘confirm’ button in the status bar.</li>
-<li>You will see an smart button labeled ‘Receipt’. Click on that button to see
-the reception operation form.</li>
-<li>If everything is right, validate the operation and go back to the RMA to
-see it in a ‘received’ state.</li>
-<li>Now you are able to generate a refund, generate a delivery order to return
-to the customer the same product or another product as a replacement, split
-the RMA by extracting a part of the remaining quantity to another RMA,
-preview the RMA in the website. All of these operations can be done by
-clicking on the buttons in the status bar.<ul>
-<li>If you click on ‘Refund’ button, a refund will be created, and it will be
-accessible via the smart button labeled Refund. The RMA will be set
-automatically to ‘Refunded’ state when the refund is validated.</li>
+<li>Select a partner, an invoice address, select a product (or select a
+picking and a move instead), write a quantity, fill the rest of the
+form and click on ‘confirm’ button in the status bar.</li>
+<li>You will see an smart button labeled ‘Receipt’. Click on that button
+to see the reception operation form.</li>
+<li>If everything is right, validate the operation and go back to the RMA
+to see it in a ‘received’ state.</li>
+<li>Now you are able to generate a refund, generate a delivery order to
+return to the customer the same product or another product as a
+replacement, split the RMA by extracting a part of the remaining
+quantity to another RMA, preview the RMA in the website. All of these
+operations can be done by clicking on the buttons in the status bar.<ul>
+<li>If you click on ‘Refund’ button, a refund will be created, and it
+will be accessible via the smart button labeled Refund. The RMA
+will be set automatically to ‘Refunded’ state when the refund is
+validated.</li>
 <li>If you click on ‘Replace’ or ‘Return to customer’ button instead,
-a popup wizard will guide you to create a Delivery order to the client
-and this order will be accessible via the smart button labeled Delivery.
-The RMA will be set automatically to ‘Replaced’ or ‘Returned’ state when
-the RMA quantity is equal or lower than the quantity in done delivery
-orders linked to it.</li>
+a popup wizard will guide you to create a Delivery order to the
+client and this order will be accessible via the smart button
+labeled Delivery. The RMA will be set automatically to ‘Replaced’
+or ‘Returned’ state when the RMA quantity is equal or lower than
+the quantity in done delivery orders linked to it.</li>
 </ul>
 </li>
-<li>You can also finish the RMA without further ado. To do so click on the <em>Finish</em>
-button. A wizard will ask you for the reason from a selection of preconfigured ones.
-Be sure to configure them in advance on <em>RMA &gt; Configuration &gt; Finalization Reasons</em>.
-Once the RMA is finished, it will be set to that state and the reason will be
+<li>You can also finish the RMA without further ado. To do so click on
+the <em>Finish</em> button. A wizard will ask you for the reason from a
+selection of preconfigured ones. Be sure to configure them in advance
+on <em>RMA &gt; Configuration &gt; Finalization Reasons</em>. Once the RMA is
+finished, it will be set to that state and the reason will be
 registered.</li>
 </ol>
 <p>An RMA can also be created from a return of a delivery order:</p>
 <ol class="arabic simple">
-<li>Select a delivery order and click on ‘Return’ button to create a return.</li>
+<li>Select a delivery order and click on ‘Return’ button to create a
+return.</li>
 <li>Check “Create RMAs” checkbox in the returning wizard, select the RMA
 stock location and click on ‘Return’ button.</li>
-<li>An RMA will be created for each product returned in the previous step.
-Every RMA will be in confirmed state and they will
-be linked to the returning operation generated previously.</li>
+<li>An RMA will be created for each product returned in the previous
+step. Every RMA will be in confirmed state and they will be linked to
+the returning operation generated previously.</li>
 </ol>
 <p>There are Optional RMA Teams that can be used for:</p>
 <blockquote>
 <ul class="simple">
 <li>Organize RMAs in sections.</li>
 <li>Subscribe users to notifications.</li>
-<li>Create RMAs from incoming mail to special aliases (See configuration
-section).</li>
+<li>Create RMAs from incoming mail to special aliases (See
+configuration section).</li>
 </ul>
 </blockquote>
 <p>To create an RMA Team (RMA Responsible user level required):</p>
@@ -477,8 +482,8 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 <li>Notes, Debates, Activities. As in standard Odoo.</li>
 </ul>
 </li>
-<li>In the list view, use the cross handle to sort RMA Teams. The top team
-will be the default one if no team is set.</li>
+<li>In the list view, use the cross handle to sort RMA Teams. The top
+team will be the default one if no team is set.</li>
 </ol>
 </blockquote>
 </div>
@@ -486,8 +491,8 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</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
-the product of that move is.</li>
+but perhaps stock.move _rec_name could be improved to better show
+what the product of that move is.</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
@@ -495,7 +500,7 @@ <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 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>
+<a class="reference external" href="https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2017.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">
@@ -529,7 +534,7 @@ <h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</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> <a class="reference external image-reference" href="https://github.com/chienandalu"><img alt="chienandalu" src="https://github.com/chienandalu.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>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/17.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>

From 217dd8fb2b5237f2cea2659778022f9e6b912255 Mon Sep 17 00:00:00 2001
From: Antoni Marroig Campomar <amarroig@apsl.net>
Date: Wed, 8 May 2024 17:05:54 +0200
Subject: [PATCH 088/108] [MIG] rma: Migration to 17.0

[UPD] Update rma.pot

[BOT] post-merge updates

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-17.0/rma-17.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma/
---
 rma/README.rst                            |   9 +-
 rma/__manifest__.py                       |   2 +-
 rma/data/mail_data.xml                    |   9 +-
 rma/hooks.py                              |   6 +-
 rma/i18n/de.po                            | 201 +++++++++---------
 rma/i18n/de_AT.po                         | 128 +++++-------
 rma/i18n/es.po                            | 201 +++++++++---------
 rma/i18n/fr.po                            | 195 +++++++++---------
 rma/i18n/it.po                            | 237 ++++++++++++----------
 rma/i18n/nl.po                            | 128 +++++-------
 rma/i18n/pt.po                            | 173 ++++++++--------
 rma/i18n/pt_BR.po                         | 161 +++++++--------
 rma/i18n/rma.pot                          | 130 +++++-------
 rma/i18n/ro.po                            | 151 ++++++--------
 rma/i18n/zh_CN.po                         | 128 +++++-------
 rma/models/rma.py                         | 155 +++++---------
 rma/models/stock_move.py                  |   2 +-
 rma/readme/CONTRIBUTORS.md                |   2 +
 rma/readme/USAGE.md                       |   2 +-
 rma/static/description/index.html         |  10 +-
 rma/tests/test_rma.py                     |  58 ++----
 rma/views/res_config_settings_views.xml   | 179 +++++-----------
 rma/views/res_partner_views.xml           |   2 +-
 rma/views/rma_finalization_views.xml      |   2 +-
 rma/views/rma_team_views.xml              |   8 +-
 rma/views/rma_views.xml                   | 110 ++++++----
 rma/views/stock_picking_views.xml         |   2 +-
 rma/wizard/rma_delivery_views.xml         |  27 +--
 rma/wizard/stock_picking_return_views.xml |   2 +-
 29 files changed, 1094 insertions(+), 1326 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index 2b56f5158..431881790 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -7,7 +7,7 @@ Return Merchandise Authorization Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:4883b701d44a55d02e769bdbf411c649efc42341792b63e965630e712a6406d9
+   !! source digest: sha256:9ca167b75e0dcd82a66217ef64dd006910f4feda1f408dbdf09ef43e6555eb22
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -87,8 +87,8 @@ To use this module, you need to:
    quantity to another RMA, preview the RMA in the website. All of these
    operations can be done by clicking on the buttons in the status bar.
 
-   -  If you click on 'Refund' button, a refund will be created, and it
-      will be accessible via the smart button labeled Refund. The RMA
+   -  If you click on 'To Refund' button, a refund will be created, and
+      it will be accessible via the smart button labeled Refund. The RMA
       will be set automatically to 'Refunded' state when the refund is
       validated.
    -  If you click on 'Replace' or 'Return to customer' button instead,
@@ -171,6 +171,9 @@ Contributors
 
 -  Chafique Delli <chafique.delli@akretion.com>
 -  Giovanni Serra - Ooops <giovanni@ooops404.com>
+-  `APSL-Nagarro <https://www.apsl.tech>`__:
+
+   -  Antoni Marroig <amarroig@apsl.net>
 
 Maintainers
 -----------
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index cd86ac43b..709d3ffdd 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "16.0.1.2.0",
+    "version": "17.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/data/mail_data.xml b/rma/data/mail_data.xml
index f1d8afa20..79d0d22f4 100644
--- a/rma/data/mail_data.xml
+++ b/rma/data/mail_data.xml
@@ -41,8 +41,7 @@
         <field
             name="subject"
         >{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }})</field>
-        <field name="report_template" ref="report_rma_action" />
-        <field name="report_name">{{(object.name or '')}}</field>
+        <field name="report_template_ids" eval="[(4, ref('rma.report_rma_action'))]" />
         <field name="lang">{{object.partner_id.lang}}</field>
         <field name="auto_delete" eval="True" />
         <field name="body_html" type="html">
@@ -78,8 +77,7 @@
         <field
             name="subject"
         >{{object.company_id.name}} RMA (Ref {{object.name or 'n/a' }}) products received</field>
-        <field name="report_template" ref="report_rma_action" />
-        <field name="report_name">{{(object.name or '')}}</field>
+        <field name="report_template_ids" eval="[(4, ref('rma.report_rma_action'))]" />
         <field name="lang">{{object.partner_id.lang}}</field>
         <field name="auto_delete" eval="True" />
         <field name="body_html" type="html">
@@ -114,8 +112,7 @@
         <field
             name="subject"
         >{{object.company_id.name}} Your RMA has been succesfully created (Ref {{object.name or 'n/a' }})</field>
-        <field name="report_template" ref="report_rma_action" />
-        <field name="report_name">{{(object.name or '')}}</field>
+        <field name="report_template_ids" eval="[(4, ref('rma.report_rma_action'))]" />
         <field name="lang">{{object.partner_id.lang}}</field>
         <field name="auto_delete" eval="True" />
         <field name="body_html" type="html">
diff --git a/rma/hooks.py b/rma/hooks.py
index 83b95586d..5b46f9aa8 100644
--- a/rma/hooks.py
+++ b/rma/hooks.py
@@ -1,12 +1,8 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import SUPERUSER_ID, api
-
-
-def post_init_hook(cr, registry):
-    env = api.Environment(cr, SUPERUSER_ID, {})
 
+def post_init_hook(env):
     def _get_next_picking_type_color():
         """Choose the next available color for the operation types."""
         stock_picking_type = env["stock.picking.type"]
diff --git a/rma/i18n/de.po b/rma/i18n/de.po
index 9b360b2fb..ee52923ed 100644
--- a/rma/i18n/de.po
+++ b/rma/i18n/de.po
@@ -277,15 +277,6 @@ msgstr ""
 "                                    nur teilweise verfügbar\n"
 "                                </span>"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Diese Werte sind "
-"unternehmensspezifisch.\" groups=\"base.group_multi_company\"/>"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -472,15 +463,35 @@ msgstr "Alias"
 msgid "Alias Contact Security"
 msgstr "Alias Kontaktsicherheit"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr "Alias Name"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
-msgstr "Alias domain"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
@@ -738,11 +749,6 @@ msgstr "Lieferung"
 msgid "Delivered Qty"
 msgstr "gelieferte Menge"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr "gelieferte Menge Erledigt"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -794,6 +800,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr "Email Alias"
@@ -821,6 +828,11 @@ msgstr "E-Mail-Vorlagenentwurf Benachrichtigung für RMA"
 msgid "Email Template receipt confirmation for RMA"
 msgstr "E-Mail-Vorlage Empfangsbestätigung für RMA"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -975,7 +987,9 @@ 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 "
@@ -1037,18 +1051,6 @@ msgstr "Journaleintrag"
 msgid "Journal Item"
 msgstr "Journaleintrag"
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr "Zuletzt geändert am"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -1078,6 +1080,11 @@ msgstr "Zuletzt aktualisiert am"
 msgid "Late RMAs"
 msgstr "Verspätete RMAs"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1093,12 +1100,6 @@ msgstr "Sperren"
 msgid "Locked"
 msgstr "Gesperrt"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr "Hauptanhang"
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1249,11 +1250,6 @@ msgstr "Ursprungsbuchungssatz"
 msgid "Other Information"
 msgstr "Andere Informationen"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr "Eigentümer"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1392,11 +1388,6 @@ msgstr "RMA #"
 msgid "RMA Code"
 msgstr "RMA-Code"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr "RMA-Bestätigungs-E-Mail"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1456,11 +1447,6 @@ msgstr "RMA-Eingangstyp"
 msgid "RMA Location"
 msgstr "RMA-Standort"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-msgstr "Manueller RMA-Abschluss"
-
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1485,11 +1471,6 @@ msgstr "RMA-Bestellungen"
 msgid "RMA Out Type"
 msgstr "RMA-Out-Typ"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Receipt Confirmation Email"
-msgstr "RMA-Empfangsbestätigungs-E-Mail"
-
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
@@ -1550,11 +1531,6 @@ msgstr "Automatische RMA-Kundenbenachrichtigungen"
 msgid "RMA count"
 msgstr "RMA-Zählung"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr "Benachrichtigungs-E-Mail zum RMA-Entwurf"
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1669,11 +1645,6 @@ msgstr "Erstattet"
 msgid "Remaining delivered qty"
 msgstr "Verbleibende Liefermenge"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr "Verbleibende Liefermenge zu erledigen"
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1802,6 +1773,12 @@ msgstr "Anzahl RMA"
 msgid "Rma Location"
 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"
+msgstr "SMS-Zustellungsfehler"
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -2031,20 +2008,6 @@ msgstr ""
 "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
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-"Der Eigentümer von Datensätzen, die beim Empfang von E-Mails unter diesem "
-"Alias erstellt wurden. Wenn dieses Feld nicht gesetzt ist, versucht das "
-"System, den richtigen Eigentümer anhand der Absenderadresse (Von) zu finden, "
-"oder verwendet das Administratorkonto, wenn kein Systembenutzer für diese "
-"Adresse gefunden wird."
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2173,6 +2136,11 @@ msgstr "Benutzer: Alle Dokumente"
 msgid "User: Own Documents Only"
 msgstr "Benutzer: Nur eigene Dokumente"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2226,11 +2194,9 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
-"Wenn die RMA eingegangen ist, können Sie sie manuell abschließen, \n"
-"                               indem Sie einen Abschlussgrund auswählen."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -2299,13 +2265,6 @@ msgstr ""
 "Der Benutzer hat Zugriff auf die RMA-Konfiguration sowie auf "
 "Statistikberichte."
 
-#. 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' }})"
@@ -2329,6 +2288,65 @@ msgstr ""
 "{{object.company_id.name}} Ihre RMA wurde erfolgreich erstellt (Ref {{object."
 "name or 'n/a' }})"
 
+#~ msgid ""
+#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
+#~ "company-specific.\" groups=\"base.group_multi_company\"/>"
+#~ msgstr ""
+#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Diese Werte sind "
+#~ "unternehmensspezifisch.\" groups=\"base.group_multi_company\"/>"
+
+#~ msgid "Alias domain"
+#~ msgstr "Alias domain"
+
+#~ msgid "Delivered Qty Done"
+#~ msgstr "gelieferte Menge Erledigt"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Zuletzt geändert am"
+
+#~ msgid "Main Attachment"
+#~ msgstr "Hauptanhang"
+
+#~ msgid "Owner"
+#~ msgstr "Eigentümer"
+
+#~ msgid "RMA Confirmation Email"
+#~ msgstr "RMA-Bestätigungs-E-Mail"
+
+#~ msgid "RMA Manual Finalization"
+#~ msgstr "Manueller RMA-Abschluss"
+
+#~ msgid "RMA Receipt Confirmation Email"
+#~ msgstr "RMA-Empfangsbestätigungs-E-Mail"
+
+#~ msgid "RMA draft notification Email"
+#~ msgstr "Benachrichtigungs-E-Mail zum RMA-Entwurf"
+
+#~ msgid "Remaining delivered qty to done"
+#~ msgstr "Verbleibende Liefermenge zu erledigen"
+
+#~ msgid ""
+#~ "The owner of records created upon receiving emails on this alias. If this "
+#~ "field is not set the system will attempt to find the right owner based on "
+#~ "the sender (From) address, or will use the Administrator account if no "
+#~ "system user is found for that address."
+#~ msgstr ""
+#~ "Der Eigentümer von Datensätzen, die beim Empfang von E-Mails unter diesem "
+#~ "Alias erstellt wurden. Wenn dieses Feld nicht gesetzt ist, versucht das "
+#~ "System, den richtigen Eigentümer anhand der Absenderadresse (Von) zu "
+#~ "finden, oder verwendet das Administratorkonto, wenn kein Systembenutzer "
+#~ "für diese Adresse gefunden wird."
+
+#~ msgid ""
+#~ "When the RMA is receive, allow to finsish it manually choosing\n"
+#~ "                            a finalization reason."
+#~ msgstr ""
+#~ "Wenn die RMA eingegangen ist, können Sie sie manuell abschließen, \n"
+#~ "                               indem Sie einen Abschlussgrund auswählen."
+
+#~ msgid "{{(object.name or '')}}"
+#~ msgstr "{{(object.name or '')}}"
+
 #~ msgid ""
 #~ "<div style=\"margin: 0px; padding: 0px;\">\n"
 #~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
@@ -2501,9 +2519,6 @@ msgstr ""
 #~ msgid "Number of unread messages"
 #~ msgstr "Anzahl der ungelesenen Nachrichten"
 
-#~ msgid "SMS Delivery error"
-#~ msgstr "SMS-Zustellungsfehler"
-
 #~ msgid "Unread Messages"
 #~ msgstr "ungelesene Nachrichten"
 
diff --git a/rma/i18n/de_AT.po b/rma/i18n/de_AT.po
index 0c6573e9e..4b9eed1c0 100644
--- a/rma/i18n/de_AT.po
+++ b/rma/i18n/de_AT.po
@@ -227,13 +227,6 @@ msgid ""
 "                                </span>"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -418,14 +411,34 @@ msgstr ""
 msgid "Alias Contact Security"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
 msgstr ""
 
 #. module: rma
@@ -680,11 +693,6 @@ msgstr ""
 msgid "Delivered Qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -736,6 +744,7 @@ msgid "Email"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr ""
@@ -763,6 +772,11 @@ msgstr ""
 msgid "Email Template receipt confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -910,7 +924,9 @@ 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 ""
 
@@ -966,18 +982,6 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -1007,6 +1011,11 @@ msgstr ""
 msgid "Late RMAs"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1022,12 +1031,6 @@ msgstr ""
 msgid "Locked"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1171,11 +1174,6 @@ msgstr ""
 msgid "Other Information"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1304,11 +1302,6 @@ msgstr ""
 msgid "RMA Code"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1368,11 +1361,6 @@ msgstr ""
 msgid "RMA Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1397,11 +1385,6 @@ msgstr ""
 msgid "RMA Out Type"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Receipt Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
@@ -1462,11 +1445,6 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1581,11 +1559,6 @@ msgstr ""
 msgid "Remaining delivered qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr ""
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1704,6 +1677,12 @@ msgstr ""
 msgid "Rma Location"
 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"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1915,15 +1894,6 @@ msgid ""
 "<jobs@example.odoo.com>"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2047,6 +2017,11 @@ msgstr ""
 msgid "User: Own Documents Only"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2097,8 +2072,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
@@ -2155,13 +2130,6 @@ msgid ""
 "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' }})"
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 22d6c182e..36ae0fd07 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -347,15 +347,6 @@ msgstr ""
 "                                    Disponible Parcialmente\n"
 "                                </span>"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Valores específicos por "
-"compañía.\" groups=\"base.group_multi_company\"/>"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -542,15 +533,35 @@ msgstr "Seudónimo"
 msgid "Alias Contact Security"
 msgstr "Seudónimo del contacto de seguridad"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr "Seudónimo"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
-msgstr "Seudónimo del dominio"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
@@ -808,11 +819,6 @@ msgstr "Entregar"
 msgid "Delivered Qty"
 msgstr "Ctd. entregada"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr "Ctd. entregada realizada"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -864,6 +870,7 @@ msgid "Email"
 msgstr "Correo electrónico"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr "Pseudónimo de correo"
@@ -891,6 +898,11 @@ msgstr "Plantilla de correo de notificación de borrador RMA"
 msgid "Email Template receipt confirmation for RMA"
 msgstr "Plantilla de correo de confirmación de recepción RMA"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -1044,7 +1056,9 @@ 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."
 
@@ -1104,18 +1118,6 @@ msgstr "Asiento contable"
 msgid "Journal Item"
 msgstr "Apunte contable"
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr "Última modificación en"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -1145,6 +1147,11 @@ msgstr "Última actualización el"
 msgid "Late RMAs"
 msgstr "RMAs retrasados"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1160,12 +1167,6 @@ msgstr "Bloquear"
 msgid "Locked"
 msgstr "Bloqueado"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr "Adjuntos principales"
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1316,11 +1317,6 @@ msgstr "Movimiento"
 msgid "Other Information"
 msgstr "Otra información"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr "Propietario"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1459,11 +1455,6 @@ msgstr "RMA nº"
 msgid "RMA Code"
 msgstr "Código de RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr "Correo de confirmación de RMA"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1523,11 +1514,6 @@ msgstr "Tipo de operación para recepción de RMA"
 msgid "RMA Location"
 msgstr "Ubicación de RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-msgstr "Finalización del Manual RMA"
-
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1552,11 +1538,6 @@ msgstr "Órdenes de RMA"
 msgid "RMA Out Type"
 msgstr "Tipo de operación para entrega de RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Receipt Confirmation Email"
-msgstr "Correo de confirmación de recepción de RMA"
-
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
@@ -1617,11 +1598,6 @@ msgstr "Notificaciones automáticas de RMA"
 msgid "RMA count"
 msgstr "Cantidad de RMAs"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr "Correo de notificación de borrador de RMA"
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1737,11 +1713,6 @@ msgstr "Reembolsado"
 msgid "Remaining delivered qty"
 msgstr "Ctd. entregada restante"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr "Ctd. entregada restante por realizar"
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1870,6 +1841,12 @@ msgstr "Cantidad de RMAs"
 msgid "Rma Location"
 msgstr "Ubicación 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"
+msgstr "Error de Envío de Mensaje"
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -2093,20 +2070,6 @@ msgstr ""
 "El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos"
 "\", si lo que quiere es obtener los correos para <trabajos@example.odoo.com>"
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-"El propietario de los registros creados al recibir correos electrónicos en "
-"este seudónimo. Si el campo no está establecido, el sistema tratará de "
-"encontrar el propietario adecuado basado en la dirección del emisor (De), o "
-"usará la cuenta de administrador si no se encuentra un usuario para esa "
-"dirección."
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2234,6 +2197,11 @@ msgstr "Usuario: Mostrar todos los documentos"
 msgid "User: Own Documents Only"
 msgstr "Usuario: Solo mostrar documentos propios"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2286,11 +2254,9 @@ msgstr "Cuando se confirme un RMA, enviar un correo informativo automático."
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
-"Cuando se recibe el RMA, permite finalizarlo manualmente eligiendo\n"
-"                            un motivo de finalización."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -2357,13 +2323,6 @@ msgstr ""
 "El usuario tendrá acceso a la configuración de RMA y a los informes "
 "estadí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 "{{(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' }})"
@@ -2387,6 +2346,65 @@ msgstr ""
 "{{object.company_id.name}} Su RMA se ha creado con éxito (Ref {{object.name "
 "or 'n/a' }})"
 
+#~ msgid ""
+#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
+#~ "company-specific.\" groups=\"base.group_multi_company\"/>"
+#~ msgstr ""
+#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Valores específicos por "
+#~ "compañía.\" groups=\"base.group_multi_company\"/>"
+
+#~ msgid "Alias domain"
+#~ msgstr "Seudónimo del dominio"
+
+#~ msgid "Delivered Qty Done"
+#~ msgstr "Ctd. entregada realizada"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Última modificación en"
+
+#~ msgid "Main Attachment"
+#~ msgstr "Adjuntos principales"
+
+#~ msgid "Owner"
+#~ msgstr "Propietario"
+
+#~ msgid "RMA Confirmation Email"
+#~ msgstr "Correo de confirmación de RMA"
+
+#~ msgid "RMA Manual Finalization"
+#~ msgstr "Finalización del Manual RMA"
+
+#~ msgid "RMA Receipt Confirmation Email"
+#~ msgstr "Correo de confirmación de recepción de RMA"
+
+#~ msgid "RMA draft notification Email"
+#~ msgstr "Correo de notificación de borrador de RMA"
+
+#~ msgid "Remaining delivered qty to done"
+#~ msgstr "Ctd. entregada restante por realizar"
+
+#~ msgid ""
+#~ "The owner of records created upon receiving emails on this alias. If this "
+#~ "field is not set the system will attempt to find the right owner based on "
+#~ "the sender (From) address, or will use the Administrator account if no "
+#~ "system user is found for that address."
+#~ msgstr ""
+#~ "El propietario de los registros creados al recibir correos electrónicos "
+#~ "en este seudónimo. Si el campo no está establecido, el sistema tratará de "
+#~ "encontrar el propietario adecuado basado en la dirección del emisor (De), "
+#~ "o usará la cuenta de administrador si no se encuentra un usuario para esa "
+#~ "dirección."
+
+#~ msgid ""
+#~ "When the RMA is receive, allow to finsish it manually choosing\n"
+#~ "                            a finalization reason."
+#~ msgstr ""
+#~ "Cuando se recibe el RMA, permite finalizarlo manualmente eligiendo\n"
+#~ "                            un motivo de finalización."
+
+#~ msgid "{{(object.name or '')}}"
+#~ msgstr "{{(object.name or '')}}"
+
 #~ msgid ""
 #~ "<div style=\"margin: 0px; padding: 0px;\">\n"
 #~ "                <p style=\"margin: 0px; padding: 0px; font-size: 13px;"
@@ -2576,9 +2594,6 @@ msgstr ""
 #~ 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"
 
diff --git a/rma/i18n/fr.po b/rma/i18n/fr.po
index 402983821..021e4f55b 100644
--- a/rma/i18n/fr.po
+++ b/rma/i18n/fr.po
@@ -348,15 +348,6 @@ msgstr ""
 "                                    Partiellement disponible\n"
 "                                </span>"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Les valeurs définies ici sont "
-"propres à l'entreprise.\" groups=\"base.group_multi_company\"/>"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -544,15 +535,35 @@ msgstr "Alias"
 msgid "Alias Contact Security"
 msgstr "Alias Contact Sécurité"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr "Nom de l'alias"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
-msgstr "Domaine de l'alias"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
@@ -808,11 +819,6 @@ msgstr "Livrer"
 msgid "Delivered Qty"
 msgstr "Qté livrée"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr "Quantité livrée Terminé"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -864,6 +870,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr "Alias d'email"
@@ -891,6 +898,11 @@ msgstr "Modèle d'email de botification de la RMA"
 msgid "Email Template receipt confirmation for RMA"
 msgstr "Modèle d'email de confirmation de réception de la RMA"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -1041,7 +1053,9 @@ 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 "Si coché, certains messages ont une erreur de livraison."
 
@@ -1101,18 +1115,6 @@ msgstr "Pièce comptable"
 msgid "Journal Item"
 msgstr "Écriture comptable"
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr "Dernière Modification le"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -1142,6 +1144,11 @@ msgstr "Dernière mise à jour le"
 msgid "Late RMAs"
 msgstr "RMAs en retard"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1157,12 +1164,6 @@ msgstr "Verrouiller"
 msgid "Locked"
 msgstr "Verrouillé"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr "Pièce jointe principale"
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1310,11 +1311,6 @@ msgstr "Opération d'origine"
 msgid "Other Information"
 msgstr "Autres informations"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr "Propriétaire"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1445,11 +1441,6 @@ msgstr "# RMA"
 msgid "RMA Code"
 msgstr "Code RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr "Email de confirmation RMA"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1509,11 +1500,6 @@ msgstr "Type d'entrée RMA"
 msgid "RMA Location"
 msgstr "Emplacement RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-msgstr "Clôture manuelle RMA"
-
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1538,11 +1524,6 @@ msgstr "Bons de commande RMA"
 msgid "RMA Out Type"
 msgstr "Type de sortie RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Receipt Confirmation Email"
-msgstr "Email de confirmation de réception RMA"
-
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
@@ -1603,11 +1584,6 @@ msgstr "Notifications RMA automatiques au client"
 msgid "RMA count"
 msgstr "Nombre de RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr "Email de notification brouillon RMA"
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1723,11 +1699,6 @@ msgstr "Remboursé"
 msgid "Remaining delivered qty"
 msgstr "Qté restante à livrer"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr "Qté restante à livrer avant de terminer"
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1833,8 +1804,8 @@ msgid ""
 "Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
 "%(name)s</a> has been created."
 msgstr ""
-"Retour : <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\""
-">%(name)s</a> a été créé."
+"Retour : <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> a été créé."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1856,6 +1827,12 @@ msgstr "Nombre de RMA"
 msgid "Rma Location"
 msgstr "Emplacement 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 ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1980,8 +1957,8 @@ msgid ""
 "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
 "a> has been created."
 msgstr ""
-"Division : <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\""
-">%(name)s</a> a été créé."
+"Division : <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> a été créé."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -2078,15 +2055,6 @@ msgstr ""
 "Le nom de l'alias d'email, e.g. 'travail' si vous voulez catch les emails de "
 "<travail@example.odoo.com>"
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2212,6 +2180,11 @@ msgstr "Utilisateur : tous les documents"
 msgid "User: Own Documents Only"
 msgstr "Utilisateur : mes documents seulement"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2259,17 +2232,15 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "When the RMA is confirmed, send an automatic information email."
-msgstr "Quand la RMA est confirmée, envoyer un email d'information automatique."
+msgstr ""
+"Quand la RMA est confirmée, envoyer un email d'information automatique."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
-"Quand une RMA est reçue, permet de la terminer manuellement en "
-"sélectionnant\n"
-"                             comme motif de clôture."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -2335,13 +2306,6 @@ msgid ""
 msgstr ""
 "l'utilisateur aura accès à la configuration RMA et aux rapports statistiques."
 
-#. 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' }})"
@@ -2361,5 +2325,50 @@ msgid ""
 "{{object.company_id.name}} Your RMA has been succesfully created (Ref "
 "{{object.name or 'n/a' }})"
 msgstr ""
-"{{object.company_id.name}} Votre RMA a été crée avec succès(Ref {{"
-"object.name or 'n/a' }})"
+"{{object.company_id.name}} Votre RMA a été crée avec succès(Ref {{object."
+"name or 'n/a' }})"
+
+#~ msgid ""
+#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
+#~ "company-specific.\" groups=\"base.group_multi_company\"/>"
+#~ msgstr ""
+#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Les valeurs définies ici "
+#~ "sont propres à l'entreprise.\" groups=\"base.group_multi_company\"/>"
+
+#~ msgid "Alias domain"
+#~ msgstr "Domaine de l'alias"
+
+#~ msgid "Delivered Qty Done"
+#~ msgstr "Quantité livrée Terminé"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Dernière Modification le"
+
+#~ msgid "Main Attachment"
+#~ msgstr "Pièce jointe principale"
+
+#~ msgid "Owner"
+#~ msgstr "Propriétaire"
+
+#~ msgid "RMA Confirmation Email"
+#~ msgstr "Email de confirmation RMA"
+
+#~ msgid "RMA Manual Finalization"
+#~ msgstr "Clôture manuelle RMA"
+
+#~ msgid "RMA Receipt Confirmation Email"
+#~ msgstr "Email de confirmation de réception RMA"
+
+#~ msgid "RMA draft notification Email"
+#~ msgstr "Email de notification brouillon RMA"
+
+#~ msgid "Remaining delivered qty to done"
+#~ msgstr "Qté restante à livrer avant de terminer"
+
+#~ msgid ""
+#~ "When the RMA is receive, allow to finsish it manually choosing\n"
+#~ "                            a finalization reason."
+#~ msgstr ""
+#~ "Quand une RMA est reçue, permet de la terminer manuellement en "
+#~ "sélectionnant\n"
+#~ "                             comme motif de clôture."
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 3a3ffd23a..35d02ae6d 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -35,8 +35,8 @@ msgstr "(object._get_report_base_filename())"
 msgid ""
 "<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
-"<b>Soggetto e-mail:</b> %(subject)s<br/><br/><b>Corpo e-mail:</b><br/"
-">%(body)s"
+"<b>Soggetto e-mail:</b> %(subject)s<br/><br/><b>Corpo e-mail:</b><br/>"
+"%(body)s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
@@ -178,8 +178,8 @@ msgstr ""
 "                    </strong>\n"
 "                    on\n"
 "                    <t t-out=\"object.company_id.name\"></t>\n"
-"                    . Il nostro team la controllerà e validerà quanto prima."
-"\n"
+"                    . Il nostro team la controllerà e validerà quanto "
+"prima.\n"
 "                    <br>\n"
 "                    <br>\n"
 "                    Non esistate a contattarci in caso di dubbi.\n"
@@ -242,8 +242,8 @@ msgid ""
 "                                        </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"
 "                                            Annullata\n"
 "                                        </span>"
 
@@ -270,8 +270,8 @@ msgid ""
 "                                        </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"
 "                                            Preparazione\n"
 "                                        </span>"
 
@@ -298,8 +298,8 @@ msgid ""
 "                                        </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"
 "                                            Spedita\n"
 "                                        </span>"
 
@@ -326,8 +326,8 @@ msgid ""
 "                                        </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"
 "                                            Parzialmente disponibile\n"
 "                                        </span>"
 
@@ -344,15 +344,6 @@ msgstr ""
 "                                    Parzialmente disponibile\n"
 "                                </span>"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui sono "
-"specifici per azienda.\" groups=\"base.group_multi_company\"/>"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -539,15 +530,35 @@ msgstr "Alias"
 msgid "Alias Contact Security"
 msgstr "Alias contatto sicurezza"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr "Nome alias"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
-msgstr "Dominio alias"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
@@ -804,11 +815,6 @@ msgstr "Consegna"
 msgid "Delivered Qty"
 msgstr "Q.tà consegnata"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr "Quantità consegnata fatta"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -860,6 +866,7 @@ msgid "Email"
 msgstr "E-mail"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr "Alias email"
@@ -887,6 +894,11 @@ msgstr "Modello di email di notifica della bozza per RMA"
 msgid "Email Template receipt confirmation for RMA"
 msgstr "Modello di email di conferma della ricezione per RMA"
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -1037,7 +1049,9 @@ 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."
 
@@ -1097,18 +1111,6 @@ msgstr "Registrazione contabile"
 msgid "Journal Item"
 msgstr "Movimento contabile"
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr "Ultima modifica il"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -1138,6 +1140,11 @@ msgstr "Ultimo aggiornamento il"
 msgid "Late RMAs"
 msgstr "RMA in ritardo"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1153,12 +1160,6 @@ msgstr "Blocca"
 msgid "Locked"
 msgstr "Bloccato"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr "Allegato principale"
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1309,11 +1310,6 @@ msgstr "Trasferimento originale"
 msgid "Other Information"
 msgstr "Altre informazioni"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr "Proprietario"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1452,11 +1448,6 @@ msgstr "# RMA"
 msgid "RMA Code"
 msgstr "Codice RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr "Email di Conferma RMA"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1516,11 +1507,6 @@ msgstr "RMA nel tipo"
 msgid "RMA Location"
 msgstr "Ubicazione RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-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
@@ -1545,11 +1531,6 @@ msgstr "Ordini RMA"
 msgid "RMA Out Type"
 msgstr "Tipo RMA in uscita"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-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"
@@ -1610,11 +1591,6 @@ msgstr "Notifiche automatiche ai clienti RMA"
 msgid "RMA count"
 msgstr "Conteggio RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr "E-mail di notifica bozza RMA"
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1729,11 +1705,6 @@ msgstr "Rimborsato"
 msgid "Remaining delivered qty"
 msgstr "Quantità da consegnare rimanenti"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr "Quantità consegnata rimanente da fare"
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1839,8 +1810,8 @@ msgid ""
 "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=\"%(id)d\""
-">%(name)s</a> creato."
+"Reso: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> creato."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1862,6 +1833,12 @@ msgstr "Conteggio Rma"
 msgid "Rma Location"
 msgstr "Ubicazione 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"
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1984,8 +1961,8 @@ msgid ""
 "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=\"%(id)d\""
-">%(name)s</a> creata."
+"Divisione: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">"
+"%(name)s</a> creata."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -2085,20 +2062,6 @@ msgstr ""
 "Il nome dell'alias email, ad es. 'lavori' se vuoi ricevere email per "
 "<lavori@example.odoo.com>"
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-"Il proprietario dei record creati dopo aver ricevuto email con questo alias. "
-"Se questo campo non è impostato il sistema tenterà di trovare il "
-"proprietario corretto in base all'indirizzo del mittente (Da) oppure "
-"utilizzerà l'account amministratore se non viene trovato alcun utente di "
-"sistema per quell'indirizzo."
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2227,6 +2190,11 @@ msgstr "Utente: tutti i documenti"
 msgid "User: Own Documents Only"
 msgstr "Utente: solo i propri documenti"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2279,11 +2247,9 @@ msgstr "Quando l'RMA è confermato, inviare un'e-mail informativa automatica."
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
-"Quando si riceve l'RMA, permetti di chiuderlo manualmente scegliendo\n"
-"                            un motivo per la chiusura."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
@@ -2347,13 +2313,6 @@ msgid ""
 "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 "{{(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' }})"
@@ -2374,8 +2333,67 @@ msgid ""
 "{{object.company_id.name}} Your RMA has been succesfully created (Ref "
 "{{object.name or 'n/a' }})"
 msgstr ""
-"{{object.company_id.name}} La vostra RMA è stata creata con successo (rif. {{"
-"object.name or 'n/a' }})"
+"{{object.company_id.name}} La vostra RMA è stata creata con successo (rif. "
+"{{object.name or 'n/a' }})"
+
+#~ msgid ""
+#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
+#~ "company-specific.\" groups=\"base.group_multi_company\"/>"
+#~ msgstr ""
+#~ "<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui "
+#~ "sono specifici per azienda.\" groups=\"base.group_multi_company\"/>"
+
+#~ msgid "Alias domain"
+#~ msgstr "Dominio alias"
+
+#~ msgid "Delivered Qty Done"
+#~ msgstr "Quantità consegnata fatta"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Ultima modifica il"
+
+#~ msgid "Main Attachment"
+#~ msgstr "Allegato principale"
+
+#~ msgid "Owner"
+#~ msgstr "Proprietario"
+
+#~ msgid "RMA Confirmation Email"
+#~ msgstr "Email di Conferma RMA"
+
+#~ msgid "RMA Manual Finalization"
+#~ msgstr "Chiusura manuale RMA"
+
+#~ msgid "RMA Receipt Confirmation Email"
+#~ msgstr "E-mail di conferma ricevuta RMA"
+
+#~ msgid "RMA draft notification Email"
+#~ msgstr "E-mail di notifica bozza RMA"
+
+#~ msgid "Remaining delivered qty to done"
+#~ msgstr "Quantità consegnata rimanente da fare"
+
+#~ msgid ""
+#~ "The owner of records created upon receiving emails on this alias. If this "
+#~ "field is not set the system will attempt to find the right owner based on "
+#~ "the sender (From) address, or will use the Administrator account if no "
+#~ "system user is found for that address."
+#~ msgstr ""
+#~ "Il proprietario dei record creati dopo aver ricevuto email con questo "
+#~ "alias. Se questo campo non è impostato il sistema tenterà di trovare il "
+#~ "proprietario corretto in base all'indirizzo del mittente (Da) oppure "
+#~ "utilizzerà l'account amministratore se non viene trovato alcun utente di "
+#~ "sistema per quell'indirizzo."
+
+#~ msgid ""
+#~ "When the RMA is receive, allow to finsish it manually choosing\n"
+#~ "                            a finalization reason."
+#~ msgstr ""
+#~ "Quando si riceve l'RMA, permetti di chiuderlo manualmente scegliendo\n"
+#~ "                            un motivo per la chiusura."
+
+#~ msgid "{{(object.name or '')}}"
+#~ msgstr "{{(object.name or '')}}"
 
 #~ msgid "${(object.name or '')}"
 #~ msgstr "${(object.name or '')}"
@@ -2584,9 +2602,6 @@ 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 "
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index 95bea25da..aaae391c3 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -227,13 +227,6 @@ msgid ""
 "                                </span>"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -418,14 +411,34 @@ msgstr ""
 msgid "Alias Contact Security"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
 msgstr ""
 
 #. module: rma
@@ -680,11 +693,6 @@ msgstr ""
 msgid "Delivered Qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -736,6 +744,7 @@ msgid "Email"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr ""
@@ -763,6 +772,11 @@ msgstr ""
 msgid "Email Template receipt confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -910,7 +924,9 @@ 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 ""
 
@@ -966,18 +982,6 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -1007,6 +1011,11 @@ msgstr ""
 msgid "Late RMAs"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1022,12 +1031,6 @@ msgstr ""
 msgid "Locked"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1171,11 +1174,6 @@ msgstr ""
 msgid "Other Information"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1304,11 +1302,6 @@ msgstr ""
 msgid "RMA Code"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1368,11 +1361,6 @@ msgstr ""
 msgid "RMA Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1397,11 +1385,6 @@ msgstr ""
 msgid "RMA Out Type"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Receipt Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
@@ -1462,11 +1445,6 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1581,11 +1559,6 @@ msgstr ""
 msgid "Remaining delivered qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr ""
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1704,6 +1677,12 @@ msgstr ""
 msgid "Rma Location"
 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"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1915,15 +1894,6 @@ msgid ""
 "<jobs@example.odoo.com>"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2047,6 +2017,11 @@ msgstr ""
 msgid "User: Own Documents Only"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2097,8 +2072,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
@@ -2155,13 +2130,6 @@ msgid ""
 "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' }})"
diff --git a/rma/i18n/pt.po b/rma/i18n/pt.po
index e6b1d7010..8ec7f1e53 100644
--- a/rma/i18n/pt.po
+++ b/rma/i18n/pt.po
@@ -235,15 +235,6 @@ msgid ""
 "                                </span>"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Estes valores são específicos "
-"por empresa.\" groups=\"base.group_multi_company\"/>"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -430,15 +421,35 @@ msgstr "Alias"
 msgid "Alias Contact Security"
 msgstr "Segurança do Contato de Alias"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr "Nome do Alias"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
-msgstr "Domínio do Alias"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
@@ -692,11 +703,6 @@ msgstr "Entrega"
 msgid "Delivered Qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -748,6 +754,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr "Alias do Email"
@@ -775,6 +782,11 @@ msgstr ""
 msgid "Email Template receipt confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -924,7 +936,9 @@ 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."
 
@@ -982,18 +996,6 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr "Última Modificação Em"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -1023,6 +1025,11 @@ msgstr "Última Atualiz. em"
 msgid "Late RMAs"
 msgstr "RMAs atrasadas"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1038,12 +1045,6 @@ msgstr "Bloquear"
 msgid "Locked"
 msgstr "Bloqueada"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr "Anexo Principal"
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1190,11 +1191,6 @@ msgstr "Origem da Movimentação"
 msgid "Other Information"
 msgstr "Outra Informação"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr "Proprietário"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1331,11 +1327,6 @@ msgstr "RMA #"
 msgid "RMA Code"
 msgstr "Código RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr "E-mail de Confirmação da RMA"
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1395,11 +1386,6 @@ msgstr "Tipo Entrada RMA"
 msgid "RMA Location"
 msgstr "Localização RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1424,11 +1410,6 @@ msgstr "Pedidos RMA"
 msgid "RMA Out Type"
 msgstr "Tipo Saída RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Receipt Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
@@ -1489,11 +1470,6 @@ msgstr "Notificações automáticas a clientes de RMA"
 msgid "RMA count"
 msgstr "Contagem de RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1608,11 +1584,6 @@ msgstr "Reembolsado"
 msgid "Remaining delivered qty"
 msgstr "Quantidade Entregue Restante"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr "Qtd. restante entregue a fazer"
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1731,6 +1702,12 @@ msgstr "Contagem de RMA"
 msgid "Rma Location"
 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"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1951,19 +1928,6 @@ msgstr ""
 "O nome do alias do email, por exemplo 'jobs' se você deseja receber e-mails "
 "de <jobs@example.odoo.com>"
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-"O proprietário dos registos criados ao receber emails nesse alias. Se esse "
-"campo não estiver definido, o sistema tentará encontrar o proprietário certo "
-"com base no endereço do remetente (De) ou usará a conta de Administrador se "
-"nenhum utilizador do sistema for encontrado para esse endereço."
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2089,6 +2053,11 @@ msgstr "Utilizador: Todos os Documentos"
 msgid "User: Own Documents Only"
 msgstr "Utilizador: Apenas os Seus Documentos"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2139,8 +2108,8 @@ msgstr "Quando a RMA é confirmada, enviar um e-mail automático de informação
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
@@ -2204,13 +2173,6 @@ 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' }})"
@@ -2230,6 +2192,43 @@ msgid ""
 "{{object.name or 'n/a' }})"
 msgstr ""
 
+#~ msgid ""
+#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
+#~ "company-specific.\" groups=\"base.group_multi_company\"/>"
+#~ msgstr ""
+#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Estes valores são "
+#~ "específicos por empresa.\" groups=\"base.group_multi_company\"/>"
+
+#~ msgid "Alias domain"
+#~ msgstr "Domínio do Alias"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Última Modificação Em"
+
+#~ msgid "Main Attachment"
+#~ msgstr "Anexo Principal"
+
+#~ msgid "Owner"
+#~ msgstr "Proprietário"
+
+#~ msgid "RMA Confirmation Email"
+#~ msgstr "E-mail de Confirmação da RMA"
+
+#~ msgid "Remaining delivered qty to done"
+#~ msgstr "Qtd. restante entregue a fazer"
+
+#~ msgid ""
+#~ "The owner of records created upon receiving emails on this alias. If this "
+#~ "field is not set the system will attempt to find the right owner based on "
+#~ "the sender (From) address, or will use the Administrator account if no "
+#~ "system user is found for that address."
+#~ msgstr ""
+#~ "O proprietário dos registos criados ao receber emails nesse alias. Se "
+#~ "esse campo não estiver definido, o sistema tentará encontrar o "
+#~ "proprietário certo com base no endereço do remetente (De) ou usará a "
+#~ "conta de Administrador se nenhum utilizador do sistema for encontrado "
+#~ "para esse endereço."
+
 #~ msgid "${(object.name or '')}"
 #~ msgstr "${(object.name or '')}"
 
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 82bcfdc95..7e23c4fc3 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -235,13 +235,6 @@ msgid ""
 "                                </span>"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -428,15 +421,35 @@ msgstr "Alias"
 msgid "Alias Contact Security"
 msgstr "Segurança do Contato de Alias"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr "Nome do Alias"
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
-msgstr "Domínio do Alias"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
+msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
@@ -690,11 +703,6 @@ msgstr "Entrega"
 msgid "Delivered Qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -746,6 +754,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr "Alias do Email"
@@ -773,6 +782,11 @@ msgstr ""
 msgid "Email Template receipt confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -922,7 +936,9 @@ 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."
 
@@ -980,18 +996,6 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr "Última Modificação Feita em"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -1021,6 +1025,11 @@ msgstr "Última Atualização Feita em"
 msgid "Late RMAs"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1036,12 +1045,6 @@ msgstr "Travar"
 msgid "Locked"
 msgstr "Travado"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr "Anexo Principal"
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1188,11 +1191,6 @@ msgstr "Origem da Movimentação"
 msgid "Other Information"
 msgstr "Outra Informação"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr "Proprietário"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1329,11 +1327,6 @@ msgstr "RMA #"
 msgid "RMA Code"
 msgstr "Código RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1393,11 +1386,6 @@ msgstr "Tipo Entrada RMA"
 msgid "RMA Location"
 msgstr "Localização RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1422,11 +1410,6 @@ msgstr "Pedidos RMA"
 msgid "RMA Out Type"
 msgstr "Tipo Saída RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Receipt Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
@@ -1487,11 +1470,6 @@ msgstr ""
 msgid "RMA count"
 msgstr "Contagem de RMA"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1606,11 +1584,6 @@ msgstr "Restituído"
 msgid "Remaining delivered qty"
 msgstr "Quantidade Entregue Restante"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr "Quantidade restante entregue a concluir"
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1729,6 +1702,12 @@ msgstr "Contagem de RMA"
 msgid "Rma Location"
 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"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1949,19 +1928,6 @@ msgstr ""
 "O nome do alias do email, por exemplo 'jobs' se você deseja receber e-mails "
 "de <jobs@example.odoo.com>"
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-"O proprietário dos registros criados ao receber emails nesse alias. Se esse "
-"campo não estiver definido, o sistema tentará encontrar o proprietário certo "
-"com base no endereço do remetente (De) ou usará a conta de Administrador se "
-"nenhum usuário do sistema for encontrado para esse endereço."
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2087,6 +2053,11 @@ msgstr "Usuário: Todos os Documentos"
 msgid "User: Own Documents Only"
 msgstr "Usuário: Somente Seus Documentos"
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2137,8 +2108,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
@@ -2199,13 +2170,6 @@ 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' }})"
@@ -2225,6 +2189,33 @@ msgid ""
 "{{object.name or 'n/a' }})"
 msgstr ""
 
+#~ msgid "Alias domain"
+#~ msgstr "Domínio do Alias"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Última Modificação Feita em"
+
+#~ msgid "Main Attachment"
+#~ msgstr "Anexo Principal"
+
+#~ msgid "Owner"
+#~ msgstr "Proprietário"
+
+#~ msgid "Remaining delivered qty to done"
+#~ msgstr "Quantidade restante entregue a concluir"
+
+#~ msgid ""
+#~ "The owner of records created upon receiving emails on this alias. If this "
+#~ "field is not set the system will attempt to find the right owner based on "
+#~ "the sender (From) address, or will use the Administrator account if no "
+#~ "system user is found for that address."
+#~ msgstr ""
+#~ "O proprietário dos registros criados ao receber emails nesse alias. Se "
+#~ "esse campo não estiver definido, o sistema tentará encontrar o "
+#~ "proprietário certo com base no endereço do remetente (De) ou usará a "
+#~ "conta de Administrador se nenhum usuário do sistema for encontrado para "
+#~ "esse endereço."
+
 #~ msgid "${(object.name or '')}"
 #~ msgstr "${(object.name or '')}"
 
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index ed42fa18b..97fd11e56 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 16.0\n"
+"Project-Id-Version: Odoo Server 17.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -219,13 +219,6 @@ msgid ""
 "                                </span>"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -410,14 +403,34 @@ msgstr ""
 msgid "Alias Contact Security"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
 msgstr ""
 
 #. module: rma
@@ -672,11 +685,6 @@ msgstr ""
 msgid "Delivered Qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -728,6 +736,7 @@ msgid "Email"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr ""
@@ -755,6 +764,11 @@ msgstr ""
 msgid "Email Template receipt confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -902,7 +916,9 @@ 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 ""
 
@@ -958,18 +974,6 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -999,6 +1003,11 @@ msgstr ""
 msgid "Late RMAs"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1014,12 +1023,6 @@ msgstr ""
 msgid "Locked"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1164,11 +1167,6 @@ msgstr ""
 msgid "Other Information"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1296,11 +1294,6 @@ msgstr ""
 msgid "RMA Code"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1360,11 +1353,6 @@ msgstr ""
 msgid "RMA Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1389,11 +1377,6 @@ msgstr ""
 msgid "RMA Out Type"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Receipt Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
@@ -1454,11 +1437,6 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1573,11 +1551,6 @@ msgstr ""
 msgid "Remaining delivered qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr ""
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1696,6 +1669,12 @@ msgstr ""
 msgid "Rma Location"
 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"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1907,15 +1886,6 @@ msgid ""
 "<jobs@example.odoo.com>"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2039,6 +2009,11 @@ msgstr ""
 msgid "User: Own Documents Only"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2089,8 +2064,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
@@ -2148,13 +2123,6 @@ msgid ""
 "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' }})"
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index e23220d54..87a0ac696 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -240,13 +240,6 @@ msgid ""
 "                                </span>"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -433,14 +426,34 @@ msgstr "Alias"
 msgid "Alias Contact Security"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
 msgstr ""
 
 #. module: rma
@@ -695,11 +708,6 @@ msgstr "Livrează"
 msgid "Delivered Qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -751,6 +759,7 @@ msgid "Email"
 msgstr "Email"
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr ""
@@ -778,6 +787,11 @@ msgstr ""
 msgid "Email Template receipt confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -925,7 +939,9 @@ 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."
 
@@ -983,18 +999,6 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr "Ultima modificare în"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -1024,6 +1028,11 @@ msgstr "Ultima modificare în"
 msgid "Late RMAs"
 msgstr "Cereri retur întârziate"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1039,12 +1048,6 @@ msgstr "Închide"
 msgid "Locked"
 msgstr "Închis"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1190,11 +1193,6 @@ msgstr ""
 msgid "Other Information"
 msgstr "Alte informații"
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr "Proprietar"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1327,11 +1325,6 @@ msgstr "Număr retur"
 msgid "RMA Code"
 msgstr "Cod cerere retur"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1391,11 +1384,6 @@ msgstr ""
 msgid "RMA Location"
 msgstr "Locație"
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1420,11 +1408,6 @@ msgstr "Comenzi retur"
 msgid "RMA Out Type"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Receipt Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
@@ -1485,11 +1468,6 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1604,11 +1582,6 @@ msgstr "Rambursat"
 msgid "Remaining delivered qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr ""
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1727,6 +1700,12 @@ msgstr ""
 msgid "Rma Location"
 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"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1938,20 +1917,6 @@ msgid ""
 "<jobs@example.odoo.com>"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-"Proprietarul înregistrărilor create la primirea e-mailurilor de la acest "
-"alias. Dacă acest câmp nu este setat, sistemul va încerca să găsească "
-"proprietarul potrivit în funcție de adresa expeditorului (De la) sau va "
-"utiliza contul de administrator dacă nu este găsit niciun utilizator de "
-"sistem pentru acea adresă."
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2076,6 +2041,11 @@ msgstr ""
 msgid "User: Own Documents Only"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2126,8 +2096,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
@@ -2186,13 +2156,6 @@ msgid ""
 "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' }})"
@@ -2212,6 +2175,24 @@ msgid ""
 "{{object.name or 'n/a' }})"
 msgstr ""
 
+#~ msgid "Last Modified on"
+#~ msgstr "Ultima modificare în"
+
+#~ msgid "Owner"
+#~ msgstr "Proprietar"
+
+#~ msgid ""
+#~ "The owner of records created upon receiving emails on this alias. If this "
+#~ "field is not set the system will attempt to find the right owner based on "
+#~ "the sender (From) address, or will use the Administrator account if no "
+#~ "system user is found for that address."
+#~ msgstr ""
+#~ "Proprietarul înregistrărilor create la primirea e-mailurilor de la acest "
+#~ "alias. Dacă acest câmp nu este setat, sistemul va încerca să găsească "
+#~ "proprietarul potrivit în funcție de adresa expeditorului (De la) sau va "
+#~ "utiliza contul de administrator dacă nu este găsit niciun utilizator de "
+#~ "sistem pentru acea adresă."
+
 #~ msgid "${(object.name or '')}"
 #~ msgstr "${(object.name or '')}"
 
diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
index ba54d9f83..11d3e4921 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -229,13 +229,6 @@ msgid ""
 "                                </span>"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid ""
-"<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-"
-"specific.\" groups=\"base.group_multi_company\"/>"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong class=\"d-block mb-1\">Delivery</strong>"
@@ -420,14 +413,34 @@ msgstr ""
 msgid "Alias Contact Security"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
+msgid "Alias Domain"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
+msgid "Alias Domain Name"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
+msgid "Alias Email"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
 msgid "Alias Name"
 msgstr ""
 
 #. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
-msgid "Alias domain"
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
+msgid "Alias Status"
+msgstr ""
+
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_status
+msgid "Alias status assessed on the last message received."
 msgstr ""
 
 #. module: rma
@@ -682,11 +695,6 @@ msgstr ""
 msgid "Delivered Qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__delivered_qty_done
-msgid "Delivered Qty Done"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -738,6 +746,7 @@ msgid "Email"
 msgstr ""
 
 #. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_email
 #: model_terms:ir.ui.view,arch_db:rma.rma_team_view_form
 msgid "Email Alias"
 msgstr ""
@@ -765,6 +774,11 @@ msgstr ""
 msgid "Email Template receipt confirmation for RMA"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,help:rma.field_rma_team__alias_domain
+msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
 #: model:ir.model.fields,help:rma.field_res_config_settings__rma_mail_confirmation_template_id
@@ -912,7 +926,9 @@ 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 ""
 
@@ -968,18 +984,6 @@ msgstr ""
 msgid "Journal Item"
 msgstr ""
 
-#. module: rma
-#: 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
-#: model:ir.model.fields,field_description:rma.field_rma_finalization_wizard____last_update
-#: model:ir.model.fields,field_description:rma.field_rma_operation____last_update
-#: 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
-msgid "Last Modified on"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__write_uid
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__write_uid
@@ -1009,6 +1013,11 @@ msgstr ""
 msgid "Late RMAs"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
+msgid "Local-part based incoming detection"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
 msgid "Location"
@@ -1024,12 +1033,6 @@ msgstr ""
 msgid "Locked"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__message_main_attachment_id
-#: model:ir.model.fields,field_description:rma.field_rma_team__message_main_attachment_id
-msgid "Main Attachment"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.actions.act_window,help:rma.action_rma_finalization
 msgid ""
@@ -1173,11 +1176,6 @@ msgstr ""
 msgid "Other Information"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma_team__alias_user_id
-msgid "Owner"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_parent_model_id
 msgid "Parent Model"
@@ -1306,11 +1304,6 @@ msgstr ""
 msgid "RMA Code"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_search
 msgid "RMA Date"
@@ -1370,11 +1363,6 @@ msgstr ""
 msgid "RMA Location"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Manual Finalization"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,name:rma.mt_rma_notification
 #: model:mail.message.subtype,name:rma.mt_rma_team_rma_notification
@@ -1399,11 +1387,6 @@ msgstr ""
 msgid "RMA Out Type"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA Receipt Confirmation Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.template,name:rma.mail_template_rma_receipt_notification
 msgid "RMA Receipt Notification"
@@ -1464,11 +1447,6 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
-#. module: rma
-#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
-msgid "RMA draft notification Email"
-msgstr ""
-
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
@@ -1583,11 +1561,6 @@ msgstr ""
 msgid "Remaining delivered qty"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,field_description:rma.field_rma__remaining_qty_to_done
-msgid "Remaining delivered qty to done"
-msgstr ""
-
 #. module: rma
 #: model:rma.operation,name:rma.rma_operation_return
 msgid "Repair"
@@ -1706,6 +1679,12 @@ msgstr ""
 msgid "Rma Location"
 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"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1917,15 +1896,6 @@ msgid ""
 "<jobs@example.odoo.com>"
 msgstr ""
 
-#. module: rma
-#: model:ir.model.fields,help:rma.field_rma_team__alias_user_id
-msgid ""
-"The owner of records created upon receiving emails on this alias. If this "
-"field is not set the system will attempt to find the right owner based on "
-"the sender (From) address, or will use the Administrator account if no "
-"system user is found for that address."
-msgstr ""
-
 #. module: rma
 #. odoo-python
 #: code:addons/rma/models/stock_move.py:0
@@ -2049,6 +2019,11 @@ msgstr ""
 msgid "User: Own Documents Only"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
+msgid "Values set here are company-specific."
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
 msgid "Waiting for replacement"
@@ -2099,8 +2074,8 @@ msgstr ""
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid ""
-"When the RMA is receive, allow to finsish it manually choosing\n"
-"                            a finalization reason."
+"When the RMA is receive, allow to finsish it manually choosing a "
+"finalization reason."
 msgstr ""
 
 #. module: rma
@@ -2157,13 +2132,6 @@ msgid ""
 "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' }})"
diff --git a/rma/models/rma.py b/rma/models/rma.py
index fb6b43dd3..570450897 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -35,60 +35,37 @@ def _domain_location_id(self):
     sent = fields.Boolean()
     name = fields.Char(
         index=True,
-        readonly=True,
-        states={"draft": [("readonly", False)]},
         copy=False,
         default=lambda self: _("New"),
     )
     origin = fields.Char(
         string="Source Document",
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
         help="Reference of the document that generated this RMA.",
     )
     date = fields.Datetime(
         default=fields.Datetime.now,
         index=True,
         required=True,
-        readonly=True,
-        states={"draft": [("readonly", False)]},
-    )
-    deadline = fields.Date(
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
     )
+    deadline = fields.Date()
     user_id = fields.Many2one(
         comodel_name="res.users",
         string="Responsible",
         index=True,
         tracking=True,
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
     )
     team_id = fields.Many2one(
         comodel_name="rma.team",
         string="RMA team",
         index=True,
-        states={
-            "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(
         string="Finalization Reason",
         comodel_name="rma.finalization",
         copy=False,
-        readonly=True,
         domain=(
             "['|', ('company_id', '=', False), ('company_id', '='," " company_id)]"
         ),
@@ -97,16 +74,10 @@ def _domain_location_id(self):
     company_id = fields.Many2one(
         comodel_name="res.company",
         default=lambda self: self.env.company,
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
     )
     partner_id = fields.Many2one(
         string="Customer",
         comodel_name="res.partner",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
         index=True,
         tracking=True,
     )
@@ -143,8 +114,6 @@ def _domain_location_id(self):
             "    ('partner_id', 'child_of', commercial_partner_id),"
             "]"
         ),
-        readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     move_id = fields.Many2one(
         comodel_name="stock.move",
@@ -187,18 +156,10 @@ def _domain_location_id(self):
     procurement_group_id = fields.Many2one(
         comodel_name="procurement.group",
         string="Procurement group",
-        readonly=True,
-        states={
-            "draft": [("readonly", False)],
-            "confirmed": [("readonly", False)],
-            "received": [("readonly", False)],
-        },
     )
     priority = fields.Selection(
         selection=PROCUREMENT_PRIORITIES,
         default="1",
-        readonly=True,
-        states={"draft": [("readonly", False)]},
     )
     operation_id = fields.Many2one(
         comodel_name="rma.operation",
@@ -222,12 +183,7 @@ def _domain_location_id(self):
         copy=False,
         tracking=True,
     )
-    description = fields.Html(
-        states={
-            "locked": [("readonly", True)],
-            "cancelled": [("readonly", True)],
-        },
-    )
+    description = fields.Html()
     # Reception fields
     location_id = fields.Many2one(
         comodel_name="stock.location",
@@ -249,12 +205,10 @@ def _domain_location_id(self):
     # Refund fields
     refund_id = fields.Many2one(
         comodel_name="account.move",
-        readonly=True,
         copy=False,
     )
     refund_line_id = fields.Many2one(
         comodel_name="account.move.line",
-        readonly=True,
         copy=False,
     )
     can_be_refunded = fields.Boolean(compute="_compute_can_be_refunded")
@@ -263,7 +217,6 @@ def _domain_location_id(self):
         comodel_name="stock.move",
         inverse_name="rma_id",
         string="Delivery reservation",
-        readonly=True,
         copy=False,
     )
     delivery_picking_count = fields.Integer(
@@ -275,11 +228,6 @@ def _domain_location_id(self):
         compute="_compute_delivered_qty",
         store=True,
     )
-    delivered_qty_done = fields.Float(
-        digits="Product Unit of Measure",
-        compute="_compute_delivered_qty",
-        compute_sudo=True,
-    )
     can_be_returned = fields.Boolean(
         compute="_compute_can_be_returned",
     )
@@ -297,11 +245,6 @@ def _domain_location_id(self):
         digits="Product Unit of Measure",
         compute="_compute_remaining_qty",
     )
-    remaining_qty_to_done = fields.Float(
-        string="Remaining delivered qty to done",
-        digits="Product Unit of Measure",
-        compute="_compute_remaining_qty",
-    )
     uom_category_id = fields.Many2one(
         related="product_id.uom_id.category_id", string="Category UoM"
     )
@@ -312,7 +255,6 @@ def _domain_location_id(self):
     origin_split_rma_id = fields.Many2one(
         comodel_name="rma",
         string="Extracted from",
-        readonly=True,
         copy=False,
     )
 
@@ -335,8 +277,7 @@ def _compute_delivery_picking_count(self):
         "delivery_move_ids.state",
         "delivery_move_ids.scrapped",
         "delivery_move_ids.product_uom_qty",
-        "delivery_move_ids.reserved_availability",
-        "delivery_move_ids.quantity_done",
+        "delivery_move_ids.quantity",
         "delivery_move_ids.product_uom",
         "product_uom",
     )
@@ -355,29 +296,21 @@ def _compute_delivered_qty(self):
         """
         for record in self:
             delivered_qty = 0.0
-            delivered_qty_done = 0.0
             for move in record.delivery_move_ids.filtered(
                 lambda r: r.state != "cancel" and not r.scrapped
             ):
-                if move.quantity_done:
-                    quantity_done = move.product_uom._compute_quantity(
-                        move.quantity_done, record.product_uom
-                    )
-                    if move.state == "done":
-                        delivered_qty_done += quantity_done
-                    delivered_qty += quantity_done
-                elif move.reserved_availability:
-                    delivered_qty += move.product_uom._compute_quantity(
-                        move.reserved_availability, record.product_uom
+                if move.quantity:
+                    quantity = move.product_uom._compute_quantity(
+                        move.quantity, record.product_uom
                     )
+                    delivered_qty += quantity
                 elif move.product_uom_qty:
                     delivered_qty += move.product_uom._compute_quantity(
                         move.product_uom_qty, record.product_uom
                     )
             record.delivered_qty = delivered_qty
-            record.delivered_qty_done = delivered_qty_done
 
-    @api.depends("product_uom_qty", "delivered_qty", "delivered_qty_done")
+    @api.depends("product_uom_qty", "delivered_qty")
     def _compute_remaining_qty(self):
         """Compute 'remaining_qty' and 'remaining_qty_to_done' fields.
 
@@ -392,7 +325,6 @@ def _compute_remaining_qty(self):
         """
         for r in self:
             r.remaining_qty = r.product_uom_qty - r.delivered_qty
-            r.remaining_qty_to_done = r.product_uom_qty - r.delivered_qty_done
 
     @api.depends(
         "state",
@@ -443,7 +375,7 @@ def _compute_can_be_finished(self):
                 and rma.remaining_qty > 0
             )
 
-    @api.depends("product_uom_qty", "state", "remaining_qty", "remaining_qty_to_done")
+    @api.depends("product_uom_qty", "state", "remaining_qty")
     def _compute_can_be_split(self):
         """Compute 'can_be_split'. This field controls the
         visibility of 'Split' button in the rma form view and
@@ -460,10 +392,10 @@ def _compute_can_be_split(self):
             else:
                 r.can_be_split = False
 
-    @api.depends("remaining_qty_to_done", "state")
+    @api.depends("state")
     def _compute_can_be_locked(self):
         for r in self:
-            r.can_be_locked = r.remaining_qty_to_done > 0 and r.state in [
+            r.can_be_locked = r.remaining_qty > 0 and r.state in [
                 "received",
                 "waiting_return",
                 "waiting_replacement",
@@ -612,34 +544,41 @@ def unlink(self):
     def _send_draft_email(self):
         """Send customer notifications they place the RMA from the portal"""
         for rma in self.filtered("company_id.send_rma_draft_confirmation"):
-            rma_template_id = rma.company_id.rma_mail_draft_confirmation_template_id.id
             rma.with_context(
                 force_send=True,
                 mark_rma_as_sent=True,
-                default_subtype_id=self.env.ref("rma.mt_rma_notification").id,
-            ).message_post_with_template(rma_template_id)
+            ).message_post_with_source(
+                rma.company_id.rma_mail_draft_confirmation_template_id.get_external_id()[
+                    rma.company_id.rma_mail_draft_confirmation_template_id.id
+                ],
+                subtype_xmlid="rma.mt_rma_notification",
+            )
 
     def _send_confirmation_email(self):
         """Auto send notifications"""
         for rma in self.filtered(lambda p: p.company_id.send_rma_confirmation):
-            rma_template_id = rma.company_id.rma_mail_confirmation_template_id.id
             rma.with_context(
                 force_send=True,
                 mark_rma_as_sent=True,
-                default_subtype_id=self.env.ref("rma.mt_rma_notification").id,
-            ).message_post_with_template(rma_template_id)
+            ).message_post_with_source(
+                rma.company_id.rma_mail_confirmation_template_id.get_external_id()[
+                    rma.company_id.rma_mail_confirmation_template_id.id
+                ],
+                subtype_xmlid="rma.mt_rma_notification",
+            )
 
     def _send_receipt_confirmation_email(self):
         """Send customer notifications when the products are received"""
         for rma in self.filtered("company_id.send_rma_receipt_confirmation"):
-            rma_template_id = (
-                rma.company_id.rma_mail_receipt_confirmation_template_id.id
-            )
             rma.with_context(
                 force_send=True,
                 mark_rma_as_sent=True,
-                default_subtype_id=self.env.ref("rma.mt_rma_notification").id,
-            ).message_post_with_template(rma_template_id)
+            ).message_post_with_source(
+                rma.company_id.rma_mail_receipt_confirmation_template_id.get_external_id()[
+                    rma.company_id.rma_mail_receipt_confirmation_template_id.id
+                ],
+                subtype_xmlid="rma.mt_rma_notification",
+            )
 
     # Action methods
     def action_rma_send(self):
@@ -682,6 +621,7 @@ def action_confirm(self):
                 reception_move = self._create_receptions_from_picking()
             else:
                 reception_move = self._create_receptions_from_product()
+            reception_move.picked = True
             self.write({"reception_move_id": reception_move.id, "state": "confirmed"})
             self._add_message_subscribe_partner()
             self._send_confirmation_email()
@@ -703,10 +643,10 @@ def action_refund(self):
                     (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(
+            refund.with_user(self.env.uid).message_post_with_source(
                 "mail.message_origin_link",
-                values={"self": refund, "origin": rmas},
-                subtype_id=self.env.ref("mail.mt_note").id,
+                render_values={"self": refund, "origin": rmas},
+                subtype_id=self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_note"),
             )
             for line in refund.invoice_line_ids:
                 line.rma_id.write(
@@ -1027,10 +967,10 @@ def _create_receptions_from_product(self):
         picking = self.env["stock.picking"].create(self._prepare_picking_vals())
         picking.action_confirm()
         picking.action_assign()
-        picking.message_post_with_view(
+        picking.message_post_with_source(
             "mail.message_origin_link",
-            values={"self": picking, "origin": self},
-            subtype_id=self.env.ref("mail.mt_note").id,
+            render_values={"self": picking, "origin": self},
+            subtype_id=self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_note"),
         )
         return picking.move_ids
 
@@ -1068,7 +1008,7 @@ def extract_quantity(self, qty, uom):
         self._ensure_can_be_split()
         self._ensure_qty_to_extract(qty, uom)
         self.product_uom_qty -= uom._compute_quantity(qty, self.product_uom)
-        if self.remaining_qty_to_done <= 0:
+        if self.remaining_qty <= 0:
             if self.state == "waiting_return":
                 self.state = "returned"
             elif self.state == "waiting_replacement":
@@ -1083,10 +1023,10 @@ def extract_quantity(self, qty, uom):
                 "origin_split_rma_id": self.id,
             }
         )
-        extracted_rma.message_post_with_view(
+        extracted_rma.message_post_with_source(
             "mail.message_origin_link",
-            values={"self": extracted_rma, "origin": self},
-            subtype_id=self.env.ref("mail.mt_note").id,
+            render_values={"self": extracted_rma, "origin": self},
+            subtype_id=self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_note"),
         )
         self.message_post(
             body=_(
@@ -1175,10 +1115,10 @@ def create_return(self, scheduled_date, qty=None, uom=None):
                 )
             picking.action_confirm()
             picking.action_assign()
-            picking.message_post_with_view(
+            picking.message_post_with_source(
                 "mail.message_origin_link",
-                values={"self": picking, "origin": rmas},
-                subtype_id=self.env.ref("mail.mt_note").id,
+                render_values={"self": picking, "origin": rmas},
+                subtype_id=self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_note"),
             )
         rmas_to_return.write({"state": "waiting_return"})
 
@@ -1234,7 +1174,7 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
                 % (
                     {
                         "move_id": new_move.id,
-                        "move_name": new_move.name_get()[0][1],
+                        "move_name": new_move.display_name,
                         "picking_id": new_move.picking_id.id,
                         "picking_name": new_move.picking_id.name,
                     }
@@ -1427,10 +1367,7 @@ def update_replaced_state(self):
         [stock.move]._action_cancel
         """
         rma = self.filtered(
-            lambda r: (
-                r.state == "waiting_replacement"
-                and 0 >= r.remaining_qty_to_done == r.remaining_qty
-            )
+            lambda r: (r.state == "waiting_replacement" and 0 >= r.remaining_qty)
         )
         if rma:
             rma.write({"state": "replaced"})
@@ -1438,7 +1375,7 @@ def update_replaced_state(self):
     def update_returned_state(self):
         """Invoked by [stock.move]._action_done"""
         rma = self.filtered(
-            lambda r: (r.state == "waiting_return" and r.remaining_qty_to_done <= 0)
+            lambda r: (r.state == "waiting_return" and r.remaining_qty <= 0)
         )
         if rma:
             rma.write({"state": "returned"})
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index 8d9925615..df6622bd6 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -59,7 +59,7 @@ def _action_done(self, cancel_backorder=False):
         """
         for move in self.filtered(lambda r: r.state not in ("done", "cancel")):
             rma_receiver = move.sudo().rma_receiver_ids
-            if rma_receiver and move.quantity_done != rma_receiver.product_uom_qty:
+            if rma_receiver and move.quantity != rma_receiver.product_uom_qty:
                 raise ValidationError(
                     _(
                         "The quantity done for the product '%(id)s' must "
diff --git a/rma/readme/CONTRIBUTORS.md b/rma/readme/CONTRIBUTORS.md
index 85856a266..36baf52b7 100644
--- a/rma/readme/CONTRIBUTORS.md
+++ b/rma/readme/CONTRIBUTORS.md
@@ -5,3 +5,5 @@
   - Víctor Martínez
 - Chafique Delli \<<chafique.delli@akretion.com>\>
 - Giovanni Serra - Ooops \<<giovanni@ooops404.com>\>
+- [APSL-Nagarro](https://www.apsl.tech):
+  - Antoni Marroig \<<amarroig@apsl.net>\>
diff --git a/rma/readme/USAGE.md b/rma/readme/USAGE.md
index 44e6093ee..3a5936089 100644
--- a/rma/readme/USAGE.md
+++ b/rma/readme/USAGE.md
@@ -14,7 +14,7 @@ To use this module, you need to:
     quantity to another RMA, preview the RMA in the website. All of
     these operations can be done by clicking on the buttons in the
     status bar.
-    - If you click on 'Refund' button, a refund will be created, and it
+    - If you click on 'To Refund' button, a refund will be created, and it
       will be accessible via the smart button labeled Refund. The RMA
       will be set automatically to 'Refunded' state when the refund is
       validated.
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index e5794af3c..d188deec8 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:4883b701d44a55d02e769bdbf411c649efc42341792b63e965630e712a6406d9
+!! source digest: sha256:9ca167b75e0dcd82a66217ef64dd006910f4feda1f408dbdf09ef43e6555eb22
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/17.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to manage <a class="reference external" href="https://en.wikipedia.org/wiki/Return_merchandise_authorization">Return Merchandise Authorization
@@ -434,8 +434,8 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
 replacement, split the RMA by extracting a part of the remaining
 quantity to another RMA, preview the RMA in the website. All of these
 operations can be done by clicking on the buttons in the status bar.<ul>
-<li>If you click on ‘Refund’ button, a refund will be created, and it
-will be accessible via the smart button labeled Refund. The RMA
+<li>If you click on ‘To Refund’ button, a refund will be created, and
+it will be accessible via the smart button labeled Refund. The RMA
 will be set automatically to ‘Refunded’ state when the refund is
 validated.</li>
 <li>If you click on ‘Replace’ or ‘Return to customer’ button instead,
@@ -523,6 +523,10 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 </li>
 <li>Chafique Delli &lt;<a class="reference external" href="mailto:chafique.delli&#64;akretion.com">chafique.delli&#64;akretion.com</a>&gt;</li>
 <li>Giovanni Serra - Ooops &lt;<a class="reference external" href="mailto:giovanni&#64;ooops404.com">giovanni&#64;ooops404.com</a>&gt;</li>
+<li><a class="reference external" href="https://www.apsl.tech">APSL-Nagarro</a>:<ul>
+<li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 89c6c56d6..743226e88 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -85,6 +85,8 @@ def _create_rma(self, partner=None, product=None, qty=None, location=None):
             vals["product_uom_qty"] = qty
         if location:
             vals["location_id"] = location.id
+
+        vals["user_id"] = self.env.user.id
         return self.env["rma"].create(vals)
 
     def _create_confirm_receive(
@@ -92,7 +94,7 @@ def _create_confirm_receive(
     ):
         rma = self._create_rma(partner, product, qty, location)
         rma.action_confirm()
-        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.quantity = rma.product_uom_qty
         rma.reception_move_id.picking_id._action_done()
         return rma
 
@@ -107,7 +109,7 @@ def _create_delivery(self):
             limit=1,
         )
         picking_form = Form(
-            recordp=self.env["stock.picking"].with_context(
+            record=self.env["stock.picking"].with_context(
                 default_picking_type_id=picking_type.id
             ),
             view="stock.view_picking_form",
@@ -124,7 +126,7 @@ def _create_delivery(self):
         picking = picking_form.save()
         picking.action_confirm()
         for move in picking.move_ids:
-            move.quantity_done = move.product_uom_qty
+            move.quantity = move.product_uom_qty
         picking.button_validate()
         return picking
 
@@ -157,7 +159,7 @@ def test_computed(self):
             limit=1,
         )
         picking_form = Form(
-            recordp=self.env["stock.picking"].with_context(
+            record=self.env["stock.picking"].with_context(
                 default_picking_type_id=outgoing_picking_type.id
             ),
             view="stock.view_picking_form",
@@ -203,13 +205,13 @@ def test_confirm_and_receive(self):
         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")
-        rma.reception_move_id.quantity_done = 9
+        rma.reception_move_id.quantity = 9
         with self.assertRaises(ValidationError):
             rma.reception_move_id.picking_id._action_done()
-        rma.reception_move_id.quantity_done = 10
+        rma.reception_move_id.quantity = 10
         rma.reception_move_id.picking_id._action_done()
         self.assertEqual(rma.reception_move_id.picking_id.state, "done")
-        self.assertEqual(rma.reception_move_id.quantity_done, 10)
+        self.assertEqual(rma.reception_move_id.quantity, 10)
         self.assertEqual(rma.state, "received")
 
     def test_cancel(self):
@@ -386,8 +388,6 @@ def test_replace(self):
         self.assertTrue(rma.can_be_replaced)
         self.assertEqual(rma.delivered_qty, 2)
         self.assertEqual(rma.remaining_qty, 8)
-        self.assertEqual(rma.delivered_qty_done, 0)
-        self.assertEqual(rma.remaining_qty_to_done, 10)
         first_move = rma.delivery_move_ids
         picking = first_move.picking_id
         # Replace again with another product with the remaining quantity
@@ -413,18 +413,13 @@ def test_replace(self):
         self.assertTrue(picking.state, "waiting")
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
-        self.assertEqual(rma.delivered_qty_done, 0)
-        self.assertEqual(rma.remaining_qty_to_done, 10)
         # remaining_qty is 0 but rma is not set to 'replaced' until
-        # remaining_qty_to_done is less than or equal to 0
-        first_move.quantity_done = 2
-        second_move.quantity_done = 8
+        first_move.quantity = 2
+        second_move.quantity = 8
         picking.button_validate()
         self.assertEqual(picking.state, "done")
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
-        self.assertEqual(rma.delivered_qty_done, 10)
-        self.assertEqual(rma.remaining_qty_to_done, 0)
         # The RMA is now in 'replaced' state
         self.assertEqual(rma.state, "replaced")
         self.assertFalse(rma.can_be_refunded)
@@ -457,18 +452,14 @@ def test_return_to_customer(self):
         self.assertTrue(rma.can_be_returned)
         self.assertEqual(rma.delivered_qty, 2)
         self.assertEqual(rma.remaining_qty, 8)
-        self.assertEqual(rma.delivered_qty_done, 0)
-        self.assertEqual(rma.remaining_qty_to_done, 10)
         first_move = rma.delivery_move_ids
         picking = first_move.picking_id
         # Validate the picking
-        first_move.quantity_done = 2
+        first_move.quantity = 2
         picking.button_validate()
         self.assertEqual(picking.state, "done")
         self.assertEqual(rma.delivered_qty, 2)
         self.assertEqual(rma.remaining_qty, 8)
-        self.assertEqual(rma.delivered_qty_done, 2)
-        self.assertEqual(rma.remaining_qty_to_done, 8)
         # Return the remaining quantity to the customer
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
@@ -479,21 +470,16 @@ def test_return_to_customer(self):
         delivery_wizard = delivery_form.save()
         delivery_wizard.action_deliver()
         second_move = rma.delivery_move_ids - first_move
-        second_move.quantity_done = 8
+        second_move.quantity = 8
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
-        self.assertEqual(rma.delivered_qty_done, 2)
-        self.assertEqual(rma.remaining_qty_to_done, 8)
         self.assertEqual(rma.state, "waiting_return")
         # remaining_qty is 0 but rma is not set to 'returned' until
-        # remaining_qty_to_done is less than or equal to 0
         picking_2 = second_move.picking_id
         picking_2.button_validate()
         self.assertEqual(picking_2.state, "done")
         self.assertEqual(rma.delivered_qty, 10)
         self.assertEqual(rma.remaining_qty, 0)
-        self.assertEqual(rma.delivered_qty_done, 10)
-        self.assertEqual(rma.remaining_qty_to_done, 0)
         # The RMA is now in 'returned' state
         self.assertEqual(rma.state, "returned")
         self.assertFalse(rma.can_be_refunded)
@@ -579,7 +565,7 @@ def test_mass_return_to_customer(self):
             self.assertEqual(rma.product_id, rma.delivery_move_ids.product_id)
             self.assertEqual(rma.product_uom_qty, rma.delivery_move_ids.product_uom_qty)
             self.assertEqual(rma.product_uom, rma.delivery_move_ids.product_uom)
-            rma.delivery_move_ids.quantity_done = rma.product_uom_qty
+            rma.delivery_move_ids.quantity = rma.product_uom_qty
         pick_1.button_validate()
         pick_2.button_validate()
         self.assertEqual(all_rmas.mapped("state"), ["returned"] * 4)
@@ -643,8 +629,8 @@ def test_rma_from_picking_return(self):
         self.assertTrue(reception_moves[1].rma_receiver_ids)
         self.assertEqual(reception_moves.mapped("rma_receiver_ids"), rmas)
         # Validate the reception picking to set rmas to 'received' state
-        reception_moves[0].quantity_done = reception_moves[0].product_uom_qty
-        reception_moves[1].quantity_done = reception_moves[1].product_uom_qty
+        reception_moves[0].quantity = reception_moves[0].product_uom_qty
+        reception_moves[1].quantity = reception_moves[1].product_uom_qty
         reception.button_validate()
         self.assertEqual(rmas.mapped("state"), ["received"] * 2)
 
@@ -658,7 +644,7 @@ def test_split(self):
         )
         rma = rma_form.save()
         rma.action_confirm()
-        rma.reception_move_id.quantity_done = 10
+        rma.reception_move_id.quantity = 10
         rma.reception_move_id.picking_id._action_done()
         # Return quantity 4 of the same product to the customer
         delivery_form = Form(
@@ -670,7 +656,7 @@ def test_split(self):
         delivery_form.product_uom_qty = 4
         delivery_wizard = delivery_form.save()
         delivery_wizard.action_deliver()
-        rma.delivery_move_ids.quantity_done = 4
+        rma.delivery_move_ids.quantity = 4
         rma.delivery_move_ids.picking_id.button_validate()
         self.assertEqual(rma.state, "waiting_return")
         # Extract the remaining quantity to another RMA
@@ -690,8 +676,6 @@ def test_split(self):
         self.assertEqual(new_rma.origin_split_rma_id, rma)
         self.assertEqual(new_rma.delivered_qty, 0)
         self.assertEqual(new_rma.remaining_qty, 6)
-        self.assertEqual(new_rma.delivered_qty_done, 0)
-        self.assertEqual(new_rma.remaining_qty_to_done, 6)
         self.assertEqual(new_rma.state, "received")
         self.assertTrue(new_rma.can_be_refunded)
         self.assertTrue(new_rma.can_be_returned)
@@ -699,8 +683,8 @@ def test_split(self):
         self.assertEqual(new_rma.move_id, rma.move_id)
         self.assertEqual(new_rma.reception_move_id, rma.reception_move_id)
         self.assertEqual(new_rma.product_uom_qty + rma.product_uom_qty, 10)
-        self.assertEqual(new_rma.move_id.quantity_done, 10)
-        self.assertEqual(new_rma.reception_move_id.quantity_done, 10)
+        self.assertEqual(new_rma.move_id.quantity, 10)
+        self.assertEqual(new_rma.reception_move_id.quantity, 10)
 
     def test_rma_to_receive_on_delete_invoice(self):
         rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
@@ -763,7 +747,7 @@ def test_autoconfirm_email(self):
         )
         # Now we'll confirm the incoming goods picking and the automatic
         # reception notification should be sent
-        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.quantity = rma.product_uom_qty
         rma.reception_move_id.picking_id.button_validate()
         mail_receipt = (
             self.env["mail.message"].search([("partner_ids", "in", self.partner.ids)])
diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index fbaa21b7b..a887024d1 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -5,154 +5,85 @@
         <field name="inherit_id" ref="stock.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath
-                expr="//div[@data-key='stock']/div[hasclass('o_settings_container')]"
+                expr="//block[@name='operations_setting_container']"
                 position="inside"
             >
-                <div class="col-12 col-lg-6 o_setting_box" title="Finish RMAs manually">
-                    <div class="o_setting_left_pane">
+                <setting
+                    title="Finish RMAs manually"
+                    help=" When the RMA is receive, allow to finsish it manually choosing a finalization reason."
+                >
                         <field name="group_rma_manual_finalization" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label
-                            for="group_rma_manual_finalization"
-                            string="RMA Manual Finalization"
-                        />
-                        <div class="text-muted">
-                            When the RMA is receive, allow to finsish it manually choosing
-                            a finalization reason.
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-lg-6 o_setting_box">
-                    <div class="o_setting_left_pane">
+                </setting>
+                <setting
+                    title="Values set here are company-specific."
+                    help="Group RMA returns by customer and warehouse."
+                >
                         <field name="rma_return_grouping" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="rma_return_grouping" />
-                        <span
-                            class="fa fa-lg fa-building-o"
-                            title="Values set here are company-specific."
-                            groups="base.group_multi_company"
-                        />
-                        <div class="text-muted">
-                            Group RMA returns by customer and warehouse.
-                        </div>
-                    </div>
-                </div>
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
+                </setting>
+                <setting
                     title="Send automatic RMA info to customer"
+                    help="When the RMA is confirmed, send an automatic information email."
                 >
-                    <div class="o_setting_left_pane">
                         <field name="send_rma_confirmation" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label
-                            for="send_rma_confirmation"
-                            string="RMA Confirmation Email"
-                        />
-                        <span
-                            class="fa fa-lg fa-building-o"
-                            title="Values set here are company-specific."
-                            groups="base.group_multi_company"
-                        />
-                        <div class="text-muted">
-                            When the RMA is confirmed, send an automatic information email.
-                        </div>
-                        <div
-                            class="row mt16"
-                            attrs="{'invisible': [('send_rma_confirmation', '=', False)]}"
-                        >
+                        <div class="row mt16" invisible="not send_rma_confirmation">
                             <label
-                                for="rma_mail_confirmation_template_id"
-                                string="Email Template"
-                                class="col-lg-4 o_light_label"
-                            />
+                            for="rma_mail_confirmation_template_id"
+                            string="Email Template"
+                            class="col-lg-4 o_light_label"
+                        />
                             <field
-                                name="rma_mail_confirmation_template_id"
-                                class="oe_inline"
-                                attrs="{'required': [('send_rma_confirmation', '=', True)]}"
-                                context="{'default_model': 'rma'}"
-                            />
+                            name="rma_mail_confirmation_template_id"
+                            class="oe_inline"
+                            required="send_rma_confirmation"
+                            context="{'default_model': 'rma'}"
+                        />
                         </div>
-                    </div>
-                </div>
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
+                </setting>
+                <setting
                     title="Send automatic RMA products reception notification to customer"
+                    help="When the RMA products are received, send an automatic information email."
                 >
-                    <div class="o_setting_left_pane">
                         <field name="send_rma_receipt_confirmation" />
-                    </div>
-                    <div class="o_setting_right_pane">
+                        <div
+                        class="row mt16"
+                        invisible="not send_rma_receipt_confirmation"
+                    >
                         <label
-                            for="send_rma_receipt_confirmation"
-                            string="RMA Receipt Confirmation Email"
+                            for="rma_mail_receipt_confirmation_template_id"
+                            string="Email Template"
+                            class="col-lg-4 o_light_label"
                         />
-                        <span
-                            class="fa fa-lg fa-building-o"
-                            title="Values set here are company-specific."
-                            groups="base.group_multi_company"
+
+                        <field
+                            name="rma_mail_receipt_confirmation_template_id"
+                            class="oe_inline"
+                            required="send_rma_receipt_confirmation"
+                            context="{'default_model': 'rma'}"
                         />
-                        <div class="text-muted">
-                            When the RMA products are received, send an automatic information email.
-                        </div>
-                        <div
-                            class="row mt16"
-                            attrs="{'invisible': [('send_rma_receipt_confirmation', '=', False)]}"
-                        >
-                            <label
-                                for="rma_mail_receipt_confirmation_template_id"
-                                string="Email Template"
-                                class="col-lg-4 o_light_label"
-                            />
-                            <field
-                                name="rma_mail_receipt_confirmation_template_id"
-                                class="oe_inline"
-                                attrs="{'required': [('send_rma_receipt_confirmation', '=', True)]}"
-                                context="{'default_model': 'rma'}"
-                            />
                         </div>
-                    </div>
-                </div>
-                <div
-                    class="col-12 col-lg-6 o_setting_box"
+                </setting>
+                <setting
                     title="Send automatic notification when the customer places an RMA"
+                    help="When customers themselves place an RMA from the portal, send an automatic notification acknowleging it."
                 >
-                    <div class="o_setting_left_pane">
                         <field name="send_rma_draft_confirmation" />
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label
-                            for="send_rma_draft_confirmation"
-                            string="RMA draft notification Email"
-                        />
-                        <span
-                            class="fa fa-lg fa-building-o"
-                            title="Values set here are company-specific."
-                            groups="base.group_multi_company"
-                        />
-                        <div class="text-muted">
-                            When customers themselves place an RMA from the portal, send an automatic notification acknowleging it.
-                        </div>
                         <div
-                            class="row mt16"
-                            attrs="{'invisible': [('send_rma_draft_confirmation', '=', False)]}"
-                        >
+                        class="row mt16"
+                        invisible="not send_rma_draft_confirmation"
+                    >
                             <label
-                                for="rma_mail_draft_confirmation_template_id"
-                                string="Email Template"
-                                class="col-lg-4 o_light_label"
-                            />
+                            for="rma_mail_draft_confirmation_template_id"
+                            string="Email Template"
+                            class="col-lg-4 o_light_label"
+                        />
                             <field
-                                name="rma_mail_draft_confirmation_template_id"
-                                class="oe_inline"
-                                attrs="{'required': [('send_rma_draft_confirmation', '=', True)]}"
-                                context="{'default_model': 'rma'}"
-                            />
+                            name="rma_mail_draft_confirmation_template_id"
+                            class="oe_inline"
+                            required="send_rma_draft_confirmation"
+                            context="{'default_model': 'rma'}"
+                        />
                         </div>
-                    </div>
-                </div>
+                </setting>
             </xpath>
         </field>
     </record>
diff --git a/rma/views/res_partner_views.xml b/rma/views/res_partner_views.xml
index 6eb1f4616..ea77b50c3 100644
--- a/rma/views/res_partner_views.xml
+++ b/rma/views/res_partner_views.xml
@@ -14,7 +14,7 @@
                     type="object"
                     class="oe_stat_button"
                     icon="fa-reply"
-                    attrs="{'invisible': [('rma_count', '=', 0)]}"
+                    invisible="rma_count == 0"
                     groups="rma.rma_group_user_own"
                 >
                     <field name="rma_count" widget="statinfo" string="RMA" />
diff --git a/rma/views/rma_finalization_views.xml b/rma/views/rma_finalization_views.xml
index 3772660b8..463a74e4a 100644
--- a/rma/views/rma_finalization_views.xml
+++ b/rma/views/rma_finalization_views.xml
@@ -28,7 +28,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                     <group>
                         <field name="name" />
diff --git a/rma/views/rma_team_views.xml b/rma/views/rma_team_views.xml
index f3454c49c..0ae66c788 100644
--- a/rma/views/rma_team_views.xml
+++ b/rma/views/rma_team_views.xml
@@ -10,7 +10,7 @@
                 <field name="name" />
                 <field name="user_id" />
                 <field name="company_id" groups="base.group_multi_company" />
-                <field name="company_id" invisible="1" />
+                <field name="company_id" column_invisible="1" />
             </tree>
         </field>
     </record>
@@ -81,11 +81,7 @@
                                 </kanban>
                             </field>
                         </page>
-                        <page
-                            name="emails"
-                            string="Email"
-                            attrs="{'invisible': [('alias_domain', '=', False)]}"
-                        >
+                        <page name="emails" string="Email" invisible="not alias_domain">
                             <group name="group_alias">
                                 <label for="alias_name" string="Email Alias" />
                                 <div name="alias_def">
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 8ad666162..5fe316095 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -120,73 +120,73 @@
                         type="object"
                         string="Send by Email"
                         name="action_rma_send"
-                        attrs="{'invisible':['|', ('sent','=',True), ('state', 'not in', ['draft', 'confirmed', 'received'])]}"
+                        invisible="sent or state not in ['draft', 'confirmed', 'received']"
                         class="btn-primary"
                     />
                     <button
                         type="object"
                         string="Send by Mail"
                         name="action_rma_send"
-                        attrs="{'invisible':['|', ('sent','=',False), ('state', 'not in', ['draft', 'confirmed', 'received'])]}"
+                        invisible="not sent or state not in  ['draft', 'confirmed', 'received']"
                     />
                     <button
                         type="object"
                         string="Confirm"
                         name="action_confirm"
-                        states="draft"
+                        invisible="state != 'draft'"
                         class="btn-primary"
                     />
                     <button
                         type="object"
                         string="To Refund"
                         name="action_refund"
-                        attrs="{'invisible': [('can_be_refunded', '=', False)]}"
+                        invisible="not can_be_refunded"
                         class="btn-primary"
                     />
                     <button
                         type="object"
                         string="Replace"
                         name="action_replace"
-                        attrs="{'invisible': [('can_be_replaced', '=', False)]}"
+                        invisible="not can_be_replaced"
                         class="btn-primary"
                     />
                     <button
                         type="object"
                         string="Return to customer"
                         name="action_return"
-                        attrs="{'invisible': [('can_be_returned', '=', False)]}"
+                        invisible="not can_be_returned"
                         class="btn-primary"
                     />
                     <button
                         type="object"
                         string="Split"
                         name="action_split"
-                        attrs="{'invisible': [('can_be_split', '=', False)]}"
+                        invisible="not can_be_split"
                     />
                     <button
                         type="object"
                         string="Cancel"
                         name="action_cancel"
                         confirm="Are you sure you want to cancel this RMA"
-                        states="draft,confirmed"
+                        invisible="state not in ['draft', 'confirmed']"
                     />
                     <button
                         type="object"
                         string="Set to draft"
                         name="action_draft"
-                        states="cancelled"
+                        invisible="state != 'cancelled'"
                     />
                     <button
                         type="object"
                         string="Lock"
                         name="action_lock"
-                        attrs="{'invisible': [('can_be_locked', '=', False)]}"
+                        invisible="not can_be_locked"
                     />
                     <button
                         type="object"
                         string="Unlock"
                         name="action_unlock"
-                        states="locked"
+                        invisible="state != 'locked'"
                     />
                     <button type="object" string="Preview" name="action_preview" />
                     <field
@@ -203,7 +203,7 @@
                             string="Receipt"
                             class="oe_stat_button"
                             icon="fa-truck"
-                            attrs="{'invisible': [('reception_move_id', '=', False)]}"
+                            invisible="not reception_move_id"
                         >
                         </button>
                         <button
@@ -211,7 +211,7 @@
                             name="action_view_delivery"
                             class="oe_stat_button"
                             icon="fa-truck"
-                            attrs="{'invisible': [('delivery_picking_count', '=', 0)]}"
+                            invisible="delivery_picking_count == 0"
                         >
                             <field
                                 name="delivery_picking_count"
@@ -225,13 +225,13 @@
                             name="action_view_refund"
                             class="oe_stat_button"
                             icon="fa-pencil-square-o"
-                            attrs="{'invisible': [('refund_id', '=', False)]}"
+                            invisible="not refund_id"
                         >
                         </button>
                     </div>
                     <div class="oe_title">
                         <h1>
-                            <field name="name" readonly="1" />
+                            <field name="name" readonly="state != 'draft'" />
                         </h1>
                     </div>
                     <group>
@@ -240,101 +240,133 @@
                                 name="partner_id"
                                 widget="res_partner_many2one"
                                 context="{'search_default_customer':1, 'show_address': 1, 'show_vat': True}"
-                                attrs="{'readonly': [('state', '!=', 'draft')]}"
+                                readonly="state != 'draft'"
                                 options="{'always_reload': True}"
                             />
                             <field
                                 name="partner_shipping_id"
-                                attrs="{'readonly': [('state', '!=', 'draft')]}"
+                                readonly="state != 'draft'"
                                 force_save="1"
                             />
                             <field
                                 name="partner_invoice_id"
-                                attrs="{'readonly': [('state', 'not in', ['draft', 'confirmed', 'received'])]}"
+                                readonly="state not in ['draft', 'confirmed', 'received']"
                                 force_save="1"
                             />
-                            <field name="picking_id" options="{'no_create': True}" />
+                            <field
+                                name="picking_id"
+                                options="{'no_create': True}"
+                                readonly="state != 'draft'"
+                            />
                             <field
                                 name="move_id"
-                                attrs="{'required': [('picking_id', '!=', False)], 'readonly': ['|', ('picking_id', '=', False), ('state', '!=', 'draft')]}"
+                                required="picking_id"
+                                readonly="not picking_id or state != 'draft'"
                                 options="{'no_create': True}"
                                 force_save="1"
                             />
                             <field
                                 name="product_id"
                                 force_save="1"
-                                attrs="{'readonly': ['|', ('picking_id', '!=', False), ('state', '!=', 'draft')]}"
+                                readonly="picking_id or state != 'draft'"
                             />
                             <field name="uom_category_id" invisible="1" />
                             <label for="product_uom_qty" />
                             <div class="o_row">
                                 <field
                                     name="product_uom_qty"
-                                    attrs="{'readonly': [('state', '!=', 'draft')]}"
+                                    readonly="state != 'draft'"
                                     force_save="1"
                                 />
                                 <field
                                     name="product_uom"
                                     groups="uom.group_uom"
                                     domain="[('category_id', '=', uom_category_id)]"
-                                    attrs="{'readonly': [('state', '!=', 'draft')]}"
+                                    readonly="state != 'draft'"
                                     force_save="1"
                                 />
                                 <field name="product_uom" invisible="1" />
                             </div>
                             <field
                                 name="delivered_qty"
-                                attrs="{'invisible': [('delivered_qty', '=', 0.0)]}"
+                                invisible="delivered_qty == 0.0"
                             />
                         </group>
                         <group>
-                            <field name="date" />
-                            <field name="user_id" />
-                            <field name="team_id" />
+                            <field name="date" readonly="state != 'draft'" />
+                            <field
+                                name="user_id"
+                                readonly="state in ['locked', 'cancelled']"
+                            />
+                            <field
+                                name="team_id"
+                                readonly="state in ['locked', 'cancelled']"
+                            />
                             <field
                                 name="tag_ids"
                                 widget="many2many_tags"
                                 options="{'color_field': 'color', 'no_create_edit': True}"
                                 placeholder="Tags..."
                             />
-                            <field name="origin" />
+                            <field
+                                name="origin"
+                                readonly="state in ['locked', 'cancelled']"
+                            />
                             <field name="operation_id" />
                             <field
                                 name="finalization_id"
-                                attrs="{'invisible': [('state', '!=', 'finished')]}"
+                                readonly="1"
+                                invisible="state != 'finished'"
                             />
                             <field
                                 name="company_id"
                                 options="{'no_create': True}"
                                 groups="base.group_multi_company"
+                                readonly="state in ['locked', 'cancelled']"
+                            />
+                            <field
+                                name="company_id"
+                                invisible="1"
+                                readonly="state in ['locked', 'cancelled']"
                             />
-                            <field name="company_id" invisible="1" />
                         </group>
                     </group>
                     <notebook>
                         <page name="page_other" string="Other Information">
                             <group>
                                 <group>
-                                    <field name="procurement_group_id" />
+                                    <field
+                                        name="procurement_group_id"
+                                        readonly="state not in ['draft', 'confirmed', 'received']"
+                                    />
                                     <field
                                         name="location_id"
                                         options="{'no_create': True, 'no_open': True}"
                                         groups="stock.group_stock_multi_locations"
-                                        attrs="{'readonly': [('state', '!=', 'draft')]}"
+                                        readonly="state != 'draft'"
                                     />
                                     <field name="location_id" invisible="1" />
                                 </group>
                                 <group>
-                                    <field name="deadline" />
-                                    <field name="priority" widget="priority" />
                                     <field
-                                        name="origin_split_rma_id"
-                                        attrs="{'invisible': [('origin_split_rma_id', '=', False)]}"
+                                        name="deadline"
+                                        readonly="state in ['locked', 'cancelled']"
                                     />
+                                    <field
+                                        name="priority"
+                                        widget="priority"
+                                        readonly="state != 'draft'"
+                                    />
+                                    <field name="origin_split_rma_id" invisible="1" />
                                 </group>
                             </group>
                             <group>
-                                <field name="description" widget="html" colspan="4" />
+                                <field
+                                    name="description"
+                                    widget="html"
+                                    colspan="4"
+                                    readonly="state in ['locked', 'cancelled']"
+                                />
                             </group>
                         </page>
                     </notebook>
@@ -371,7 +403,7 @@
                     string="Finish"
                     name="action_finish"
                     class="btn-primary"
-                    attrs="{'invisible': [('can_be_finished', '=', False)]}"
+                    invisible="not can_be_finished"
                     groups="rma.group_rma_manual_finalization"
                 />
             </xpath>
@@ -392,7 +424,7 @@
         <field name="name">rma.calendar</field>
         <field name="model">rma</field>
         <field name="arch" type="xml">
-            <calendar date_start="date" mode="month" color="state" quick_add="False">
+            <calendar date_start="date" mode="month" color="state">
                 <field name="name" />
                 <field name="partner_id" />
                 <field name="product_id" />
diff --git a/rma/views/stock_picking_views.xml b/rma/views/stock_picking_views.xml
index 16022033f..955a94399 100644
--- a/rma/views/stock_picking_views.xml
+++ b/rma/views/stock_picking_views.xml
@@ -13,7 +13,7 @@
                     type="object"
                     class="oe_stat_button"
                     icon="fa-reply"
-                    attrs="{'invisible': [('rma_count', '=', 0)]}"
+                    invisible="rma_count == 0"
                     groups="rma.rma_group_user_own"
                 >
                     <field name="rma_count" widget="statinfo" string="RMA" />
diff --git a/rma/wizard/rma_delivery_views.xml b/rma/wizard/rma_delivery_views.xml
index ae0cf63af..3209002f6 100644
--- a/rma/wizard/rma_delivery_views.xml
+++ b/rma/wizard/rma_delivery_views.xml
@@ -11,37 +11,26 @@
                 <group>
                     <group>
                         <field name="scheduled_date" />
-                        <field
-                            name="warehouse_id"
-                            attrs="{'invisible': [('type', '!=', 'replace')]}"
-                        />
+                        <field name="warehouse_id" invisible="type != 'replace'" />
                         <field
                             name="rma_return_grouping"
-                            attrs="{'invisible': ['|', ('type', '=', 'replace'), ('rma_count', '=', 1)]}"
+                            invisible="type == 'replace' or rma_count == 1"
                         />
                     </group>
                     <group>
                         <field name="uom_category_id" invisible="1" />
                         <field
                             name="product_id"
-                            attrs="{'invisible': ['|', ('type', '!=', 'replace'), ('rma_count', '>', 1)], 'required': [('type', '=', 'replace'), ('rma_count', '=', 1)]}"
-                        />
-                        <label
-                            for="product_uom_qty"
-                            attrs="{'invisible': [('rma_count', '>', 1)]}"
+                            invisible="type != 'replace' or rma_count > 1"
+                            required="type == 'replace' and rma_count == 1"
                         />
-                        <div
-                            class="o_row"
-                            attrs="{'invisible': [('rma_count', '>', 1)]}"
-                        >
-                            <field
-                                name="product_uom_qty"
-                                attrs="{'required': [('rma_count', '=', 1)]}"
-                            />
+                        <label for="product_uom_qty" invisible="rma_count > 1" />
+                        <div class="o_row" invisible="rma_count > 1">
+                            <field name="product_uom_qty" required="rma_count == 1" />
                             <field
                                 name="product_uom"
                                 groups="uom.group_uom"
-                                attrs="{'required': [('rma_count', '=', 1)]}"
+                                required="rma_count == 1"
                                 domain="[('category_id', '=', uom_category_id)]"
                             />
                             <field name="product_uom" invisible="1" />
diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
index fbd467227..271f83c9f 100644
--- a/rma/wizard/stock_picking_return_views.xml
+++ b/rma/wizard/stock_picking_return_views.xml
@@ -12,7 +12,7 @@
                 <group name="group_rma">
                     <field
                         name="create_rma"
-                        attrs="{'invisible': [('picking_type_code', '!=', 'outgoing')]}"
+                        invisible="picking_type_code != 'outgoing'"
                     />
                     <field name="rma_location_ids" invisible="1" />
                     <field name="picking_id" invisible="1" />

From f8e05b4d235dda6e909e8a7ea7998e98055abd78 Mon Sep 17 00:00:00 2001
From: Joshua Lauer <joshua.lauer@raumschmiede.de>
Date: Thu, 16 May 2024 13:09:43 +0200
Subject: [PATCH 089/108] [FIX] uom_id in RMA report

[BOT] post-merge updates
---
 rma/README.rst                    | 2 +-
 rma/__manifest__.py               | 2 +-
 rma/static/description/index.html | 2 +-
 rma/views/report_rma.xml          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index 431881790..708f09810 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -7,7 +7,7 @@ Return Merchandise Authorization Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:9ca167b75e0dcd82a66217ef64dd006910f4feda1f408dbdf09ef43e6555eb22
+   !! source digest: sha256:61dcae986b704601fd48af9bba9cc2829a2a17721b9c4b183c817dc7336255ab
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 709d3ffdd..2a4fae66f 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "17.0.1.0.0",
+    "version": "17.0.1.1.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index d188deec8..8959a6e80 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:9ca167b75e0dcd82a66217ef64dd006910f4feda1f408dbdf09ef43e6555eb22
+!! source digest: sha256:61dcae986b704601fd48af9bba9cc2829a2a17721b9c4b183c817dc7336255ab
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/17.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to manage <a class="reference external" href="https://en.wikipedia.org/wiki/Return_merchandise_authorization">Return Merchandise Authorization
diff --git a/rma/views/report_rma.xml b/rma/views/report_rma.xml
index 4c1af5e7f..9b2978e47 100644
--- a/rma/views/report_rma.xml
+++ b/rma/views/report_rma.xml
@@ -110,9 +110,9 @@
                     </div>
                     <div t-if="doc.product_id" class="col-auto mw-100 mb-2">
                         <strong>Quantity:</strong>
-                        <p class="m-0" t-field="doc.product_uom_qty">
+                        <p class="m-0">
                             <span t-field="doc.product_uom_qty" />
-                            <span t-field="doc.uom_id" groups="uom.group_uom" />
+                            <span t-field="doc.product_uom" groups="uom.group_uom" />
                         </p>
                     </div>
                     <div t-if="doc.delivered_qty" class="col-auto mw-100 mb-2">

From bba264e4d1cf487e69f84969836524634a9977eb Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Fri, 17 May 2024 06:27:53 +0000
Subject: [PATCH 090/108] Translated using Weblate (Italian)

Currently translated at 100.0% (348 of 348 strings)

Translation: rma-17.0/rma-17.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma/it/
---
 rma/i18n/it.po | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 35d02ae6d..cf32415d0 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-04-03 12:43+0000\n"
+"PO-Revision-Date: 2024-05-17 09:34+0000\n"
 "Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -533,17 +533,17 @@ msgstr "Alias contatto sicurezza"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain_id
 msgid "Alias Domain"
-msgstr ""
+msgstr "Dominio alias"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_domain
 msgid "Alias Domain Name"
-msgstr ""
+msgstr "Nome dominio alias"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_full_name
 msgid "Alias Email"
-msgstr ""
+msgstr "E-mail alias"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_name
@@ -553,12 +553,12 @@ msgstr "Nome alias"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_status
 msgid "Alias Status"
-msgstr ""
+msgstr "Stato alias"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_status
 msgid "Alias status assessed on the last message received."
-msgstr ""
+msgstr "Stato alias valutato sull'ultimo messaggio ricevuto."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_model_id
@@ -897,7 +897,7 @@ msgstr "Modello di email di conferma della ricezione per RMA"
 #. module: rma
 #: model:ir.model.fields,help:rma.field_rma_team__alias_domain
 msgid "Email domain e.g. 'example.com' in 'odoo@example.com'"
-msgstr ""
+msgstr "Dominio e-mail es 'example.com' in 'odoo@example.com'"
 
 #. module: rma
 #: model:ir.model.fields,help:rma.field_res_company__rma_mail_confirmation_template_id
@@ -1143,7 +1143,7 @@ msgstr "RMA in ritardo"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_team__alias_incoming_local
 msgid "Local-part based incoming detection"
-msgstr ""
+msgstr "Rilevamento arrivo in base a parte-locale"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__location_id
@@ -2193,7 +2193,7 @@ msgstr "Utente: solo i propri documenti"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form
 msgid "Values set here are company-specific."
-msgstr ""
+msgstr "I valori impostati qui sono specifici per azienda."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__waiting_replacement
@@ -2250,6 +2250,8 @@ msgid ""
 "When the RMA is receive, allow to finsish it manually choosing a "
 "finalization reason."
 msgstr ""
+"Quando si riceve l'RMA, consente di chiuderlo manualmente scegliendo un "
+"motivo per la chiusura."
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.res_config_settings_view_form

From b17e230233b5a492bece59d3696e17be1184769c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Fri, 28 Jun 2024 08:46:45 +0200
Subject: [PATCH 091/108] [FIX] rma: Make the quantity comparison correctly
 (with precision_digits)

Fixes https://github.com/OCA/rma/issues/398
---
 rma/models/stock_move.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index df6622bd6..56579b492 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -3,6 +3,7 @@
 
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
+from odoo.tools import float_compare
 
 
 class StockMove(models.Model):
@@ -59,7 +60,18 @@ def _action_done(self, cancel_backorder=False):
         """
         for move in self.filtered(lambda r: r.state not in ("done", "cancel")):
             rma_receiver = move.sudo().rma_receiver_ids
-            if rma_receiver and move.quantity != rma_receiver.product_uom_qty:
+            qty_prec = self.env["decimal.precision"].precision_get(
+                "Product Unit of Measure"
+            )
+            if (
+                rma_receiver
+                and float_compare(
+                    move.quantity,
+                    rma_receiver.product_uom_qty,
+                    precision_digits=qty_prec,
+                )
+                != 0
+            ):
                 raise ValidationError(
                     _(
                         "The quantity done for the product '%(id)s' must "

From 6fcbf17e2170676c44aaf6a2103ecd4e09945e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Fri, 28 Jun 2024 09:12:03 +0200
Subject: [PATCH 092/108] [FIX] rma: Change code to get the correct rmas
 (move_ids.rma_ids)

[BOT] post-merge updates
---
 rma/README.rst                    | 2 +-
 rma/__manifest__.py               | 2 +-
 rma/models/stock_picking.py       | 4 ++--
 rma/static/description/index.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index 708f09810..ac9627813 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -7,7 +7,7 @@ Return Merchandise Authorization Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:61dcae986b704601fd48af9bba9cc2829a2a17721b9c4b183c817dc7336255ab
+   !! source digest: sha256:ed3081bf9b94660a0e6b35acbc7a874023c57e4bc3a87f3762eabbb1c75ce2f4
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 2a4fae66f..044f3d6f6 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "17.0.1.1.0",
+    "version": "17.0.1.1.1",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/models/stock_picking.py b/rma/models/stock_picking.py
index edbc03008..070cdabd1 100644
--- a/rma/models/stock_picking.py
+++ b/rma/models/stock_picking.py
@@ -30,8 +30,8 @@ def copy(self, default=None):
 
     def action_view_rma(self):
         self.ensure_one()
-        action = self.sudo().env.ref("rma.rma_action").read()[0]
-        rma = self.move_ids.mapped("rma_ids")
+        action = self.env["ir.actions.act_window"]._for_xml_id("rma.rma_action")
+        rma = self.move_ids.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 8959a6e80..e59c143bc 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:61dcae986b704601fd48af9bba9cc2829a2a17721b9c4b183c817dc7336255ab
+!! source digest: sha256:ed3081bf9b94660a0e6b35acbc7a874023c57e4bc3a87f3762eabbb1c75ce2f4
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/17.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to manage <a class="reference external" href="https://en.wikipedia.org/wiki/Return_merchandise_authorization">Return Merchandise Authorization

From b3d9634e3737d2d55dc57ca1eb77ead22b3c3219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Fri, 28 Jun 2024 12:53:28 +0200
Subject: [PATCH 093/108] [FIX] rma: Add location_id field for the expected
 behavior

The location_id field is important and its value is required, we need to add it
to the wizard (even if it is hidden) so that it is saved and the picking is
created correctly.

Before, the location_id value was only saved (although the field was not in the
wizard) if the user had the "Technical / Manage Multiple Stock Locations" permission.
---
 rma/wizard/stock_picking_return_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
index 271f83c9f..983815eb3 100644
--- a/rma/wizard/stock_picking_return_views.xml
+++ b/rma/wizard/stock_picking_return_views.xml
@@ -17,6 +17,7 @@
                     <field name="rma_location_ids" invisible="1" />
                     <field name="picking_id" invisible="1" />
                     <field name="picking_type_code" invisible="1" />
+                    <field name="location_id" invisible="1" />
                 </group>
             </field>
         </field>

From 90ce4f4201edbbd9024c715c34c7f16cc6e43535 Mon Sep 17 00:00:00 2001
From: Michael Tietz <mtietz@mt-software.de>
Date: Tue, 16 Apr 2024 00:08:46 +0200
Subject: [PATCH 094/108] [IMP] rma: use only procurement.group run to create
 stock transfers

Extra changes:
- Change reception_move_ids to reception_move_id
- Add test_rma_replace_pick_ship
- Code and method reduction to simplify logic
- Set route_ids (in/out) from procurements

Co-authored-by: Michael Tietz

TT48789

[UPD] Update rma.pot

[BOT] post-merge updates

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-17.0/rma-17.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma/
---
 rma/README.rst                              |   7 +-
 rma/__manifest__.py                         |   2 +-
 rma/hooks.py                                |  13 +-
 rma/i18n/de.po                              |  22 +
 rma/i18n/de_AT.po                           |  22 +
 rma/i18n/es.po                              |  22 +
 rma/i18n/fr.po                              |  22 +
 rma/i18n/it.po                              |  22 +
 rma/i18n/nl.po                              |  22 +
 rma/i18n/pt.po                              |  22 +
 rma/i18n/pt_BR.po                           |  22 +
 rma/i18n/rma.pot                            |  22 +
 rma/i18n/ro.po                              |  22 +
 rma/i18n/zh_CN.po                           |  22 +
 rma/migrations/17.0.1.2.0/post-migration.py |  17 +
 rma/models/res_partner.py                   |   2 +-
 rma/models/rma.py                           | 517 +++++++++-----------
 rma/models/stock_move.py                    |  49 +-
 rma/models/stock_warehouse.py               | 125 ++++-
 rma/readme/CONTRIBUTORS.md                  |   1 +
 rma/readme/ROADMAP.md                       |   3 +
 rma/static/description/index.html           |   6 +-
 rma/tests/test_rma.py                       |  99 +++-
 rma/wizard/stock_picking_return.py          | 103 +++-
 24 files changed, 814 insertions(+), 372 deletions(-)
 create mode 100644 rma/migrations/17.0.1.2.0/post-migration.py

diff --git a/rma/README.rst b/rma/README.rst
index ac9627813..8c5cfc4b1 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -7,7 +7,7 @@ Return Merchandise Authorization Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ed3081bf9b94660a0e6b35acbc7a874023c57e4bc3a87f3762eabbb1c75ce2f4
+   !! source digest: sha256:8f36869aece97a0f6af8aa5d76b446e9cf0bd589d914c1f5e12c628e87317021
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -140,6 +140,9 @@ Known issues / Roadmap
 -  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 the product of that move is.
+-  Add RMA reception and/or RMA delivery on several steps - 2 or 3 -
+   like normal receptions/deliveries. It should be a separate option
+   inside the warehouse definition.
 
 Bug Tracker
 ===========
@@ -175,6 +178,8 @@ Contributors
 
    -  Antoni Marroig <amarroig@apsl.net>
 
+-  Michael Tietz (MT Software) mtietz@mt-software.de
+
 Maintainers
 -----------
 
diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 044f3d6f6..087e4e4fc 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "17.0.1.1.1",
+    "version": "17.0.2.0.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/hooks.py b/rma/hooks.py
index 5b46f9aa8..f9995950c 100644
--- a/rma/hooks.py
+++ b/rma/hooks.py
@@ -1,4 +1,5 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 
@@ -20,7 +21,9 @@ def _get_next_picking_type_color():
     def create_rma_locations(warehouse):
         stock_location = env["stock.location"]
         if not warehouse.rma_loc_id:
-            rma_location_vals = warehouse._get_rma_location_values()
+            rma_location_vals = warehouse._get_rma_location_values(
+                {"company_id": warehouse.company_id.id}, warehouse.code
+            )
             warehouse.rma_loc_id = (
                 stock_location.with_context(active_test=False)
                 .create(rma_location_vals)
@@ -57,11 +60,19 @@ def create_rma_picking_types(whs):
         whs.rma_in_type_id.return_picking_type_id = whs.rma_out_type_id.id
         whs.rma_out_type_id.return_picking_type_id = whs.rma_in_type_id.id
 
+    def create_rma_routes(warehouses):
+        """Create initially rma in/out stock.location.routes and stock.rules"""
+        warehouses = warehouses.with_context(rma_post_init_hook=True)
+        for wh in warehouses:
+            route_vals = wh._create_or_update_route()
+            wh.write(route_vals)
+
     # Create rma locations and picking types
     warehouses = env["stock.warehouse"].search([])
     for warehouse in warehouses:
         create_rma_locations(warehouse)
         create_rma_picking_types(warehouse)
+    create_rma_routes(warehouses)
     # Create rma sequence per company
     for company in env["res.company"].search([]):
         company.create_rma_index()
diff --git a/rma/i18n/de.po b/rma/i18n/de.po
index ee52923ed..d56857dfa 100644
--- a/rma/i18n/de.po
+++ b/rma/i18n/de.po
@@ -1531,11 +1531,21 @@ msgstr "Automatische RMA-Kundenbenachrichtigungen"
 msgid "RMA count"
 msgstr "RMA-Zählung"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr "RMA im Entwurfszustand"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1735,6 +1745,11 @@ msgstr ""
 msgid "Return Picking"
 msgstr "Inbound Kommissionierung"
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1758,6 +1773,13 @@ msgstr ""
 msgid "Returned"
 msgstr "Ist zurückgekommen"
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/i18n/de_AT.po b/rma/i18n/de_AT.po
index 4b9eed1c0..9634e9275 100644
--- a/rma/i18n/de_AT.po
+++ b/rma/i18n/de_AT.po
@@ -1445,11 +1445,21 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1641,6 +1651,11 @@ msgstr ""
 msgid "Return Picking"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1662,6 +1677,13 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index 36ae0fd07..d0ab9f741 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -1598,11 +1598,21 @@ msgstr "Notificaciones automáticas de RMA"
 msgid "RMA count"
 msgstr "Cantidad de RMAs"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr "RMA en estado borrador"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1803,6 +1813,11 @@ msgstr "Lugar de devolución"
 msgid "Return Picking"
 msgstr "Albarán de devolución"
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1826,6 +1841,13 @@ msgstr ""
 msgid "Returned"
 msgstr "Devuelto"
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/i18n/fr.po b/rma/i18n/fr.po
index 021e4f55b..eb99d5894 100644
--- a/rma/i18n/fr.po
+++ b/rma/i18n/fr.po
@@ -1584,11 +1584,21 @@ msgstr "Notifications RMA automatiques au client"
 msgid "RMA count"
 msgstr "Nombre de RMA"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr "RMA au statut brouillon"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1789,6 +1799,11 @@ msgstr "Emplacement de retour"
 msgid "Return Picking"
 msgstr "Ordres de retour"
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1812,6 +1827,13 @@ msgstr ""
 msgid "Returned"
 msgstr "Retourné"
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index cf32415d0..885e6662e 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -1591,11 +1591,21 @@ msgstr "Notifiche automatiche ai clienti RMA"
 msgid "RMA count"
 msgstr "Conteggio RMA"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr "RMA in stato bozza"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1795,6 +1805,11 @@ msgstr "Ubicazione di reso"
 msgid "Return Picking"
 msgstr "Prelievo di reso"
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1818,6 +1833,13 @@ msgstr ""
 msgid "Returned"
 msgstr "Restituito"
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index aaae391c3..7cbbec344 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -1445,11 +1445,21 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1641,6 +1651,11 @@ msgstr ""
 msgid "Return Picking"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1662,6 +1677,13 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/i18n/pt.po b/rma/i18n/pt.po
index 8ec7f1e53..76572e2cc 100644
--- a/rma/i18n/pt.po
+++ b/rma/i18n/pt.po
@@ -1470,11 +1470,21 @@ msgstr "Notificações automáticas a clientes de RMA"
 msgid "RMA count"
 msgstr "Contagem de RMA"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr "RMA em estado de rascunho"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1666,6 +1676,11 @@ msgstr ""
 msgid "Return Picking"
 msgstr "Operação de Devolução"
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1687,6 +1702,13 @@ msgstr ""
 msgid "Returned"
 msgstr "Devolvido"
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 7e23c4fc3..9ebca2331 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -1470,11 +1470,21 @@ msgstr ""
 msgid "RMA count"
 msgstr "Contagem de RMA"
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1666,6 +1676,11 @@ msgstr ""
 msgid "Return Picking"
 msgstr "Retorno de Coleta"
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1687,6 +1702,13 @@ msgstr ""
 msgid "Returned"
 msgstr "Retornado(a)"
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index 97fd11e56..b2f4ba5f5 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -1437,11 +1437,21 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1633,6 +1643,11 @@ msgstr ""
 msgid "Return Picking"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1654,6 +1669,13 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index 87a0ac696..cd1a49f3b 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -1468,11 +1468,21 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1664,6 +1674,11 @@ msgstr ""
 msgid "Return Picking"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1685,6 +1700,13 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/i18n/zh_CN.po b/rma/i18n/zh_CN.po
index 11d3e4921..4f47aaed2 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -1447,11 +1447,21 @@ msgstr ""
 msgid "RMA count"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
+msgid "RMA in Route"
+msgstr ""
+
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
 msgid "RMA in draft state"
 msgstr ""
 
+#. module: rma
+#: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
+msgid "RMA out Route"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
 msgid "RMA receivers"
@@ -1643,6 +1653,11 @@ msgstr ""
 msgid "Return Picking"
 msgstr ""
 
+#. module: rma
+#: model:ir.model,name:rma.model_stock_return_picking_line
+msgid "Return Picking Line"
+msgstr ""
+
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
 #: model:ir.model.fields.selection,name:rma.selection__rma_delivery_wizard__type__return
@@ -1664,6 +1679,13 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
+#. module: rma
+#. odoo-python
+#: code:addons/rma/wizard/stock_picking_return.py:0
+#, python-format
+msgid "Returned Picking"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
 msgid "Rma"
diff --git a/rma/migrations/17.0.1.2.0/post-migration.py b/rma/migrations/17.0.1.2.0/post-migration.py
new file mode 100644
index 000000000..71132ec73
--- /dev/null
+++ b/rma/migrations/17.0.1.2.0/post-migration.py
@@ -0,0 +1,17 @@
+# Copyright 2024 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):
+    """Similar behavior to create_rma_routes of post_init_hook."""
+    warehouses = env["stock.warehouse"].search([])
+    warehouses = warehouses.with_context(rma_post_init_hook=True)
+    for wh in warehouses:
+        if not wh.rma_in_type_id or not wh.rma_out_type_id:
+            data = wh._create_or_update_sequences_and_picking_types()
+            wh.write(data)
+        route_vals = wh._create_or_update_route()
+        wh.write(route_vals)
diff --git a/rma/models/res_partner.py b/rma/models/res_partner.py
index e300f6b87..d96a2dda6 100644
--- a/rma/models/res_partner.py
+++ b/rma/models/res_partner.py
@@ -27,7 +27,7 @@ def _compute_rma_count(self):
 
     def action_view_rma(self):
         self.ensure_one()
-        action = self.sudo().env.ref("rma.rma_action").read()[0]
+        action = self.env["ir.actions.act_window"]._for_xml_id("rma.rma_action")
         rma = self.rma_ids
         if len(rma) == 1:
             action.update(
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 570450897..124f2c2ad 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1,12 +1,13 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # Copyright 2023 Tecnativa - Pedro M. Baeza
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 import logging
-from collections import Counter
+from collections import defaultdict
+from itertools import groupby
 
 from odoo import _, api, fields, models
 from odoo.exceptions import AccessError, ValidationError
-from odoo.tests import Form
 from odoo.tools import html2plaintext
 
 from odoo.addons.stock.models.stock_move import PROCUREMENT_PRIORITIES
@@ -259,18 +260,8 @@ def _domain_location_id(self):
     )
 
     def _compute_delivery_picking_count(self):
-        # It is enough to count the moves to know how many pickings
-        # there are because there will be a unique move linked to the
-        # same picking and the same rma.
-        rma_data = self.env["stock.move"].read_group(
-            [("rma_id", "in", self.ids)],
-            ["rma_id", "picking_id"],
-            ["rma_id", "picking_id"],
-            lazy=False,
-        )
-        mapped_data = Counter(map(lambda r: r["rma_id"][0], rma_data))
-        for record in self:
-            record.delivery_picking_count = mapped_data.get(record.id, 0)
+        for rma in self:
+            rma.delivery_picking_count = len(rma.delivery_move_ids.picking_id)
 
     @api.depends(
         "delivery_move_ids",
@@ -609,22 +600,85 @@ def action_rma_send(self):
         }
 
     def _add_message_subscribe_partner(self):
+        self.ensure_one()
         if self.partner_id and self.partner_id not in self.message_partner_ids:
             self.message_subscribe([self.partner_id.id])
 
+    def _product_is_storable(self, product=None):
+        product = product or self.product_id
+        return product.type in ["product", "consu"]
+
+    def _prepare_procurement_group_vals(self):
+        return {
+            "move_type": "direct",
+            "partner_id": self and self.partner_shipping_id.id or False,
+            "name": self and ", ".join(self.mapped("name")) or False,
+        }
+
+    def _prepare_common_procurement_vals(
+        self, warehouse=None, scheduled_date=None, group=None
+    ):
+        self.ensure_one()
+        group = group or self.procurement_group_id
+        if not group:
+            group = self.env["procurement.group"].create(
+                self._prepare_procurement_group_vals()
+            )
+        return {
+            "company_id": self.company_id,
+            "group_id": group,
+            "date_planned": scheduled_date or fields.Datetime.now(),
+            "warehouse_id": warehouse or self.warehouse_id,
+            "partner_id": group.partner_id.id,
+            "priority": self.priority,
+        }
+
+    def _prepare_reception_procurement_vals(self, group=None):
+        """This method is used only for reception and a specific RMA IN route."""
+        vals = self._prepare_common_procurement_vals(group=group)
+        vals["route_ids"] = self.warehouse_id.rma_in_route_id
+        vals["rma_receiver_ids"] = [(6, 0, self.ids)]
+        if self.move_id:
+            vals["origin_returned_move_id"] = self.move_id.id
+        return vals
+
+    def _prepare_reception_procurements(self):
+        procurements = []
+        group_model = self.env["procurement.group"]
+        for rma in self:
+            if not rma._product_is_storable():
+                continue
+            group = rma.procurement_group_id
+            if not group:
+                group = group_model.create(rma._prepare_procurement_group_vals())
+            procurements.append(
+                group_model.Procurement(
+                    rma.product_id,
+                    rma.product_uom_qty,
+                    rma.product_uom,
+                    rma.location_id,
+                    rma.product_id.display_name,
+                    group.name,
+                    rma.company_id,
+                    rma._prepare_reception_procurement_vals(group),
+                )
+            )
+        return procurements
+
     def action_confirm(self):
         """Invoked when 'Confirm' button in rma form view is clicked."""
-        self.ensure_one()
         self._ensure_required_fields()
-        if self.state == "draft":
-            if self.picking_id:
-                reception_move = self._create_receptions_from_picking()
-            else:
-                reception_move = self._create_receptions_from_product()
-            reception_move.picked = True
-            self.write({"reception_move_id": reception_move.id, "state": "confirmed"})
-            self._add_message_subscribe_partner()
-            self._send_confirmation_email()
+        self = self.filtered(lambda rma: rma.state == "draft")
+        if not self:
+            return
+        procurements = self._prepare_reception_procurements()
+        if procurements:
+            self.env["procurement.group"].run(procurements)
+        self.reception_move_id.picking_id.action_assign()
+        self.write({"state": "confirmed"})
+        for rma in self:
+            rma._add_message_subscribe_partner()
+        self._send_confirmation_email()
 
     def action_refund(self):
         """Invoked when 'Refund' button in rma form view is clicked
@@ -663,11 +717,8 @@ def action_replace(self):
         self._ensure_can_be_replaced()
         # Force active_id to avoid issues when coming from smart buttons
         # in other models
-        action = (
-            self.env.ref("rma.rma_delivery_wizard_action")
-            .sudo()
-            .with_context(active_id=self.id)
-            .read()[0]
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "rma.rma_delivery_wizard_action"
         )
         action["name"] = "Replace product(s)"
         action["context"] = dict(self.env.context)
@@ -686,11 +737,8 @@ def action_return(self):
         self._ensure_can_be_returned()
         # Force active_id to avoid issues when coming from smart buttons
         # in other models
-        action = (
-            self.env.ref("rma.rma_delivery_wizard_action")
-            .sudo()
-            .with_context(active_id=self.id)
-            .read()[0]
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "rma.rma_delivery_wizard_action"
         )
         action["context"] = dict(self.env.context)
         action["context"].update(
@@ -706,11 +754,8 @@ def action_split(self):
         self._ensure_can_be_split()
         # Force active_id to avoid issues when coming from smart buttons
         # in other models
-        action = (
-            self.env.ref("rma.rma_split_wizard_action")
-            .sudo()
-            .with_context(active_id=self.id)
-            .read()[0]
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "rma.rma_split_wizard_action"
         )
         action["context"] = dict(self.env.context)
         action["context"].update(active_id=self.id, active_ids=self.ids)
@@ -722,11 +767,8 @@ def action_finish(self):
         self._ensure_can_be_returned()
         # Force active_id to avoid issues when coming from smart buttons
         # in other models
-        action = (
-            self.env.ref("rma.rma_finalization_wizard_action")
-            .sudo()
-            .with_context(active_id=self.id)
-            .read()[0]
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "rma.rma_finalization_wizard_action"
         )
         action["context"] = dict(self.env.context)
         action["context"].update(active_id=self.id, active_ids=self.ids)
@@ -734,7 +776,7 @@ def action_finish(self):
 
     def action_cancel(self):
         """Invoked when 'Cancel' button in rma form view is clicked."""
-        self.mapped("reception_move_id")._action_cancel()
+        self.reception_move_id._action_cancel()
         self.write({"state": "cancelled"})
 
     def action_draft(self):
@@ -759,25 +801,28 @@ def action_preview(self):
             "url": self.get_portal_url(),
         }
 
-    def action_view_receipt(self):
-        """Invoked when 'Receipt' smart button in rma form view is clicked."""
+    def _action_view_pickings(self, pickings):
         self.ensure_one()
         # Force active_id to avoid issues when coming from smart buttons
         # in other models
-        action = (
-            self.env.ref("stock.action_picking_tree_all")
-            .sudo()
-            .with_context(active_id=self.id)
-            .read()[0]
-        )
-        action.update(
-            res_id=self.reception_move_id.picking_id.id,
-            view_mode="form",
-            view_id=False,
-            views=False,
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "stock.action_picking_tree_all"
         )
+        if len(pickings) > 1:
+            action["domain"] = [("id", "in", pickings.ids)]
+        elif pickings:
+            action.update(
+                res_id=pickings.id,
+                view_mode="form",
+                view_id=False,
+                views=False,
+            )
         return action
 
+    def action_view_receipt(self):
+        """Invoked when 'Receipt' smart button in rma form view is clicked."""
+        return self._action_view_pickings(self.mapped("reception_move_id.picking_id"))
+
     def action_view_refund(self):
         """Invoked when 'Refund' smart button in rma form view is clicked."""
         self.ensure_one()
@@ -793,23 +838,7 @@ def action_view_refund(self):
 
     def action_view_delivery(self):
         """Invoked when 'Delivery' smart button in rma form view is clicked."""
-        action = (
-            self.env.ref("stock.action_picking_tree_all")
-            .sudo()
-            .with_context(active_id=self.id)
-            .read()[0]
-        )
-        picking = self.delivery_move_ids.mapped("picking_id")
-        if len(picking) > 1:
-            action["domain"] = [("id", "in", picking.ids)]
-        elif picking:
-            action.update(
-                res_id=picking.id,
-                view_mode="form",
-                view_id=False,
-                views=False,
-            )
-        return action
+        return self._action_view_pickings(self.mapped("delivery_move_ids.picking_id"))
 
     # Validation business methods
     def _ensure_required_fields(self):
@@ -925,83 +954,6 @@ def _ensure_qty_to_extract(self, qty, uom):
                 )
             )
 
-    # Reception business methods
-    def _create_receptions_from_picking(self):
-        self.ensure_one()
-        stock_return_picking_form = Form(
-            self.env["stock.return.picking"].with_context(
-                active_ids=self.picking_id.ids,
-                active_id=self.picking_id.id,
-                active_model="stock.picking",
-            )
-        )
-        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()
-        return_line = return_wizard.product_return_moves
-        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
-                "to_refund": False,
-            }
-        )
-        # set_rma_picking_type is to override the copy() method of stock
-        # picking and change the default picking type to rma picking type.
-        picking_action = return_wizard.with_context(
-            set_rma_picking_type=True
-        ).create_returns()
-        picking_id = picking_action["res_id"]
-        picking = self.env["stock.picking"].browse(picking_id)
-        picking.origin = f"{self.name} ({picking.origin})"
-        move = picking.move_ids
-        move.priority = self.priority
-        return move
-
-    def _create_receptions_from_product(self):
-        self.ensure_one()
-        picking = self.env["stock.picking"].create(self._prepare_picking_vals())
-        picking.action_confirm()
-        picking.action_assign()
-        picking.message_post_with_source(
-            "mail.message_origin_link",
-            render_values={"self": picking, "origin": self},
-            subtype_id=self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_note"),
-        )
-        return picking.move_ids
-
-    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):
         self.ensure_one()
@@ -1075,44 +1027,101 @@ def _prepare_refund_line_vals(self):
             "rma_id": self.id,
         }
 
-    # Returning business methods
-    def create_return(self, scheduled_date, qty=None, uom=None):
-        """Intended to be invoked by the delivery wizard"""
+    def _delivery_should_be_grouped(self):
+        """Checks if the rmas should be grouped for the delivery process"""
         group_returns = self.env.company.rma_return_grouping
         if "rma_return_grouping" in self.env.context:
             group_returns = self.env.context.get("rma_return_grouping")
-        self._ensure_can_be_returned()
-        self._ensure_qty_to_return(qty, uom)
-        group_dict = {}
-        rmas_to_return = self.filtered("can_be_returned")
-        for record in rmas_to_return:
-            key = (
-                record.partner_shipping_id.id,
-                record.company_id.id,
-                record.warehouse_id,
+        return group_returns
+
+    def _delivery_group_key(self):
+        """Returns a key by which the rmas should be grouped for the delivery process"""
+        self.ensure_one()
+        return (self.partner_shipping_id.id, self.company_id.id, self.warehouse_id.id)
+
+    def _group_delivery_if_needed(self):
+        """Groups the given rmas by the returned key from _delivery_group_key
+        by setting the procurement_group_id on the each rma if there is not yet on
+        set"""
+        if not self._delivery_should_be_grouped():
+            return
+        grouped_rmas = groupby(
+            sorted(self, key=lambda rma: rma._delivery_group_key()),
+            key=lambda rma: [rma._delivery_group_key()],
+        )
+        for _group, rmas in grouped_rmas:
+            rmas = (
+                self.browse()
+                .concat(*list(rmas))
+                .filtered(lambda rma: not rma.procurement_group_id)
             )
-            group_dict.setdefault(key, self.env["rma"])
-            group_dict[key] |= record
-        if group_returns:
-            grouped_rmas = group_dict.values()
-        else:
-            grouped_rmas = rmas_to_return
-        for rmas in grouped_rmas:
-            origin = ", ".join(rmas.mapped("name"))
-            picking_vals = rmas[0]._prepare_returning_picking_vals(origin)
-            for rma in rmas:
-                picking_vals["move_ids"].append(
-                    (0, 0, rma._prepare_returning_move_vals(scheduled_date, qty, uom))
+            if not rmas:
+                continue
+            proc_group = self.env["procurement.group"].create(
+                rmas._prepare_procurement_group_vals()
+            )
+            rmas.write({"procurement_group_id": proc_group.id})
+
+    def _prepare_delivery_procurement_vals(self, scheduled_date=None):
+        """This method is used only for Delivery (not replace). It is important to set
+        RMA Out route."""
+        vals = self._prepare_common_procurement_vals(scheduled_date=scheduled_date)
+        vals["rma_id"] = self.id
+        vals["route_ids"] = self.warehouse_id.rma_out_route_id
+        vals["move_orig_ids"] = [(6, 0, self.reception_move_id.ids)]
+        return vals
+
+    def _prepare_delivery_procurements(self, scheduled_date=None, qty=None, uom=None):
+        self._group_delivery_if_needed()
+        procurements = []
+        group_model = self.env["procurement.group"]
+        for rma in self:
+            if not rma.procurement_group_id:
+                rma.procurement_group_id = group_model.create(
+                    rma._prepare_procurement_group_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" '
-                        'data-oe-id="%(id)d">%(name)s</a> has been created.'
-                    )
-                    % ({"id": picking.id, "name": picking.name})
+
+            vals = rma._prepare_delivery_procurement_vals(scheduled_date)
+            group = vals.get("group_id")
+            procurements.append(
+                group_model.Procurement(
+                    rma.product_id,
+                    qty or rma.product_uom_qty,
+                    uom or rma.product_uom,
+                    rma.partner_shipping_id.property_stock_customer,
+                    rma.product_id.display_name,
+                    group.name,
+                    rma.company_id,
+                    vals,
                 )
+            )
+        return procurements
+
+    # Returning business methods
+    def create_return(self, scheduled_date, qty=None, uom=None):
+        """Intended to be invoked by the delivery wizard"""
+        self._ensure_can_be_returned()
+        self._ensure_qty_to_return(qty, uom)
+        rmas_to_return = self.filtered(
+            lambda rma: rma.can_be_returned and rma._product_is_storable()
+        )
+        procurements = rmas_to_return._prepare_delivery_procurements(
+            scheduled_date, qty, uom
+        )
+        if procurements:
+            self.env["procurement.group"].run(procurements)
+        pickings = defaultdict(lambda: self.browse())
+        for rma in rmas_to_return:
+            picking = rma.delivery_move_ids.picking_id.sorted("id", reverse=True)[0]
+            pickings[picking] |= rma
+            rma.message_post(
+                body=_(
+                    'Return: <a href="#" data-oe-model="stock.picking" '
+                    'data-oe-id="%(id)d">%(name)s</a> has been created.'
+                )
+                % ({"id": picking.id, "name": picking.name})
+            )
+        for picking, rmas in pickings.items():
             picking.action_confirm()
             picking.action_assign()
             picking.message_post_with_source(
@@ -1122,42 +1131,53 @@ def create_return(self, scheduled_date, qty=None, uom=None):
             )
         rmas_to_return.write({"state": "waiting_return"})
 
-    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_replace_procurement_vals(self, warehouse=None, scheduled_date=None):
+        """This method is used only for Replace (not Delivery). We do not use any
+        specific route here."""
+        vals = self._prepare_common_procurement_vals(warehouse, scheduled_date)
+        vals["rma_id"] = self.id
+        return vals
 
-    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,
-        }
+    def _prepare_replace_procurements(
+        self, warehouse, scheduled_date, product, qty, uom
+    ):
+        procurements = []
+        group_model = self.env["procurement.group"]
+        for rma in self:
+            if not rma._product_is_storable(product):
+                continue
+
+            if not rma.procurement_group_id:
+                rma.procurement_group_id = group_model.create(
+                    rma._prepare_procurement_group_vals()
+                )
+
+            vals = rma._prepare_replace_procurement_vals(warehouse, scheduled_date)
+            group = vals.get("group_id")
+            procurements.append(
+                group_model.Procurement(
+                    product,
+                    qty,
+                    uom,
+                    rma.partner_shipping_id.property_stock_customer,
+                    product.display_name,
+                    group.name,
+                    rma.company_id,
+                    vals,
+                )
+            )
+        return procurements
 
     # Replacing business methods
     def create_replace(self, scheduled_date, warehouse, product, qty, uom):
         """Intended to be invoked by the delivery wizard"""
-        self.ensure_one()
         self._ensure_can_be_replaced()
         moves_before = self.delivery_move_ids
-        self._action_launch_stock_rule(scheduled_date, warehouse, product, qty, uom)
+        procurements = self._prepare_replace_procurements(
+            warehouse, scheduled_date, product, qty, uom
+        )
+        if procurements:
+            self.env["procurement.group"].run(procurements)
         new_moves = self.delivery_move_ids - moves_before
         body = ""
         # The product replacement could explode into several moves like in the case of
@@ -1181,6 +1201,12 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
                 )
                 + "\n"
             )
+        for rma in self:
+            rma._add_replace_message(body, qty, uom)
+        self.write({"state": "waiting_replacement"})
+
+    def _add_replace_message(self, body, qty, uom):
+        self.ensure_one()
         self.message_post(
             body=body
             or _(
@@ -1193,74 +1219,13 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
             )
             % (
                 {
-                    "id": product.id,
-                    "name": product.display_name,
+                    "id": self.id,
+                    "name": self.display_name,
                     "qty": qty,
                     "uom": uom.name,
                 }
             )
         )
-        if self.state != "waiting_replacement":
-            self.state = "waiting_replacement"
-
-    def _action_launch_stock_rule(
-        self,
-        scheduled_date,
-        warehouse,
-        product,
-        qty,
-        uom,
-    ):
-        """Creates a delivery picking and launch stock rule. It is invoked by:
-        rma.create_replace
-        """
-        self.ensure_one()
-        if self.product_id.type not in ("consu", "product"):
-            return
-        if not self.procurement_group_id:
-            self.procurement_group_id = (
-                self.env["procurement.group"]
-                .create(
-                    {
-                        "name": self.name,
-                        "move_type": "direct",
-                        "partner_id": self.partner_shipping_id.id,
-                    }
-                )
-                .id
-            )
-        values = self._prepare_procurement_values(
-            self.procurement_group_id, scheduled_date, warehouse
-        )
-        procurement = self.env["procurement.group"].Procurement(
-            product,
-            qty,
-            uom,
-            self.partner_shipping_id.property_stock_customer,
-            self.product_id.display_name,
-            self.procurement_group_id.name,
-            self.company_id,
-            values,
-        )
-        self.env["procurement.group"].run([procurement])
-        return True
-
-    def _prepare_procurement_values(
-        self,
-        group_id,
-        scheduled_date,
-        warehouse,
-    ):
-        self.ensure_one()
-        return {
-            "company_id": self.company_id,
-            "group_id": group_id,
-            "date_planned": scheduled_date,
-            "warehouse_id": warehouse,
-            "partner_id": self.partner_shipping_id.id,
-            "rma_id": self.id,
-            "priority": self.priority,
-        }
 
     # Mail business methods
     def _creation_subtype(self):
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index 56579b492..40329279a 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -1,4 +1,5 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, fields, models
@@ -23,7 +24,7 @@ class StockMove(models.Model):
         string="RMA receivers",
         copy=False,
     )
-    # RMA that create the delivery movement to the customer
+    # RMA that creates the out move
     rma_id = fields.Many2one(
         comodel_name="rma",
         string="RMA return",
@@ -33,8 +34,8 @@ class StockMove(models.Model):
     def unlink(self):
         # A stock user could have no RMA permissions, so the ids wouldn't
         # be accessible due to record rules.
-        rma_receiver = self.sudo().mapped("rma_receiver_ids")
-        rma = self.sudo().mapped("rma_id")
+        rma_receiver = self.sudo().rma_receiver_ids
+        rma = self.sudo().rma_id
         res = super().unlink()
         rma_receiver.filtered(lambda x: x.state != "cancelled").write(
             {"state": "draft"}
@@ -115,38 +116,22 @@ def _prepare_move_split_vals(self, qty):
         res["rma_id"] = self.sudo().rma_id.id
         return res
 
-    def _prepare_return_rma_vals(self, original_picking):
-        """hook method for preparing an RMA from the 'return picking wizard'."""
-        self.ensure_one()
-        partner = original_picking.partner_id
-        if hasattr(original_picking, "sale_id") and original_picking.sale_id:
-            partner_invoice_id = original_picking.sale_id.partner_invoice_id.id
-            partner_shipping_id = original_picking.sale_id.partner_shipping_id.id
-        else:
-            partner_invoice_id = partner.address_get(["invoice"]).get("invoice", False)
-            partner_shipping_id = partner.address_get(["delivery"]).get(
-                "delivery", False
-            )
-        return {
-            "user_id": self.env.user.id,
-            "partner_id": partner.id,
-            "partner_shipping_id": partner_shipping_id,
-            "partner_invoice_id": partner_invoice_id,
-            "origin": original_picking.name,
-            "picking_id": original_picking.id,
-            "move_id": self.origin_returned_move_id.id,
-            "product_id": self.origin_returned_move_id.product_id.id,
-            "product_uom_qty": self.product_uom_qty,
-            "product_uom": self.product_uom.id,
-            "reception_move_id": self.id,
-            "company_id": self.company_id.id,
-            "location_id": self.location_dest_id.id,
-            "state": "confirmed",
-        }
+    def _prepare_procurement_values(self):
+        res = super()._prepare_procurement_values()
+        if self.rma_id:
+            res["rma_id"] = self.rma_id.id
+        return res
 
 
 class StockRule(models.Model):
     _inherit = "stock.rule"
 
     def _get_custom_move_fields(self):
-        return super()._get_custom_move_fields() + ["rma_id"]
+        move_fields = super()._get_custom_move_fields()
+        move_fields += [
+            "rma_id",
+            "origin_returned_move_id",
+            "move_orig_ids",
+            "rma_receiver_ids",
+        ]
+        return move_fields
diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py
index f37592743..79ad9dbfa 100644
--- a/rma/models/stock_warehouse.py
+++ b/rma/models/stock_warehouse.py
@@ -1,7 +1,8 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import _, fields, models
 
 
 class StockWarehouse(models.Model):
@@ -27,35 +28,39 @@ class StockWarehouse(models.Model):
         comodel_name="stock.location",
         string="RMA Location",
     )
+    rma_in_route_id = fields.Many2one("stock.route", "RMA in Route")
+    rma_out_route_id = fields.Many2one("stock.route", "RMA out Route")
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        """To create an RMA location and link it with a new warehouse,
-        this method is overridden instead of '_get_locations_values'
-        method because the locations that are created with the
-        values ​​returned by that method are forced to be children
-        of view_location_id, and we don't want that.
-        """
-        res = super().create(vals_list)
-        stock_location = self.env["stock.location"]
-        for record in res:
-            rma_location_vals = record._get_rma_location_values()
-            record.rma_loc_id = stock_location.create(rma_location_vals).id
-        return res
-
-    def _get_rma_location_values(self):
+    def _get_rma_location_values(self, vals, code=False):
         """this method is intended to be used by 'create' method
         to create a new RMA location to be linked to a new warehouse.
         """
+        company_id = vals.get(
+            "company_id", self.default_get(["company_id"])["company_id"]
+        )
+        code = vals.get("code") or code or ""
+        code = code.replace(" ", "").upper()
+        view_location_id = vals.get("view_location_id")
+        view_location = (
+            view_location_id
+            and self.view_location_id.browse(view_location_id)
+            or self.view_location_id
+        )
         return {
-            "name": self.view_location_id.name,
+            "name": view_location.name,
             "active": True,
             "return_location": True,
             "usage": "internal",
-            "company_id": self.company_id.id,
+            "company_id": company_id,
             "location_id": self.env.ref("rma.stock_location_rma").id,
+            "barcode": self._valid_barcode(code + "-RMA", company_id),
         }
 
+    def _get_locations_values(self, vals, code=False):
+        res = super()._get_locations_values(vals, code)
+        res["rma_loc_id"] = self._get_rma_location_values(vals, code)
+        return res
+
     def _get_sequence_values(self, name=False, code=False):
         values = super()._get_sequence_values(name=name, code=code)
         values.update(
@@ -77,12 +82,14 @@ def _get_sequence_values(self, name=False, code=False):
         return values
 
     def _update_name_and_code(self, new_name=False, new_code=False):
+        res = super()._update_name_and_code(new_name, new_code)
         for warehouse in self:
             sequence_data = warehouse._get_sequence_values()
             warehouse.rma_in_type_id.sequence_id.write(sequence_data["rma_in_type_id"])
             warehouse.rma_out_type_id.sequence_id.write(
                 sequence_data["rma_out_type_id"]
             )
+        return res
 
     def _get_picking_type_create_values(self, max_sequence):
         data, next_sequence = super()._get_picking_type_create_values(max_sequence)
@@ -116,12 +123,13 @@ def _get_picking_type_create_values(self, max_sequence):
 
     def _get_picking_type_update_values(self):
         data = super()._get_picking_type_update_values()
-        data.update(
-            {
-                "rma_in_type_id": {"default_location_dest_id": self.rma_loc_id.id},
-                "rma_out_type_id": {"default_location_src_id": self.rma_loc_id.id},
-            }
-        )
+        picking_types = {
+            "rma_in_type_id": {"default_location_dest_id": self.rma_loc_id.id},
+            "rma_out_type_id": {"default_location_src_id": self.rma_loc_id.id},
+        }
+        if self.env.context.get("rma_post_init_hook"):
+            return picking_types
+        data.update(picking_types)
         return data
 
     def _create_or_update_sequences_and_picking_types(self):
@@ -138,3 +146,70 @@ def _create_or_update_sequences_and_picking_types(self):
                 {"return_picking_type_id": data.get("rma_out_type_id", False)}
             )
         return data
+
+    def _get_routes_values(self):
+        res = super()._get_routes_values()
+        rma_routes = {
+            "rma_in_route_id": {
+                "routing_key": "rma_in",
+                "depends": ["active"],
+                "route_update_values": {
+                    "name": self._format_routename("RMA In"),
+                    "active": self.active,
+                },
+                "route_create_values": {
+                    "warehouse_selectable": True,
+                    "company_id": self.company_id.id,
+                    "sequence": 100,
+                },
+                "rules_values": {
+                    "active": True,
+                },
+            },
+            "rma_out_route_id": {
+                "routing_key": "rma_out",
+                "depends": ["active"],
+                "route_update_values": {
+                    "name": self._format_routename("RMA Out"),
+                    "active": self.active,
+                },
+                "route_create_values": {
+                    "warehouse_selectable": True,
+                    "company_id": self.company_id.id,
+                    "sequence": 110,
+                },
+                "rules_values": {
+                    "active": True,
+                },
+            },
+        }
+        if self.env.context.get("rma_post_init_hook"):
+            return rma_routes
+        res.update(rma_routes)
+        return res
+
+    def get_rules_dict(self):
+        res = super().get_rules_dict()
+        customer_loc, supplier_loc = self._get_partner_locations()
+        for warehouse in self:
+            res[warehouse.id].update(
+                {
+                    "rma_in": [
+                        self.Routing(
+                            customer_loc,
+                            warehouse.rma_loc_id,
+                            warehouse.rma_in_type_id,
+                            "pull",
+                        )
+                    ],
+                    "rma_out": [
+                        self.Routing(
+                            warehouse.rma_loc_id,
+                            customer_loc,
+                            warehouse.rma_out_type_id,
+                            "pull",
+                        )
+                    ],
+                }
+            )
+        return res
diff --git a/rma/readme/CONTRIBUTORS.md b/rma/readme/CONTRIBUTORS.md
index 36baf52b7..801eb97b5 100644
--- a/rma/readme/CONTRIBUTORS.md
+++ b/rma/readme/CONTRIBUTORS.md
@@ -7,3 +7,4 @@
 - Giovanni Serra - Ooops \<<giovanni@ooops404.com>\>
 - [APSL-Nagarro](https://www.apsl.tech):
   - Antoni Marroig \<<amarroig@apsl.net>\>
+- Michael Tietz (MT Software) <mtietz@mt-software.de>
diff --git a/rma/readme/ROADMAP.md b/rma/readme/ROADMAP.md
index 198642962..ee3832317 100644
--- a/rma/readme/ROADMAP.md
+++ b/rma/readme/ROADMAP.md
@@ -1,3 +1,6 @@
 - 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 the product of that move is.
+- Add RMA reception and/or RMA delivery on several steps - 2 or 3 - like
+  normal receptions/deliveries. It should be a separate option inside the
+  warehouse definition.
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index e59c143bc..56ece24c9 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -366,7 +366,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:ed3081bf9b94660a0e6b35acbc7a874023c57e4bc3a87f3762eabbb1c75ce2f4
+!! source digest: sha256:8f36869aece97a0f6af8aa5d76b446e9cf0bd589d914c1f5e12c628e87317021
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/17.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to manage <a class="reference external" href="https://en.wikipedia.org/wiki/Return_merchandise_authorization">Return Merchandise Authorization
@@ -493,6 +493,9 @@ <h1><a class="toc-backref" href="#toc-entry-3">Known issues / Roadmap</a></h1>
 <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 the product of that move is.</li>
+<li>Add RMA reception and/or RMA delivery on several steps - 2 or 3 -
+like normal receptions/deliveries. It should be a separate option
+inside the warehouse definition.</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
@@ -527,6 +530,7 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
 </ul>
 </li>
+<li>Michael Tietz (MT Software) <a class="reference external" href="mailto:mtietz&#64;mt-software.de">mtietz&#64;mt-software.de</a></li>
 </ul>
 </div>
 <div class="section" id="maintainers">
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 743226e88..6eb0987f0 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -1,24 +1,20 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo.exceptions import UserError, ValidationError
-from odoo.tests import Form, TransactionCase, new_test_user, users
+from odoo.tests import Form, new_test_user, users
+from odoo.tools import mute_logger
 
+from odoo.addons.base.tests.common import BaseCommon
 
-class TestRma(TransactionCase):
+from .. import hooks
+
+
+class TestRma(BaseCommon):
     @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",
@@ -72,6 +68,7 @@ def setUpClass(cls):
             {"name": "[Test] It's out of warranty. To be scrapped"}
         )
         cls.env.ref("rma.group_rma_manual_finalization").users |= cls.env.user
+        cls.warehouse = cls.env.ref("stock.warehouse0")
         # Ensure grouping
         cls.env.company.rma_return_grouping = True
 
@@ -95,7 +92,7 @@ def _create_confirm_receive(
         rma = self._create_rma(partner, product, qty, location)
         rma.action_confirm()
         rma.reception_move_id.quantity = rma.product_uom_qty
-        rma.reception_move_id.picking_id._action_done()
+        rma.reception_move_id.picking_id.button_validate()
         return rma
 
     def _create_delivery(self):
@@ -132,6 +129,49 @@ def _create_delivery(self):
 
 
 class TestRmaCase(TestRma):
+    def test_post_init_hook(self):
+        warehouse = self.env["stock.warehouse"].create(
+            {
+                "name": "Test warehouse",
+                "code": "code",
+                "company_id": self.env.company.id,
+            }
+        )
+        hooks.post_init_hook(self.env)
+        self.assertTrue(warehouse.rma_in_type_id)
+        self.assertEqual(
+            warehouse.rma_in_type_id.default_location_dest_id, warehouse.rma_loc_id
+        )
+        self.assertEqual(
+            warehouse.rma_out_type_id.default_location_src_id, warehouse.rma_loc_id
+        )
+        self.assertTrue(warehouse.rma_loc_id)
+        self.assertTrue(warehouse.rma_in_route_id)
+        self.assertTrue(warehouse.rma_out_route_id)
+
+    def test_rma_replace_pick_ship(self):
+        self.warehouse.write({"delivery_steps": "pick_ship"})
+        rma = self._create_rma(self.partner, self.product, 1, self.rma_loc)
+        rma.action_confirm()
+        rma.reception_move_id.quantity = 1
+        rma.reception_move_id.picking_id.button_validate()
+        self.assertEqual(rma.reception_move_id.picking_id.state, "done")
+        self.assertEqual(rma.state, "received")
+        res = rma.action_replace()
+        wizard_form = Form(self.env[res["res_model"]].with_context(**res["context"]))
+        wizard_form.product_id = self.product
+        wizard_form.product_uom_qty = rma.product_uom_qty
+        wizard = wizard_form.save()
+        wizard.action_deliver()
+        self.assertEqual(rma.delivery_picking_count, 2)
+        out_pickings = rma.mapped("delivery_move_ids.picking_id")
+        self.assertIn(
+            self.warehouse.pick_type_id, out_pickings.mapped("picking_type_id")
+        )
+        self.assertIn(
+            self.warehouse.out_type_id, out_pickings.mapped("picking_type_id")
+        )
+
     def test_computed(self):
         # If partner changes, the invoice address is set
         rma = self.env["rma"].new()
@@ -169,7 +209,7 @@ def test_computed(self):
             move.product_id = product_2
             move.product_uom_qty = 15
         picking = picking_form.save()
-        picking._action_done()
+        picking.button_validate()
         rma.picking_id = picking
         rma.move_id = picking.move_ids
         self.assertEqual(rma.product_id, product_2)
@@ -207,13 +247,18 @@ def test_confirm_and_receive(self):
         self.assertEqual(rma.state, "confirmed")
         rma.reception_move_id.quantity = 9
         with self.assertRaises(ValidationError):
-            rma.reception_move_id.picking_id._action_done()
+            res = rma.reception_move_id.picking_id.button_validate()
+            wizard = (
+                self.env[res["res_model"]].with_context(**res["context"]).create({})
+            )
+            wizard.process()
         rma.reception_move_id.quantity = 10
-        rma.reception_move_id.picking_id._action_done()
+        rma.reception_move_id.picking_id.button_validate()
         self.assertEqual(rma.reception_move_id.picking_id.state, "done")
         self.assertEqual(rma.reception_move_id.quantity, 10)
         self.assertEqual(rma.state, "received")
 
+    @mute_logger("odoo.models.unlink")
     def test_cancel(self):
         # cancel a draft RMA
         rma = self._create_rma(self.partner, self.product)
@@ -333,7 +378,7 @@ def test_mass_refund(self):
         # line of refund_1
         self.assertEqual(len(refund_1.invoice_line_ids), 3)
         self.assertEqual(
-            refund_1.invoice_line_ids.mapped("rma_id"),
+            refund_1.invoice_line_ids.rma_id,
             (rma_1 | rma_2 | rma_3),
         )
         self.assertEqual(
@@ -524,6 +569,13 @@ def test_mass_return_to_customer(self):
         all_rmas = rma_1 | rma_2 | rma_3 | rma_4
         self.assertEqual(all_rmas.mapped("state"), ["received"] * 4)
         self.assertEqual(all_rmas.mapped("can_be_returned"), [True] * 4)
+        all_in_pickings = all_rmas.mapped("reception_move_id.picking_id")
+        self.assertEqual(
+            all_in_pickings.mapped("picking_type_id"), self.warehouse.rma_in_type_id
+        )
+        self.assertEqual(
+            all_in_pickings.mapped("location_dest_id"), self.warehouse.rma_loc_id
+        )
         # Mass return of those four RMAs
         delivery_wizard = (
             self.env["rma.delivery.wizard"]
@@ -534,6 +586,10 @@ def test_mass_return_to_customer(self):
         # Two pickings were created
         pick_1 = (rma_1 | rma_2 | rma_3).mapped("delivery_move_ids.picking_id")
         pick_2 = rma_4.delivery_move_ids.picking_id
+        self.assertEqual(pick_1.picking_type_id, self.warehouse.rma_out_type_id)
+        self.assertEqual(pick_1.location_id, self.warehouse.rma_loc_id)
+        self.assertEqual(pick_2.picking_type_id, self.warehouse.rma_out_type_id)
+        self.assertEqual(pick_2.location_id, self.warehouse.rma_loc_id)
         self.assertEqual(len(pick_1), 1)
         self.assertEqual(len(pick_2), 1)
         self.assertNotEqual(pick_1, pick_2)
@@ -549,7 +605,7 @@ def test_mass_return_to_customer(self):
         # line of picking_1
         self.assertEqual(len(pick_1.move_ids), 3)
         self.assertEqual(
-            pick_1.move_ids.mapped("rma_id"),
+            pick_1.move_ids.rma_id,
             (rma_1 | rma_2 | rma_3),
         )
         self.assertEqual(
@@ -620,14 +676,14 @@ def test_rma_from_picking_return(self):
         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")
+        rmas = origin_moves.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_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)
+        self.assertEqual(reception_moves.rma_receiver_ids, rmas)
         # Validate the reception picking to set rmas to 'received' state
         reception_moves[0].quantity = reception_moves[0].product_uom_qty
         reception_moves[1].quantity = reception_moves[1].product_uom_qty
@@ -645,7 +701,7 @@ def test_split(self):
         rma = rma_form.save()
         rma.action_confirm()
         rma.reception_move_id.quantity = 10
-        rma.reception_move_id.picking_id._action_done()
+        rma.reception_move_id.picking_id.button_validate()
         # Return quantity 4 of the same product to the customer
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
@@ -686,6 +742,7 @@ def test_split(self):
         self.assertEqual(new_rma.move_id.quantity, 10)
         self.assertEqual(new_rma.reception_move_id.quantity, 10)
 
+    @mute_logger("odoo.models.unlink")
     def test_rma_to_receive_on_delete_invoice(self):
         rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         rma.action_refund()
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
index 4599f1cf4..7c7ca3649 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -1,8 +1,25 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from copy import deepcopy
 
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
+from odoo.tools import float_compare
+
+
+class ReturnPickingLine(models.TransientModel):
+    _inherit = "stock.return.picking.line"
+
+    def _prepare_rma_vals(self):
+        self.ensure_one()
+        return {
+            "move_id": self.move_id.id,
+            "product_id": self.move_id.product_id.id,
+            "product_uom_qty": self.quantity,
+            "product_uom": self.product_id.uom_id.id,
+            "location_id": self.wizard_id.location_id.id or self.move_id.location_id.id,
+        }
 
 
 class ReturnPicking(models.TransientModel):
@@ -48,6 +65,52 @@ def _onchange_create_rma(self):
                 location_id = return_picking_type.default_location_dest_id.id
             self.location_id = location_id
 
+    def _prepare_rma_partner_values(self):
+        self.ensure_one()
+        partner = self.picking_id.partner_id
+        partner_address = partner.address_get(["invoice", "delivery"])
+        partner_invoice_id = partner_address.get("invoice", False)
+        partner_shipping_id = partner_address.get("delivery", False)
+        return (
+            partner,
+            partner_invoice_id and partner.browse(partner_invoice_id) or partner,
+            partner_shipping_id and partner.browse(partner_shipping_id) or partner,
+        )
+
+    def _prepare_rma_vals(self):
+        partner, partner_invoice, partner_shipping = self._prepare_rma_partner_values()
+        origin = self.picking_id.name
+        vals = self.env["rma"]._prepare_procurement_group_vals()
+        vals["partner_id"] = partner_shipping.id
+        vals["name"] = origin
+        group = self.env["procurement.group"].create(vals)
+        return {
+            "user_id": self.env.user.id,
+            "partner_id": partner.id,
+            "partner_shipping_id": partner_shipping.id,
+            "partner_invoice_id": partner_invoice.id,
+            "origin": origin,
+            "picking_id": self.picking_id.id,
+            "company_id": self.company_id.id,
+            "procurement_group_id": group.id,
+        }
+
+    def _prepare_rma_vals_list(self):
+        vals_list = []
+        for return_picking in self:
+            global_vals = return_picking._prepare_rma_vals()
+            for line in return_picking.product_return_moves:
+                if (
+                    not line.move_id
+                    or float_compare(line.quantity, 0, line.product_id.uom_id.rounding)
+                    <= 0
+                ):
+                    continue
+                vals = deepcopy(global_vals)
+                vals.update(line._prepare_rma_vals())
+                vals_list.append(vals)
+        return vals_list
+
     def create_returns(self):
         """Override create_returns method for creating one or more
         'confirmed' RMAs after return a delivery picking in case
@@ -57,10 +120,6 @@ def create_returns(self):
         as the 'Receipt'.
         """
         if self.create_rma:
-            # set_rma_picking_type is to override the copy() method of stock
-            # picking and change the default picking type to rma picking type
-            self_with_context = self.with_context(set_rma_picking_type=True)
-            res = super(ReturnPicking, self_with_context).create_returns()
             if not self.picking_id.partner_id:
                 raise ValidationError(
                     _(
@@ -68,12 +127,30 @@ def create_returns(self):
                         "'Stock Picking' from which RMAs will be created"
                     )
                 )
-            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_ids
-            ]
-            self.env["rma"].create(vals_list)
-            return res
-        else:
-            return super().create_returns()
+            vals_list = self._prepare_rma_vals_list()
+            rmas = self.env["rma"].create(vals_list)
+            rmas.action_confirm()
+            picking = rmas.reception_move_id.picking_id
+            picking = picking and picking[0] or picking
+            ctx = dict(self.env.context)
+            ctx.update(
+                {
+                    "default_partner_id": picking.partner_id.id,
+                    "search_default_picking_type_id": picking.picking_type_id.id,
+                    "search_default_draft": False,
+                    "search_default_assigned": False,
+                    "search_default_confirmed": False,
+                    "search_default_ready": False,
+                    "search_default_planning_issues": False,
+                    "search_default_available": False,
+                }
+            )
+            return {
+                "name": _("Returned Picking"),
+                "view_mode": "form,tree,calendar",
+                "res_model": "stock.picking",
+                "res_id": picking.id,
+                "type": "ir.actions.act_window",
+                "context": ctx,
+            }
+        return super().create_returns()

From ab148355196f98f703b53f6ce38e0378fe9702b0 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Tue, 2 Jul 2024 06:26:35 +0000
Subject: [PATCH 095/108] Translated using Weblate (Italian)

Currently translated at 100.0% (352 of 352 strings)

Translation: rma-17.0/rma-17.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma/it/

Translated using Weblate (Italian)

Currently translated at 100.0% (352 of 352 strings)

Translation: rma-17.0/rma-17.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma/it/

[UPD] Update rma.pot

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: rma-17.0/rma-17.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma/
---
 rma/i18n/de.po    | 75 +++++++++++++++++++--------------------
 rma/i18n/de_AT.po | 28 ++++++---------
 rma/i18n/es.po    | 52 +++++++++++++--------------
 rma/i18n/fr.po    | 54 ++++++++++++----------------
 rma/i18n/it.po    | 89 ++++++++++++++++++++++-------------------------
 rma/i18n/nl.po    | 28 ++++++---------
 rma/i18n/pt.po    | 62 ++++++++++++++-------------------
 rma/i18n/pt_BR.po | 58 +++++++++++++-----------------
 rma/i18n/rma.pot  |  8 -----
 rma/i18n/ro.po    | 46 ++++++++++--------------
 rma/i18n/zh_CN.po | 28 ++++++---------
 11 files changed, 225 insertions(+), 303 deletions(-)

diff --git a/rma/i18n/de.po b/rma/i18n/de.po
index d56857dfa..1efd3a459 100644
--- a/rma/i18n/de.po
+++ b/rma/i18n/de.po
@@ -123,11 +123,11 @@ 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\"/>"
+"<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\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -159,11 +159,11 @@ 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\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -987,9 +987,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 "
@@ -1682,15 +1680,15 @@ msgstr "Ersetzt"
 #: 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 "
-"erstellt.."
+"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
@@ -1762,11 +1760,11 @@ msgstr "Zurück zum Kunden"
 #: 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
@@ -1795,12 +1793,6 @@ msgstr "Anzahl RMA"
 msgid "Rma Location"
 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"
-msgstr "SMS-Zustellungsfehler"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -2310,6 +2302,9 @@ msgstr ""
 "{{object.company_id.name}} Ihre RMA wurde erfolgreich erstellt (Ref {{object."
 "name or 'n/a' }})"
 
+#~ msgid "SMS Delivery error"
+#~ msgstr "SMS-Zustellungsfehler"
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
@@ -2399,8 +2394,8 @@ msgstr ""
 #~ "                <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-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\" "
@@ -2411,12 +2406,12 @@ msgstr ""
 #~ "                    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"
+#~ "                        <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"
+#~ "                    <t t-out=\"object.company_id.name\" data-oe-t-"
+#~ "inline=\"true\"></t>\n"
 #~ "                    .\n"
 #~ "                    <br>\n"
 #~ "                    <br>\n"
@@ -2507,8 +2502,8 @@ msgstr ""
 #~ "                <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-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\" "
@@ -2520,12 +2515,12 @@ msgstr ""
 #~ "eingebracht.\n"
 #~ "                    <strong style=\"box-sizing:border-box;font-weight:500;"
 #~ "\">\n"
-#~ "                        <t t-out=\"object.name\" data-oe-t-inline=\"true"
-#~ "\"></t>\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"
+#~ "                    <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"
diff --git a/rma/i18n/de_AT.po b/rma/i18n/de_AT.po
index 9634e9275..326c1e983 100644
--- a/rma/i18n/de_AT.po
+++ b/rma/i18n/de_AT.po
@@ -119,8 +119,8 @@ 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\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 msgstr ""
 
 #. module: rma
@@ -147,8 +147,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 ""
 
 #. module: rma
@@ -924,9 +924,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 ""
 
@@ -1596,10 +1594,10 @@ msgstr ""
 #: 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
@@ -1668,8 +1666,8 @@ msgstr ""
 #: 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
@@ -1699,12 +1697,6 @@ msgstr ""
 msgid "Rma Location"
 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"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
diff --git a/rma/i18n/es.po b/rma/i18n/es.po
index d0ab9f741..0016f8dde 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -191,11 +191,11 @@ 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\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 msgstr ""
-"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
-"\"Descargar\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Descargar\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -229,11 +229,11 @@ 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="
-"\"Descargar\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Descargar\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -1056,9 +1056,7 @@ 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."
 
@@ -1750,10 +1748,10 @@ msgstr "Reemplazado"
 #: 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 ""
 "Reemplazo: El movimiento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
 "id=\"%(move_id)d\">%(move_name)s</a> (Orden de entrega <a href=\"#\" data-oe-"
@@ -1830,11 +1828,11 @@ msgstr "Devolver al cliente"
 #: 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 ""
-"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock.picking"
-"\" data-oe-id=\"%(id)d\">%(name)s</a> ha sido creada."
+"Devolución: La orden de entrega <a href=\"#\" data-oe-model=\"stock."
+"picking\" data-oe-id=\"%(id)d\">%(name)s</a> ha sido creada."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1863,12 +1861,6 @@ msgstr "Cantidad de RMAs"
 msgid "Rma Location"
 msgstr "Ubicación 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"
-msgstr "Error de Envío de Mensaje"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1991,8 +1983,8 @@ msgid ""
 "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
 "a> has been created."
 msgstr ""
-"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">"
-"%(name)s</a> ha sido creado."
+"División: El RMA <a href=\"#\" data-oe-model=\"rma\" data-oe-"
+"id=\"%(id)d\">%(name)s</a> ha sido creado."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -2089,8 +2081,9 @@ msgid ""
 "The name of the email alias, e.g. 'jobs' if you want to catch emails for "
 "<jobs@example.odoo.com>"
 msgstr ""
-"El nombre de este seudónimo de correo electrónico. Por ejemplo, \"trabajos"
-"\", si lo que quiere es obtener los correos para <trabajos@example.odoo.com>"
+"El nombre de este seudónimo de correo electrónico. Por ejemplo, "
+"\"trabajos\", si lo que quiere es obtener los correos para <trabajos@example."
+"odoo.com>"
 
 #. module: rma
 #. odoo-python
@@ -2368,6 +2361,9 @@ msgstr ""
 "{{object.company_id.name}} Su RMA se ha creado con éxito (Ref {{object.name "
 "or 'n/a' }})"
 
+#~ msgid "SMS Delivery error"
+#~ msgstr "Error de Envío de Mensaje"
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
diff --git a/rma/i18n/fr.po b/rma/i18n/fr.po
index eb99d5894..241b0aeec 100644
--- a/rma/i18n/fr.po
+++ b/rma/i18n/fr.po
@@ -36,8 +36,8 @@ msgstr "(object._get_report_base_filename())"
 msgid ""
 "<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
-"<b>Objet de l'e-mail:</b> %(subject)s<br/><br/><b>Corps de l'e-mail:</b><br/>"
-"%(body)s"
+"<b>Objet de l'e-mail:</b> %(subject)s<br/><br/><b>Corps de l'e-mail:</b><br/"
+">%(body)s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
@@ -194,11 +194,11 @@ 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\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 msgstr ""
-"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
-"\"Télécharger\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Télécharger\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -230,11 +230,11 @@ 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="
-"\"Télécharger\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Télécharger\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -1053,9 +1053,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 "Si coché, certains messages ont une erreur de livraison."
 
@@ -1736,15 +1734,15 @@ msgstr "Remplacé"
 #: 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 ""
 "Remplacement: Mouvement <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
-"id=\"%(move_id)d\">%(move_name)s</a> (Transfert<a href=\"#\" data-oe-model="
-"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) a été "
-"créé."
+"id=\"%(move_id)d\">%(move_name)s</a> (Transfert<a href=\"#\" data-oe-"
+"model=\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) "
+"a été créé."
 
 #. module: rma
 #. odoo-python
@@ -1816,11 +1814,11 @@ msgstr "Retourner au client"
 #: 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 ""
-"Retour : <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
-"%(name)s</a> a été créé."
+"Retour : <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
+"id=\"%(id)d\">%(name)s</a> a été créé."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1849,12 +1847,6 @@ msgstr "Nombre de RMA"
 msgid "Rma Location"
 msgstr "Emplacement 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 ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1979,8 +1971,8 @@ msgid ""
 "Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">%(name)s</"
 "a> has been created."
 msgstr ""
-"Division : <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%(id)d\">"
-"%(name)s</a> a été créé."
+"Division : <a href=\"#\" data-oe-model=\"rma\" data-oe-"
+"id=\"%(id)d\">%(name)s</a> a été créé."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 885e6662e..bd28c7a89 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-05-17 09:34+0000\n"
+"PO-Revision-Date: 2024-08-20 09:58+0000\n"
 "Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.6.2\n"
 
 #. module: rma
 #. odoo-python
@@ -35,8 +35,8 @@ msgstr "(object._get_report_base_filename())"
 msgid ""
 "<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail body:</b><br/>%(body)s"
 msgstr ""
-"<b>Soggetto e-mail:</b> %(subject)s<br/><br/><b>Corpo e-mail:</b><br/>"
-"%(body)s"
+"<b>Soggetto e-mail:</b> %(subject)s<br/><br/><b>Corpo e-mail:</b><br/"
+">%(body)s"
 
 #. module: rma
 #: model:mail.template,body_html:rma.mail_template_rma_notification
@@ -190,11 +190,11 @@ 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\"/>"
+"<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\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -226,11 +226,11 @@ 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\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -453,12 +453,12 @@ msgstr "<strong>Responsabile:</strong>"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "<strong>Shipping Address:</strong>"
-msgstr "<strong>Indirizzo di consegna:</strong>"
+msgstr "<strong>Indirizzo di spedizione:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
 msgid "<strong>Shipping address:</strong>"
-msgstr "<strong>Indirizzo di consegna:</strong>"
+msgstr "<strong>Indirizzo di spedizione:</strong>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.report_rma_document
@@ -1049,9 +1049,7 @@ 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."
 
@@ -1594,7 +1592,7 @@ msgstr "Conteggio RMA"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_in_route_id
 msgid "RMA in Route"
-msgstr ""
+msgstr "RMA in rotta"
 
 #. module: rma
 #: model:mail.message.subtype,description:rma.mt_rma_draft
@@ -1604,7 +1602,7 @@ msgstr "RMA in stato bozza"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_warehouse__rma_out_route_id
 msgid "RMA out Route"
-msgstr ""
+msgstr "RMA fuori rotta"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_stock_move__rma_receiver_ids
@@ -1742,14 +1740,14 @@ msgstr "Sostituito"
 #: 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 ""
 "Sostituzione: Movimento <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
-"id=\"%(move_id)d\">%(move_name)s</a> (prelievo <a href=\"#\" data-oe-model="
-"\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) "
+"id=\"%(move_id)d\">%(move_name)s</a> (prelievo <a href=\"#\" data-oe-"
+"model=\"stock.picking\" data-oe-id=\"%(picking_id)d\"> %(picking_name)s</a>) "
 "creato."
 
 #. module: rma
@@ -1808,7 +1806,7 @@ msgstr "Prelievo di reso"
 #. module: rma
 #: model:ir.model,name:rma.model_stock_return_picking_line
 msgid "Return Picking Line"
-msgstr ""
+msgstr "Riga prelievo di reso"
 
 #. module: rma
 #: model:ir.actions.act_window,name:rma.rma_delivery_wizard_action
@@ -1822,11 +1820,11 @@ msgstr "Rendi al cliente"
 #: 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 ""
-"Reso: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%(id)d\">"
-"%(name)s</a> creato."
+"Reso: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
+"id=\"%(id)d\">%(name)s</a> creato."
 
 #. module: rma
 #: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1838,7 +1836,7 @@ msgstr "Restituito"
 #: code:addons/rma/wizard/stock_picking_return.py:0
 #, python-format
 msgid "Returned Picking"
-msgstr ""
+msgstr "Prelievo reso"
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_tag__rma_ids
@@ -1855,12 +1853,6 @@ msgstr "Conteggio Rma"
 msgid "Rma Location"
 msgstr "Ubicazione 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"
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -1983,8 +1975,8 @@ msgid ""
 "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=\"%(id)d\">"
-"%(name)s</a> creata."
+"Divisione: <a href=\"#\" data-oe-model=\"rma\" data-oe-"
+"id=\"%(id)d\">%(name)s</a> creata."
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__state
@@ -2360,6 +2352,9 @@ msgstr ""
 "{{object.company_id.name}} La vostra RMA è stata creata con successo (rif. "
 "{{object.name or 'n/a' }})"
 
+#~ msgid "SMS Delivery error"
+#~ msgstr "Errore consegna SMS"
+
 #~ msgid ""
 #~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
 #~ "company-specific.\" groups=\"base.group_multi_company\"/>"
@@ -2598,9 +2593,9 @@ msgstr ""
 
 #, 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=\"%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."
@@ -2613,15 +2608,15 @@ msgstr ""
 #~ "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."
+#~ "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."
+#~ "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."
diff --git a/rma/i18n/nl.po b/rma/i18n/nl.po
index 7cbbec344..0ffc7a06b 100644
--- a/rma/i18n/nl.po
+++ b/rma/i18n/nl.po
@@ -119,8 +119,8 @@ 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\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 msgstr ""
 
 #. module: rma
@@ -147,8 +147,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 ""
 
 #. module: rma
@@ -924,9 +924,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 ""
 
@@ -1596,10 +1594,10 @@ msgstr ""
 #: 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
@@ -1668,8 +1666,8 @@ msgstr ""
 #: 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
@@ -1699,12 +1697,6 @@ msgstr ""
 msgid "Rma Location"
 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"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
diff --git a/rma/i18n/pt.po b/rma/i18n/pt.po
index 76572e2cc..4e62e96b9 100644
--- a/rma/i18n/pt.po
+++ b/rma/i18n/pt.po
@@ -121,11 +121,11 @@ 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\"/>"
+"<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\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -147,17 +147,17 @@ msgid ""
 "<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=\"Descarregar"
-"\" title=\"Descarregar\"/>"
+"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-"
+"label=\"Descarregar\" title=\"Descarregar\"/>"
 
 #. 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=\"Descarregar\" title="
-"\"Descarregar\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Descarregar\" "
+"title=\"Descarregar\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -936,9 +936,7 @@ 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."
 
@@ -1621,10 +1619,10 @@ msgstr "Substituído"
 #: 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
@@ -1693,8 +1691,8 @@ msgstr "Devolver ao cliente"
 #: 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
@@ -1724,12 +1722,6 @@ msgstr "Contagem de RMA"
 msgid "Rma Location"
 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"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -2313,9 +2305,9 @@ msgstr ""
 
 #, 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=\"%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."
@@ -2328,18 +2320,18 @@ msgstr ""
 #~ "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."
+#~ "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."
+#~ "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."
+#~ "Devolução: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
+#~ "id=\"%d\">%s</a> foi criada."
 
 #, python-format
 #~ msgid ""
diff --git a/rma/i18n/pt_BR.po b/rma/i18n/pt_BR.po
index 9ebca2331..8463a5044 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -121,11 +121,11 @@ 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\"/>"
+"<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\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -153,11 +153,11 @@ 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\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -936,9 +936,7 @@ 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."
 
@@ -1621,10 +1619,10 @@ msgstr "Substituído"
 #: 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
@@ -1693,8 +1691,8 @@ msgstr "Retornar ao cliente"
 #: 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
@@ -1724,12 +1722,6 @@ msgstr "Contagem de RMA"
 msgid "Rma Location"
 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"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -2300,9 +2292,9 @@ msgstr ""
 
 #, 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=\"%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."
@@ -2315,18 +2307,18 @@ msgstr ""
 #~ "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."
+#~ "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."
+#~ "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."
+#~ "Retorno: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
+#~ "id=\"%d\">%s</a> foi criado."
 
 #, python-format
 #~ msgid ""
diff --git a/rma/i18n/rma.pot b/rma/i18n/rma.pot
index b2f4ba5f5..b2d0e2ffc 100644
--- a/rma/i18n/rma.pot
+++ b/rma/i18n/rma.pot
@@ -916,9 +916,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 ""
 
@@ -1691,12 +1689,6 @@ msgstr ""
 msgid "Rma Location"
 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"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
diff --git a/rma/i18n/ro.po b/rma/i18n/ro.po
index cd1a49f3b..cb1f3a790 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -122,11 +122,11 @@ 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\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 msgstr ""
-"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Descarcă\" title="
-"\"Descarcă\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Descarcă\" "
+"title=\"Descarcă\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -158,11 +158,11 @@ 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=\"Descarcă\" title="
-"\"Descarcă\"/>"
+"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Descarcă\" "
+"title=\"Descarcă\"/>"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
@@ -939,9 +939,7 @@ 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."
 
@@ -1619,10 +1617,10 @@ msgstr "Înlocuit"
 #: 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
@@ -1691,8 +1689,8 @@ msgstr "Retur către client"
 #: 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
@@ -1722,12 +1720,6 @@ msgstr ""
 msgid "Rma Location"
 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"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"
@@ -2308,10 +2300,10 @@ msgstr ""
 
 #, 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=\"%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\" "
+#~ "Î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 4f47aaed2..e1319d007 100644
--- a/rma/i18n/zh_CN.po
+++ b/rma/i18n/zh_CN.po
@@ -121,8 +121,8 @@ 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\"/>"
+"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" "
+"title=\"Download\"/>"
 msgstr ""
 
 #. module: rma
@@ -149,8 +149,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 ""
 
 #. module: rma
@@ -926,9 +926,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 ""
 
@@ -1598,10 +1596,10 @@ msgstr "已换货"
 #: 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
@@ -1670,8 +1668,8 @@ msgstr ""
 #: 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
@@ -1701,12 +1699,6 @@ msgstr ""
 msgid "Rma Location"
 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"
-msgstr ""
-
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__scheduled_date
 msgid "Scheduled Date"

From cc4187c218d63573ffa968680d071540423e38d7 Mon Sep 17 00:00:00 2001
From: mymage <stefano.consolaro@mymage.it>
Date: Wed, 18 Sep 2024 07:14:10 +0000
Subject: [PATCH 096/108] Translated using Weblate (Italian)

Currently translated at 100.0% (351 of 351 strings)

Translation: rma-17.0/rma-17.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma/it/

Translated using Weblate (Italian)

Currently translated at 100.0% (351 of 351 strings)

Translation: rma-17.0/rma-17.0-rma
Translate-URL: https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma/it/
---
 rma/i18n/it.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index bd28c7a89..8cd408490 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-08-20 09:58+0000\n"
+"PO-Revision-Date: 2024-09-23 16:06+0000\n"
 "Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
 "Language-Team: none\n"
 "Language: it\n"
@@ -943,7 +943,7 @@ msgstr "Esiste già questo nome per la chiusura!"
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_form
 msgid "Finish"
-msgstr "Chiudi"
+msgstr "Termina"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_finalization_wizard_view_form
@@ -1655,7 +1655,7 @@ msgstr "Motivo"
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma_finalization__name
 msgid "Reason Name"
-msgstr "Nome Motivo"
+msgstr "Nome causale"
 
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form

From 0f45ac28215b6b47733e372729f2382c58da8414 Mon Sep 17 00:00:00 2001
From: giovannigd <damato.g@stesi.consulting>
Date: Tue, 3 Dec 2024 09:34:47 +0100
Subject: [PATCH 097/108] [FIX] rma: fix for default_res_id as it is deprecated

---
 rma/models/rma.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index 124f2c2ad..c2ce1c20d 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -580,7 +580,7 @@ def action_rma_send(self):
         ctx = {
             "default_model": "rma",
             "default_subtype_id": self.env.ref("rma.mt_rma_notification").id,
-            "default_res_id": self.ids[0],
+            "default_res_ids": self.ids,
             "default_use_template": bool(template),
             "default_template_id": template and template.id or False,
             "default_composition_mode": "comment",

From 2f746e4c4a5244146b51585eb265513acf445539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Wed, 12 Feb 2025 13:26:01 +0100
Subject: [PATCH 098/108] [IMP] rma: Add Markup to messages to display the html
 code correctly

TT54263
---
 rma/models/rma.py | 57 +++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index c2ce1c20d..316f125a6 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -1,11 +1,14 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # Copyright 2023 Tecnativa - Pedro M. Baeza
 # Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
+# Copyright 2025 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 import logging
 from collections import defaultdict
 from itertools import groupby
 
+from markupsafe import Markup
+
 from odoo import _, api, fields, models
 from odoo.exceptions import AccessError, ValidationError
 from odoo.tools import html2plaintext
@@ -981,11 +984,13 @@ def extract_quantity(self, qty, uom):
             subtype_id=self.env["ir.model.data"]._xmlid_to_res_id("mail.mt_note"),
         )
         self.message_post(
-            body=_(
-                'Split: <a href="#" data-oe-model="rma" '
-                'data-oe-id="%(id)d">%(name)s</a> has been created.'
+            body=Markup(
+                _(
+                    'Split: <a href="#" data-oe-model="rma" '
+                    'data-oe-id="%(id)d">%(name)s</a> has been created.'
+                )
+                % ({"id": extracted_rma.id, "name": extracted_rma.name})
             )
-            % ({"id": extracted_rma.id, "name": extracted_rma.name})
         )
         return extracted_rma
 
@@ -1115,11 +1120,13 @@ def create_return(self, scheduled_date, qty=None, uom=None):
             picking = rma.delivery_move_ids.picking_id.sorted("id", reverse=True)[0]
             pickings[picking] |= rma
             rma.message_post(
-                body=_(
-                    'Return: <a href="#" data-oe-model="stock.picking" '
-                    'data-oe-id="%(id)d">%(name)s</a> has been created.'
+                body=Markup(
+                    _(
+                        'Return: <a href="#" data-oe-model="stock.picking" '
+                        'data-oe-id="%(id)d">%(name)s</a> has been created.'
+                    )
+                    % ({"id": picking.id, "name": picking.name})
                 )
-                % ({"id": picking.id, "name": picking.name})
             )
         for picking, rmas in pickings.items():
             picking.action_confirm()
@@ -1183,7 +1190,7 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
         # The product replacement could explode into several moves like in the case of
         # MRP BoM Kits
         for new_move in new_moves:
-            body += (
+            body += Markup(
                 _(
                     'Replacement: Move <a href="#" data-oe-model="stock.move"'
                     ' data-oe-id="%(move_id)d">%(move_name)s</a> (Picking <a'
@@ -1209,21 +1216,23 @@ def _add_replace_message(self, body, qty, uom):
         self.ensure_one()
         self.message_post(
             body=body
-            or _(
-                "Replacement:<br/>"
-                'Product <a href="#" data-oe-model="product.product" '
-                '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."
-            )
-            % (
-                {
-                    "id": self.id,
-                    "name": self.display_name,
-                    "qty": qty,
-                    "uom": uom.name,
-                }
+            or Markup(
+                _(
+                    "Replacement:<br/>"
+                    'Product <a href="#" data-oe-model="product.product" '
+                    '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."
+                )
+                % (
+                    {
+                        "id": self.product_id.id,
+                        "name": self.product_id.display_name,
+                        "qty": qty,
+                        "uom": uom.name,
+                    }
+                )
             )
         )
 

From 849529c8733caf9fb8ca804c6877157dab092042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Wed, 12 Feb 2025 13:37:35 +0100
Subject: [PATCH 099/108] [FIX] rma: Change remaining_qty_to_done to
 remaining_qty field

The remaining_qty_to_done field was removed in https://github.com/OCA/rma/commit/9cc5bca1532edc9c8de4fd2e0d0a6cb4e0bb8161
---
 rma/models/rma.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index 316f125a6..41e2d9eea 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -306,16 +306,10 @@ def _compute_delivered_qty(self):
 
     @api.depends("product_uom_qty", "delivered_qty")
     def _compute_remaining_qty(self):
-        """Compute 'remaining_qty' and 'remaining_qty_to_done' fields.
+        """Compute 'remaining_qty' field.
 
         remaining_qty: is used to set a default quantity of replacing
         or returning of product to the customer.
-
-        remaining_qty_to_done: the aim of this field to control when the
-        RMA cam be set to 'delivered' state. An RMA with
-        remaining_qty_to_done <= 0 can be set to 'delivery'. It is used
-        in stock.move._action_done method of stock.move and
-        rma.extract_quantity.
         """
         for r in self:
             r.remaining_qty = r.product_uom_qty - r.delivered_qty
@@ -380,7 +374,7 @@ def _compute_can_be_split(self):
         for r in self:
             if r.product_uom_qty > 1 and (
                 (r.state == "waiting_return" and r.remaining_qty > 0)
-                or (r.state == "waiting_replacement" and r.remaining_qty_to_done > 0)
+                or (r.state == "waiting_replacement" and r.remaining_qty > 0)
             ):
                 r.can_be_split = True
             else:

From 6b1a6e3a85f3a36625b33f3281a3040e4c2fd662 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Wed, 8 Jan 2025 18:58:51 +0100
Subject: [PATCH 100/108] [IMP] rma: improve rma report layout

---
 rma/views/report_rma.xml | 61 ++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/rma/views/report_rma.xml b/rma/views/report_rma.xml
index 9b2978e47..3cdb12e43 100644
--- a/rma/views/report_rma.xml
+++ b/rma/views/report_rma.xml
@@ -95,31 +95,42 @@
                         </p>
                     </div>
                 </div>
-                <div class="row mt32 mb32" id="product_information">
-                    <div t-if="doc.picking_id" class="col-auto mw-100 mb-2">
-                        <strong>Origin delivery:</strong>
-                        <p class="m-0" t-field="doc.picking_id" />
-                    </div>
-                    <div t-if="doc.move_id" class="col-auto mw-100 mb-2">
-                        <strong>Move:</strong>
-                        <p class="m-0" t-field="doc.move_id" />
-                    </div>
-                    <div t-if="doc.product_id" class="col-auto mw-100 mb-2">
-                        <strong>Product:</strong>
-                        <p class="m-0" t-field="doc.product_id" />
-                    </div>
-                    <div t-if="doc.product_id" class="col-auto mw-100 mb-2">
-                        <strong>Quantity:</strong>
-                        <p class="m-0">
-                            <span t-field="doc.product_uom_qty" />
-                            <span t-field="doc.product_uom" groups="uom.group_uom" />
-                        </p>
-                    </div>
-                    <div t-if="doc.delivered_qty" class="col-auto mw-100 mb-2">
-                        <strong>Delivered qty:</strong>
-                        <p class="m-0" t-field="doc.delivered_qty" />
-                    </div>
-                </div>
+                <table class="table table-sm o_main_table table-borderless mt-4">
+                    <tbody>
+                        <tr t-if="doc.picking_id" name="tr_picking">
+                            <td>Origin delivery</td>
+                            <td><span t-field="doc.picking_id" /></td>
+                        </tr>
+                        <tr>
+                            <td>Product</td>
+                            <td><span t-field="doc.product_id" /></td>
+                        </tr>
+                        <tr>
+                            <td>Quantity</td>
+                            <td>
+                                <span t-field="doc.product_uom_qty" />
+                                <span
+                                    t-field="doc.product_uom"
+                                    groups="uom.group_uom"
+                                />
+                            </td>
+                        </tr>
+                        <tr t-if="doc.delivered_qty">
+                            <td>Delivered Quantity</td>
+                            <td>
+                                <span t-field="doc.delivered_qty" />
+                                <span
+                                    t-field="doc.product_uom"
+                                    groups="uom.group_uom"
+                                />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Requested operation</td>
+                            <td><span t-field="doc.operation_id" /></td>
+                        </tr>
+                    </tbody>
+                </table>
                 <div t-if="doc.description">
                     <strong>RMA Note:</strong>
                     <p t-out="doc.description" />

From 13ca6ec15f198b1fe8a2ed5ce39d7c80f17c2cd7 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Mon, 22 Jul 2024 09:53:34 +0200
Subject: [PATCH 101/108] [IMP] rma_sale: operation required

The rma operation is required in the portal, and it makes sense
for it to be required in the sales wizard as well
---
 rma/README.rst                            | 12 ++++++----
 rma/models/rma.py                         |  1 +
 rma/readme/CONTRIBUTORS.md                |  2 ++
 rma/static/description/index.html         | 19 +++++++++------
 rma/tests/test_rma.py                     | 29 +++++++++++++++++------
 rma/wizard/stock_picking_return.py        | 19 +++++++++++++++
 rma/wizard/stock_picking_return_views.xml | 10 +++++++-
 7 files changed, 72 insertions(+), 20 deletions(-)

diff --git a/rma/README.rst b/rma/README.rst
index 8c5cfc4b1..3e50406e4 100644
--- a/rma/README.rst
+++ b/rma/README.rst
@@ -17,13 +17,13 @@ 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/17.0/rma
+    :target: https://github.com/OCA/rma/tree/18.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-17-0/rma-17-0-rma
+    :target: https://translation.odoo-community.org/projects/rma-18-0/rma-18-0-rma
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/rma&target_branch=17.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/rma&target_branch=18.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -150,7 +150,7 @@ 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 to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2018.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.
 
@@ -179,6 +179,8 @@ Contributors
    -  Antoni Marroig <amarroig@apsl.net>
 
 -  Michael Tietz (MT Software) mtietz@mt-software.de
+-  Jacques-Etienne Baudoux - BCIM je@bcim.be
+-  Souheil Bejaoui - ACSONE SA/NV souheil.bejaoui@acsone.eu
 
 Maintainers
 -----------
@@ -204,6 +206,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-pedrobaeza| |maintainer-chienandalu| 
 
-This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/17.0/rma>`_ project on GitHub.
+This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/18.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/models/rma.py b/rma/models/rma.py
index 41e2d9eea..9c36e500d 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -856,6 +856,7 @@ def _ensure_required_fields(self):
             "partner_invoice_id",
             "product_id",
             "location_id",
+            "operation_id",
         ]
         for record in self:
             desc = ""
diff --git a/rma/readme/CONTRIBUTORS.md b/rma/readme/CONTRIBUTORS.md
index 801eb97b5..6a7b48084 100644
--- a/rma/readme/CONTRIBUTORS.md
+++ b/rma/readme/CONTRIBUTORS.md
@@ -8,3 +8,5 @@
 - [APSL-Nagarro](https://www.apsl.tech):
   - Antoni Marroig \<<amarroig@apsl.net>\>
 - Michael Tietz (MT Software) <mtietz@mt-software.de>
+- Jacques-Etienne Baudoux - BCIM <je@bcim.be>
+- Souheil Bejaoui - ACSONE SA/NV <souheil.bejaoui@acsone.eu>
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index 56ece24c9..455a321bf 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -8,10 +8,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +275,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +301,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -368,7 +369,7 @@ <h1 class="title">Return Merchandise Authorization Management</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:8f36869aece97a0f6af8aa5d76b446e9cf0bd589d914c1f5e12c628e87317021
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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/17.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><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/18.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-18-0/rma-18-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=18.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
@@ -503,7 +504,7 @@ <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 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:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2018.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">
@@ -531,18 +532,22 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 </ul>
 </li>
 <li>Michael Tietz (MT Software) <a class="reference external" href="mailto:mtietz&#64;mt-software.de">mtietz&#64;mt-software.de</a></li>
+<li>Jacques-Etienne Baudoux - BCIM <a class="reference external" href="mailto:je&#64;bcim.be">je&#64;bcim.be</a></li>
+<li>Souheil Bejaoui - ACSONE SA/NV <a class="reference external" href="mailto:souheil.bejaoui&#64;acsone.eu">souheil.bejaoui&#64;acsone.eu</a></li>
 </ul>
 </div>
 <div class="section" id="maintainers">
 <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>
+<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">maintainers</a>:</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> <a class="reference external image-reference" href="https://github.com/chienandalu"><img alt="chienandalu" src="https://github.com/chienandalu.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/17.0/rma">OCA/rma</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/18.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 6eb0987f0..1bd399793 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -71,8 +71,11 @@ def setUpClass(cls):
         cls.warehouse = cls.env.ref("stock.warehouse0")
         # Ensure grouping
         cls.env.company.rma_return_grouping = True
+        cls.operation = cls.env.ref("rma.rma_operation_replace")
 
-    def _create_rma(self, partner=None, product=None, qty=None, location=None):
+    def _create_rma(
+        self, partner=None, product=None, qty=None, location=None, operation=None
+    ):
         vals = {}
         if partner:
             vals["partner_id"] = partner.id
@@ -82,14 +85,17 @@ def _create_rma(self, partner=None, product=None, qty=None, location=None):
             vals["product_uom_qty"] = qty
         if location:
             vals["location_id"] = location.id
-
+        if operation:
+            vals["operation_id"] = operation.id
+        elif operation is None:
+            vals["operation_id"] = self.operation.id
         vals["user_id"] = self.env.user.id
         return self.env["rma"].create(vals)
 
     def _create_confirm_receive(
-        self, partner=None, product=None, qty=None, location=None
+        self, partner=None, product=None, qty=None, location=None, operation=None
     ):
-        rma = self._create_rma(partner, product, qty, location)
+        rma = self._create_rma(partner, product, qty, location, operation)
         rma.action_confirm()
         rma.reception_move_id.quantity = rma.product_uom_qty
         rma.reception_move_id.picking_id.button_validate()
@@ -221,19 +227,26 @@ def test_computed(self):
         self.assertEqual(rma.product_uom, self.product.uom_id)
 
     def test_ensure_required_fields_on_confirm(self):
-        rma = self._create_rma()
+        rma = self._create_rma(operation=False)
         with self.assertRaises(ValidationError) as e:
             rma.action_confirm()
         self.assertEqual(
             e.exception.args[0],
-            "Required field(s):\nCustomer\nShipping Address\nInvoice Address\nProduct",
+            "Required field(s):\nCustomer\nShipping Address\nInvoice Address\nProduct"
+            "\nRequested operation",
         )
         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")
+        self.assertEqual(
+            e.exception.args[0], "Required field(s):\nProduct\nRequested operation"
+        )
         rma.product_id = self.product.id
         rma.location_id = self.rma_loc.id
+        with self.assertRaises(ValidationError) as e:
+            rma.action_confirm()
+        self.assertEqual(e.exception.args[0], "Required field(s):\nRequested operation")
+        rma.operation_id = self.operation
         rma.action_confirm()
         self.assertEqual(rma.state, "confirmed")
 
@@ -670,6 +683,7 @@ def test_rma_from_picking_return(self):
             )
         )
         stock_return_picking_form.create_rma = True
+        stock_return_picking_form.rma_operation_id = self.operation
         return_wizard = stock_return_picking_form.save()
         picking_action = return_wizard.create_returns()
         # Each origin move is linked to a different RMA
@@ -698,6 +712,7 @@ def test_split(self):
         rma_form.move_id = origin_delivery.move_ids.filtered(
             lambda r: r.product_id == self.product
         )
+        rma_form.operation_id = self.operation
         rma = rma_form.save()
         rma.action_confirm()
         rma.reception_move_id.quantity = 10
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
index 7c7ca3649..3bed8265a 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -11,6 +11,20 @@
 class ReturnPickingLine(models.TransientModel):
     _inherit = "stock.return.picking.line"
 
+    rma_operation_id = fields.Many2one(
+        comodel_name="rma.operation",
+        string="Operation",
+        compute="_compute_rma_operation_id",
+        store=True,
+        readonly=False,
+    )
+
+    @api.depends("wizard_id.rma_operation_id")
+    def _compute_rma_operation_id(self):
+        for rec in self:
+            if rec.wizard_id.rma_operation_id:
+                rec.rma_operation_id = rec.wizard_id.rma_operation_id
+
     def _prepare_rma_vals(self):
         self.ensure_one()
         return {
@@ -19,6 +33,7 @@ def _prepare_rma_vals(self):
             "product_uom_qty": self.quantity,
             "product_uom": self.product_id.uom_id.id,
             "location_id": self.wizard_id.location_id.id or self.move_id.location_id.id,
+            "operation_id": self.rma_operation_id.id,
         }
 
 
@@ -30,6 +45,10 @@ class ReturnPicking(models.TransientModel):
     rma_location_ids = fields.Many2many(
         comodel_name="stock.location", compute="_compute_rma_location_id"
     )
+    rma_operation_id = fields.Many2one(
+        comodel_name="rma.operation",
+        string="Requested operation",
+    )
     # Expand domain for RMAs
     location_id = fields.Many2one(
         domain="create_rma and [('id', 'child_of', rma_location_ids)]"
diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
index 983815eb3..167519d9b 100644
--- a/rma/wizard/stock_picking_return_views.xml
+++ b/rma/wizard/stock_picking_return_views.xml
@@ -8,12 +8,20 @@
         <field name="model">stock.return.picking</field>
         <field name="inherit_id" ref="stock.view_stock_return_picking_form" />
         <field name="arch" type="xml">
-            <field name="product_return_moves" position="after">
+            <xpath expr="//field[@name='product_return_moves']//tree" position="inside">
+                <field
+                    name="rma_operation_id"
+                    required="parent.create_rma and quantity>0"
+                    column_invisible="not parent.create_rma"
+                />
+            </xpath>
+            <field name="product_return_moves" position="before">
                 <group name="group_rma">
                     <field
                         name="create_rma"
                         invisible="picking_type_code != 'outgoing'"
                     />
+                    <field name="rma_operation_id" invisible="not create_rma" />
                     <field name="rma_location_ids" invisible="1" />
                     <field name="picking_id" invisible="1" />
                     <field name="picking_type_code" invisible="1" />

From 4718250b72c1fca3478aab4c0216146f31911b82 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Thu, 17 Oct 2024 11:04:28 +0200
Subject: [PATCH 102/108] [IMP] rma: add product to rma search view

---
 rma/views/rma_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 5fe316095..ae24fe8cf 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -10,6 +10,7 @@
             <search>
                 <field name="name" />
                 <field name="user_id" />
+                <field name="product_id" />
                 <field name="tag_ids" />
                 <filter
                     name="draft_filter"

From 6bbce896318f518cd586a35a19b1a8f3b8be6583 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Wed, 16 Oct 2024 13:25:46 +0200
Subject: [PATCH 103/108] [IMP] rma: dedicated settings section

---
 rma/views/res_config_settings_views.xml | 247 ++++++++++++++++--------
 1 file changed, 171 insertions(+), 76 deletions(-)

diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index a887024d1..e8254bef8 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -2,89 +2,184 @@
 <odoo>
     <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="stock.res_config_settings_view_form" />
+        <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath
-                expr="//block[@name='operations_setting_container']"
-                position="inside"
-            >
-                <setting
-                    title="Finish RMAs manually"
-                    help=" When the RMA is receive, allow to finsish it manually choosing a finalization reason."
-                >
-                        <field name="group_rma_manual_finalization" />
-                </setting>
-                <setting
-                    title="Values set here are company-specific."
-                    help="Group RMA returns by customer and warehouse."
-                >
-                        <field name="rma_return_grouping" />
-                </setting>
-                <setting
-                    title="Send automatic RMA info to customer"
-                    help="When the RMA is confirmed, send an automatic information email."
-                >
-                        <field name="send_rma_confirmation" />
-                        <div class="row mt16" invisible="not send_rma_confirmation">
-                            <label
-                            for="rma_mail_confirmation_template_id"
-                            string="Email Template"
-                            class="col-lg-4 o_light_label"
-                        />
-                            <field
-                            name="rma_mail_confirmation_template_id"
-                            class="oe_inline"
-                            required="send_rma_confirmation"
-                            context="{'default_model': 'rma'}"
-                        />
+            <xpath expr="//form" position="inside">
+                <app string="RMA" groups="rma.rma_group_manager" name="rma">
+                    <h2>Return Merchandise Authorization Management</h2>
+                    <div
+                        class="row mt16 o_settings_container"
+                        name="operations_setting_container"
+                    >
+                        <div
+                            class="col-12 col-lg-6 o_setting_box"
+                            title="Finish RMAs manually"
+                        >
+                            <div class="o_setting_left_pane">
+                                <field name="group_rma_manual_finalization" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label
+                                    for="group_rma_manual_finalization"
+                                    string="RMA Manual Finalization"
+                                />
+                                <div class="text-muted">
+                                    When the RMA is receive, allow to finsish it manually choosing
+                                    a finalization reason.
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-12 col-lg-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="rma_return_grouping" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="rma_return_grouping" />
+                                <span
+                                    class="fa fa-lg fa-building-o"
+                                    title="Values set here are company-specific."
+                                    groups="base.group_multi_company"
+                                />
+                                <div
+                                    class="text-muted"
+                                >Group RMA returns by customer and warehouse.</div>
+                            </div>
                         </div>
-                </setting>
-                <setting
-                    title="Send automatic RMA products reception notification to customer"
-                    help="When the RMA products are received, send an automatic information email."
-                >
-                        <field name="send_rma_receipt_confirmation" />
                         <div
-                        class="row mt16"
-                        invisible="not send_rma_receipt_confirmation"
-                    >
-                        <label
-                            for="rma_mail_receipt_confirmation_template_id"
-                            string="Email Template"
-                            class="col-lg-4 o_light_label"
-                        />
-
-                        <field
-                            name="rma_mail_receipt_confirmation_template_id"
-                            class="oe_inline"
-                            required="send_rma_receipt_confirmation"
-                            context="{'default_model': 'rma'}"
-                        />
+                            class="col-12 col-lg-6 o_setting_box"
+                            title="Send automatic RMA info to customer"
+                        >
+                            <div class="o_setting_left_pane">
+                                <field name="send_rma_confirmation" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label
+                                    for="send_rma_confirmation"
+                                    string="RMA Confirmation Email"
+                                />
+                                <span
+                                    class="fa fa-lg fa-building-o"
+                                    title="Values set here are company-specific."
+                                    groups="base.group_multi_company"
+                                />
+                                <div
+                                    class="text-muted"
+                                >When the RMA is confirmed, send an automatic information email.</div>
+                                <div
+                                    class="row mt16"
+                                    invisible="not send_rma_confirmation"
+                                >
+                                    <label
+                                        for="rma_mail_confirmation_template_id"
+                                        string="Email Template"
+                                        class="col-lg-4 o_light_label"
+                                    />
+                                    <field
+                                        name="rma_mail_confirmation_template_id"
+                                        class="oe_inline"
+                                        required="send_rma_confirmation"
+                                        context="{'default_model': 'rma'}"
+                                    />
+                                </div>
+                            </div>
                         </div>
-                </setting>
-                <setting
-                    title="Send automatic notification when the customer places an RMA"
-                    help="When customers themselves place an RMA from the portal, send an automatic notification acknowleging it."
-                >
-                        <field name="send_rma_draft_confirmation" />
                         <div
-                        class="row mt16"
-                        invisible="not send_rma_draft_confirmation"
-                    >
-                            <label
-                            for="rma_mail_draft_confirmation_template_id"
-                            string="Email Template"
-                            class="col-lg-4 o_light_label"
-                        />
-                            <field
-                            name="rma_mail_draft_confirmation_template_id"
-                            class="oe_inline"
-                            required="send_rma_draft_confirmation"
-                            context="{'default_model': 'rma'}"
-                        />
+                            class="col-12 col-lg-6 o_setting_box"
+                            title="Send automatic RMA products reception notification to customer"
+                        >
+                            <div class="o_setting_left_pane">
+                                <field name="send_rma_receipt_confirmation" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label
+                                    for="send_rma_receipt_confirmation"
+                                    string="RMA Receipt Confirmation Email"
+                                />
+                                <span
+                                    class="fa fa-lg fa-building-o"
+                                    title="Values set here are company-specific."
+                                    groups="base.group_multi_company"
+                                />
+                                <div
+                                    class="text-muted"
+                                >When the RMA products are received, send an automatic information email.</div>
+                                <div
+                                    class="row mt16"
+                                    invisible="not send_rma_receipt_confirmation"
+                                >
+                                    <label
+                                        for="rma_mail_receipt_confirmation_template_id"
+                                        string="Email Template"
+                                        class="col-lg-4 o_light_label"
+                                    />
+                                    <field
+                                        name="rma_mail_receipt_confirmation_template_id"
+                                        class="oe_inline"
+                                        required="send_rma_receipt_confirmation"
+                                        context="{'default_model': 'rma'}"
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                        <div
+                            class="col-12 col-lg-6 o_setting_box"
+                            title="Send automatic notification when the customer places an RMA"
+                        >
+                            <div class="o_setting_left_pane">
+                                <field name="send_rma_draft_confirmation" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label
+                                    for="send_rma_draft_confirmation"
+                                    string="RMA draft notification Email"
+                                />
+                                <span
+                                    class="fa fa-lg fa-building-o"
+                                    title="Values set here are company-specific."
+                                    groups="base.group_multi_company"
+                                />
+                                <div
+                                    class="text-muted"
+                                >When customers themselves place an RMA from the portal, send an automatic notification acknowleging it.</div>
+                                <div
+                                    class="row mt16"
+                                    invisible="not send_rma_draft_confirmation"
+                                >
+                                    <label
+                                        for="rma_mail_draft_confirmation_template_id"
+                                        string="Email Template"
+                                        class="col-lg-4 o_light_label"
+                                    />
+                                    <field
+                                        name="rma_mail_draft_confirmation_template_id"
+                                        class="oe_inline"
+                                        required="send_rma_draft_confirmation"
+                                        context="{'default_model': 'rma'}"
+                                    />
+                                </div>
+                            </div>
                         </div>
-                </setting>
+                    </div>
+                </app>
             </xpath>
         </field>
     </record>
+
+    <record id="action_rma_config_settings" model="ir.actions.act_window">
+            <field name="name">Settings</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.config.settings</field>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+            <field name="context">{'module' : 'rma', 'bin_size': False}</field>
+        </record>
+
+        <menuitem
+        id="menu_rma_general_settings"
+        name="Settings"
+        parent="rma_configuration_menu"
+        sequence="0"
+        action="action_rma_config_settings"
+        groups="base.group_system"
+    />
 </odoo>

From af0f91536e3ac064eab535286c78b99b82dada66 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Thu, 14 Nov 2024 01:29:48 +0100
Subject: [PATCH 104/108] [IMP] rma: add index for rma_id in stock.move model

Add an index to rma_id in the stock.move model to improve access performance for the one2many field delivery_move_ids
---
 rma/models/stock_move.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index 40329279a..9ea7e1d10 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -26,9 +26,7 @@ class StockMove(models.Model):
     )
     # RMA that creates the out move
     rma_id = fields.Many2one(
-        comodel_name="rma",
-        string="RMA return",
-        copy=False,
+        comodel_name="rma", string="RMA return", copy=False, index=True
     )
 
     def unlink(self):

From c0570b53259ee92bb2326fcc33882e109f3973a1 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Tue, 8 Oct 2024 12:06:58 +0200
Subject: [PATCH 105/108] [IMP] rma: search by rma origin and add state filters

---
 rma/views/rma_views.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index ae24fe8cf..9866783c7 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -9,9 +9,26 @@
         <field name="arch" type="xml">
             <search>
                 <field name="name" />
+                <field name="origin" />
                 <field name="user_id" />
                 <field name="product_id" />
                 <field name="tag_ids" />
+                <filter
+                    string="Awaiting Action"
+                    name="waiting_action"
+                    domain="[('state', 'in', ['waiting_return', 'waiting_replacement', 'confirmed'])]"
+                />
+                <filter
+                    string="Processed"
+                    name="processed"
+                    domain="[('state', 'in', ['received', 'refunded', 'replaced', 'finished'])]"
+                />
+                <filter
+                    string="Closed"
+                    name="closed"
+                    domain="[('state', 'in', ['locked', 'cancelled'])]"
+                />
+                <separator />
                 <filter
                     name="draft_filter"
                     string="Draft"

From e694a9a4935a33461ed88622ce8c1482f3367cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Fri, 14 Feb 2025 09:06:34 +0100
Subject: [PATCH 106/108] [FIX] rma: Allow to download the PDF of the picking
 from the RMA page

Related to https://github.com/OCA/rma/pull/444#pullrequestreview-2615705027
---
 rma/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rma/controllers/main.py b/rma/controllers/main.py
index 7549882fa..164b37165 100644
--- a/rma/controllers/main.py
+++ b/rma/controllers/main.py
@@ -125,7 +125,7 @@ def portal_my_rma_picking_report(self, rma_id, picking_id, access_token=None, **
         except exceptions.AccessError:
             return request.redirect("/my")
         report_sudo = request.env.ref("stock.action_report_delivery").sudo()
-        pdf = report_sudo._render_qweb_pdf([picking_sudo.id])[0]
+        pdf = report_sudo._render_qweb_pdf(report_sudo, res_ids=picking_sudo.ids)[0]
         pdfhttpheaders = [
             ("Content-Type", "application/pdf"),
             ("Content-Length", len(pdf)),

From 5e54061217dac2dd904343c339890c3612d77021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Mon, 10 Feb 2025 17:34:26 +0100
Subject: [PATCH 107/108] [IMP] rma: pre-commit auto fixes

---
 rma/data/mail_data.xml                  | 25 ++++++++++++-------------
 rma/views/report_rma.xml                | 12 +++++++++---
 rma/views/res_config_settings_views.xml | 16 ++++++++--------
 rma/views/rma_portal_templates.xml      | 12 ++++++------
 rma/views/rma_team_views.xml            | 14 +++++++-------
 rma/views/rma_views.xml                 |  6 ++----
 6 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/rma/data/mail_data.xml b/rma/data/mail_data.xml
index 79d0d22f4..a4ac58a8e 100644
--- a/rma/data/mail_data.xml
+++ b/rma/data/mail_data.xml
@@ -31,7 +31,6 @@
         <field name="relation_field">team_id</field>
     </record>
 
-
     <!--RMA email template -->
     <record id="mail_template_rma_notification" model="mail.template">
         <field name="name">RMA Notification</field>
@@ -50,14 +49,14 @@
                     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>
+                    <t t-out="object.partner_id.parent_id.name" />
+                </t>
                     <br />
                     <br />
                     Here is the RMA
                     <strong>
-                        <t t-out="object.name" />
-                    </strong>
+                    <t t-out="object.name" />
+                </strong>
                     from
                     <t t-out="object.company_id.name" />
                     .
@@ -86,14 +85,14 @@
                     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>
+                    <t t-out="object.partner_id.parent_id.name" />
+                </t>
                     <br />
                     <br />
                     The products for your RMA
                     <strong>
-                        <t t-out="object.name" />
-                    </strong>
+                    <t t-out="object.name" />
+                </strong>
                     from
                     <t t-out="object.company_id.name" />
                     have been received in our warehouse.
@@ -121,14 +120,14 @@
                     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>
+                    <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>
+                    <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.
diff --git a/rma/views/report_rma.xml b/rma/views/report_rma.xml
index 3cdb12e43..dcaaea307 100644
--- a/rma/views/report_rma.xml
+++ b/rma/views/report_rma.xml
@@ -99,11 +99,15 @@
                     <tbody>
                         <tr t-if="doc.picking_id" name="tr_picking">
                             <td>Origin delivery</td>
-                            <td><span t-field="doc.picking_id" /></td>
+                            <td>
+                                <span t-field="doc.picking_id" />
+                            </td>
                         </tr>
                         <tr>
                             <td>Product</td>
-                            <td><span t-field="doc.product_id" /></td>
+                            <td>
+                                <span t-field="doc.product_id" />
+                            </td>
                         </tr>
                         <tr>
                             <td>Quantity</td>
@@ -127,7 +131,9 @@
                         </tr>
                         <tr>
                             <td>Requested operation</td>
-                            <td><span t-field="doc.operation_id" /></td>
+                            <td>
+                                <span t-field="doc.operation_id" />
+                            </td>
                         </tr>
                     </tbody>
                 </table>
diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index e8254bef8..bccd9b3bb 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -166,15 +166,15 @@
     </record>
 
     <record id="action_rma_config_settings" model="ir.actions.act_window">
-            <field name="name">Settings</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.config.settings</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-            <field name="context">{'module' : 'rma', 'bin_size': False}</field>
-        </record>
+        <field name="name">Settings</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.config.settings</field>
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+        <field name="context">{'module' : 'rma', 'bin_size': False}</field>
+    </record>
 
-        <menuitem
+    <menuitem
         id="menu_rma_general_settings"
         name="Settings"
         parent="rma_configuration_menu"
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index 7c56d9425..ed82652e3 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -414,9 +414,9 @@
                                 <div class="d-lg-inline-block">
                                     Date:
                                     <span
-                                        class="text-muted"
-                                        t-field="refund.invoice_date"
-                                    />
+                                    class="text-muted"
+                                    t-field="refund.invoice_date"
+                                />
                                 </div>
                             </div>
                             <span
@@ -466,9 +466,9 @@
                                         <div class="d-lg-inline-block">
                                             Date:
                                             <span
-                                                class="text-muted"
-                                                t-field="picking.date"
-                                            />
+                                            class="text-muted"
+                                            t-field="picking.date"
+                                        />
                                         </div>
                                     </div>
                                     <t t-if="picking.state == 'done'">
diff --git a/rma/views/rma_team_views.xml b/rma/views/rma_team_views.xml
index 0ae66c788..49a1c76e3 100644
--- a/rma/views/rma_team_views.xml
+++ b/rma/views/rma_team_views.xml
@@ -97,13 +97,13 @@
                                         style="display: inline;"
                                     >
                                         <field
-                                            name="alias_name"
-                                            class="oe_inline"
-                                        />@<field
-                                            name="alias_domain"
-                                            class="oe_inline"
-                                            readonly="1"
-                                        />
+                                        name="alias_name"
+                                        class="oe_inline"
+                                    />@<field
+                                        name="alias_domain"
+                                        class="oe_inline"
+                                        readonly="1"
+                                    />
                                     </div>
                                 </div>
                                 <field
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 9866783c7..bccfd6faa 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -222,8 +222,7 @@
                             class="oe_stat_button"
                             icon="fa-truck"
                             invisible="not reception_move_id"
-                        >
-                        </button>
+                        />
                         <button
                             type="object"
                             name="action_view_delivery"
@@ -244,8 +243,7 @@
                             class="oe_stat_button"
                             icon="fa-pencil-square-o"
                             invisible="not refund_id"
-                        >
-                        </button>
+                        />
                     </div>
                     <div class="oe_title">
                         <h1>

From a70bf4951e828dcda6a94c90afe29987089600ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Mon, 10 Feb 2025 17:42:22 +0100
Subject: [PATCH 108/108] [MIG] rma: Migration to 18.0

Changes done:
- Purge translations
- Remove migration scripts
- Change translations (_) to self.env._
- Change check_access_rights() method to has_access() method
- Change method _product_is_storable() to product_id.is_storable
- Set check_company=True to stock.warehouse fields
- Change domain of multi-company rules for better performance
- Change tree to list in views
- Change kanban-box to card
- Replace <div class="oe_chatter"> with <chatter />
- Remove unnecessary invisible fields in views
- Changes in portal templates
- Changes in stock.picking.return
- Change copy() methods to make them multi-records
- Remove copy() method from stock.picking, context key is not used

TT54263
---
 rma/__manifest__.py                         |   2 +-
 rma/controllers/main.py                     |  11 +-
 rma/i18n/de.po                              | 243 -------
 rma/i18n/es.po                              | 263 --------
 rma/i18n/fr.po                              |  45 --
 rma/i18n/it.po                              | 294 ---------
 rma/i18n/pt.po                              | 152 -----
 rma/i18n/pt_BR.po                           | 142 -----
 rma/i18n/ro.po                              | 119 ----
 rma/migrations/17.0.1.2.0/post-migration.py |  17 -
 rma/models/account_move.py                  |   4 +-
 rma/models/res_company.py                   |   4 +-
 rma/models/res_config_settings.py           |   3 +
 rma/models/rma.py                           |  79 +--
 rma/models/rma_team.py                      |  25 +-
 rma/models/stock_move.py                    |   4 +-
 rma/models/stock_picking.py                 |  12 -
 rma/models/stock_warehouse.py               |  34 +-
 rma/security/rma_security.xml               |  12 +-
 rma/tests/test_rma.py                       |  74 ++-
 rma/views/res_config_settings_views.xml     |   3 -
 rma/views/rma_finalization_views.xml        |   4 +-
 rma/views/rma_portal_templates.xml          | 664 +++++++++-----------
 rma/views/rma_tag_views.xml                 |   4 +-
 rma/views/rma_team_views.xml                |  57 +-
 rma/views/rma_views.xml                     |  30 +-
 rma/wizard/rma_delivery.py                  |   4 +-
 rma/wizard/rma_delivery_views.xml           |   3 -
 rma/wizard/rma_split.py                     |   4 +-
 rma/wizard/rma_split_views.xml              |   1 -
 rma/wizard/stock_picking_return.py          |  54 +-
 rma/wizard/stock_picking_return_views.xml   |   6 +-
 32 files changed, 504 insertions(+), 1869 deletions(-)
 delete mode 100644 rma/migrations/17.0.1.2.0/post-migration.py

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 087e4e4fc..7695e3bb6 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -5,7 +5,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "17.0.2.0.0",
+    "version": "18.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",
diff --git a/rma/controllers/main.py b/rma/controllers/main.py
index 164b37165..9796ba89c 100644
--- a/rma/controllers/main.py
+++ b/rma/controllers/main.py
@@ -1,5 +1,5 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
-# Copyright 2022 Tecnativa - Víctor Martínez
+# Copyright 2022-2025 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import _, exceptions, http
@@ -17,9 +17,7 @@ def _prepare_home_portal_values(self, counters):
         if "rma_count" in counters:
             rma_model = request.env["rma"]
             rma_count = (
-                rma_model.search_count([])
-                if rma_model.check_access_rights("read", raise_exception=False)
-                else 0
+                rma_model.search_count([]) if rma_model.has_access("read") else 0
             )
             values["rma_count"] = rma_count
         return values
@@ -43,7 +41,7 @@ def portal_my_rmas(self, page=1, date_begin=None, date_end=None, sortby=None, **
         values = self._prepare_portal_layout_values()
         rma_obj = request.env["rma"]
         # Avoid error if the user does not have access.
-        if not rma_obj.check_access_rights("read", raise_exception=False):
+        if not rma_obj.has_access("read"):
             return request.redirect("/my")
         domain = self._get_filter_domain(kw)
         searchbar_sortings = {
@@ -137,8 +135,7 @@ def _picking_check_access(self, rma_id, picking_id, access_token=None):
         picking = request.env["stock.picking"].browse([picking_id])
         picking_sudo = picking.sudo()
         try:
-            picking.check_access_rights("read")
-            picking.check_access_rule("read")
+            picking.check_access("read")
         except exceptions.AccessError:
             if not access_token or not consteq(rma.access_token, access_token):
                 raise
diff --git a/rma/i18n/de.po b/rma/i18n/de.po
index 1efd3a459..d79a51c2b 100644
--- a/rma/i18n/de.po
+++ b/rma/i18n/de.po
@@ -2301,246 +2301,3 @@ msgid ""
 msgstr ""
 "{{object.company_id.name}} Ihre RMA wurde erfolgreich erstellt (Ref {{object."
 "name or 'n/a' }})"
-
-#~ msgid "SMS Delivery error"
-#~ msgstr "SMS-Zustellungsfehler"
-
-#~ msgid ""
-#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
-#~ "company-specific.\" groups=\"base.group_multi_company\"/>"
-#~ msgstr ""
-#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Diese Werte sind "
-#~ "unternehmensspezifisch.\" groups=\"base.group_multi_company\"/>"
-
-#~ msgid "Alias domain"
-#~ msgstr "Alias domain"
-
-#~ msgid "Delivered Qty Done"
-#~ msgstr "gelieferte Menge Erledigt"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Zuletzt geändert am"
-
-#~ msgid "Main Attachment"
-#~ msgstr "Hauptanhang"
-
-#~ msgid "Owner"
-#~ msgstr "Eigentümer"
-
-#~ msgid "RMA Confirmation Email"
-#~ msgstr "RMA-Bestätigungs-E-Mail"
-
-#~ msgid "RMA Manual Finalization"
-#~ msgstr "Manueller RMA-Abschluss"
-
-#~ msgid "RMA Receipt Confirmation Email"
-#~ msgstr "RMA-Empfangsbestätigungs-E-Mail"
-
-#~ msgid "RMA draft notification Email"
-#~ msgstr "Benachrichtigungs-E-Mail zum RMA-Entwurf"
-
-#~ msgid "Remaining delivered qty to done"
-#~ msgstr "Verbleibende Liefermenge zu erledigen"
-
-#~ msgid ""
-#~ "The owner of records created upon receiving emails on this alias. If this "
-#~ "field is not set the system will attempt to find the right owner based on "
-#~ "the sender (From) address, or will use the Administrator account if no "
-#~ "system user is found for that address."
-#~ msgstr ""
-#~ "Der Eigentümer von Datensätzen, die beim Empfang von E-Mails unter diesem "
-#~ "Alias erstellt wurden. Wenn dieses Feld nicht gesetzt ist, versucht das "
-#~ "System, den richtigen Eigentümer anhand der Absenderadresse (Von) zu "
-#~ "finden, oder verwendet das Administratorkonto, wenn kein Systembenutzer "
-#~ "für diese Adresse gefunden wird."
-
-#~ msgid ""
-#~ "When the RMA is receive, allow to finsish it manually choosing\n"
-#~ "                            a finalization reason."
-#~ msgstr ""
-#~ "Wenn die RMA eingegangen ist, können Sie sie manuell abschließen, \n"
-#~ "                               indem Sie einen Abschlussgrund auswählen."
-
-#~ msgid "{{(object.name or '')}}"
-#~ msgstr "{{(object.name or '')}}"
-
-#~ 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 "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/es.po b/rma/i18n/es.po
index 0016f8dde..e092cf1d9 100644
--- a/rma/i18n/es.po
+++ b/rma/i18n/es.po
@@ -2360,266 +2360,3 @@ msgid ""
 msgstr ""
 "{{object.company_id.name}} Su RMA se ha creado con éxito (Ref {{object.name "
 "or 'n/a' }})"
-
-#~ msgid "SMS Delivery error"
-#~ msgstr "Error de Envío de Mensaje"
-
-#~ msgid ""
-#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
-#~ "company-specific.\" groups=\"base.group_multi_company\"/>"
-#~ msgstr ""
-#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Valores específicos por "
-#~ "compañía.\" groups=\"base.group_multi_company\"/>"
-
-#~ msgid "Alias domain"
-#~ msgstr "Seudónimo del dominio"
-
-#~ msgid "Delivered Qty Done"
-#~ msgstr "Ctd. entregada realizada"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Última modificación en"
-
-#~ msgid "Main Attachment"
-#~ msgstr "Adjuntos principales"
-
-#~ msgid "Owner"
-#~ msgstr "Propietario"
-
-#~ msgid "RMA Confirmation Email"
-#~ msgstr "Correo de confirmación de RMA"
-
-#~ msgid "RMA Manual Finalization"
-#~ msgstr "Finalización del Manual RMA"
-
-#~ msgid "RMA Receipt Confirmation Email"
-#~ msgstr "Correo de confirmación de recepción de RMA"
-
-#~ msgid "RMA draft notification Email"
-#~ msgstr "Correo de notificación de borrador de RMA"
-
-#~ msgid "Remaining delivered qty to done"
-#~ msgstr "Ctd. entregada restante por realizar"
-
-#~ msgid ""
-#~ "The owner of records created upon receiving emails on this alias. If this "
-#~ "field is not set the system will attempt to find the right owner based on "
-#~ "the sender (From) address, or will use the Administrator account if no "
-#~ "system user is found for that address."
-#~ msgstr ""
-#~ "El propietario de los registros creados al recibir correos electrónicos "
-#~ "en este seudónimo. Si el campo no está establecido, el sistema tratará de "
-#~ "encontrar el propietario adecuado basado en la dirección del emisor (De), "
-#~ "o usará la cuenta de administrador si no se encuentra un usuario para esa "
-#~ "dirección."
-
-#~ msgid ""
-#~ "When the RMA is receive, allow to finsish it manually choosing\n"
-#~ "                            a finalization reason."
-#~ msgstr ""
-#~ "Cuando se recibe el RMA, permite finalizarlo manualmente eligiendo\n"
-#~ "                            un motivo de finalización."
-
-#~ msgid "{{(object.name or '')}}"
-#~ msgstr "{{(object.name or '')}}"
-
-#~ 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 "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/fr.po b/rma/i18n/fr.po
index 241b0aeec..f41c36f07 100644
--- a/rma/i18n/fr.po
+++ b/rma/i18n/fr.po
@@ -2341,48 +2341,3 @@ msgid ""
 msgstr ""
 "{{object.company_id.name}} Votre RMA a été crée avec succès(Ref {{object."
 "name or 'n/a' }})"
-
-#~ msgid ""
-#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
-#~ "company-specific.\" groups=\"base.group_multi_company\"/>"
-#~ msgstr ""
-#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Les valeurs définies ici "
-#~ "sont propres à l'entreprise.\" groups=\"base.group_multi_company\"/>"
-
-#~ msgid "Alias domain"
-#~ msgstr "Domaine de l'alias"
-
-#~ msgid "Delivered Qty Done"
-#~ msgstr "Quantité livrée Terminé"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Dernière Modification le"
-
-#~ msgid "Main Attachment"
-#~ msgstr "Pièce jointe principale"
-
-#~ msgid "Owner"
-#~ msgstr "Propriétaire"
-
-#~ msgid "RMA Confirmation Email"
-#~ msgstr "Email de confirmation RMA"
-
-#~ msgid "RMA Manual Finalization"
-#~ msgstr "Clôture manuelle RMA"
-
-#~ msgid "RMA Receipt Confirmation Email"
-#~ msgstr "Email de confirmation de réception RMA"
-
-#~ msgid "RMA draft notification Email"
-#~ msgstr "Email de notification brouillon RMA"
-
-#~ msgid "Remaining delivered qty to done"
-#~ msgstr "Qté restante à livrer avant de terminer"
-
-#~ msgid ""
-#~ "When the RMA is receive, allow to finsish it manually choosing\n"
-#~ "                            a finalization reason."
-#~ msgstr ""
-#~ "Quand une RMA est reçue, permet de la terminer manuellement en "
-#~ "sélectionnant\n"
-#~ "                             comme motif de clôture."
diff --git a/rma/i18n/it.po b/rma/i18n/it.po
index 8cd408490..643d0fa64 100644
--- a/rma/i18n/it.po
+++ b/rma/i18n/it.po
@@ -2351,297 +2351,3 @@ msgid ""
 msgstr ""
 "{{object.company_id.name}} La vostra RMA è stata creata con successo (rif. "
 "{{object.name or 'n/a' }})"
-
-#~ msgid "SMS Delivery error"
-#~ msgstr "Errore consegna SMS"
-
-#~ msgid ""
-#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
-#~ "company-specific.\" groups=\"base.group_multi_company\"/>"
-#~ msgstr ""
-#~ "<span class=\"fa fa-lg fa-building-o\" title=\"I valori impostati qui "
-#~ "sono specifici per azienda.\" groups=\"base.group_multi_company\"/>"
-
-#~ msgid "Alias domain"
-#~ msgstr "Dominio alias"
-
-#~ msgid "Delivered Qty Done"
-#~ msgstr "Quantità consegnata fatta"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Ultima modifica il"
-
-#~ msgid "Main Attachment"
-#~ msgstr "Allegato principale"
-
-#~ msgid "Owner"
-#~ msgstr "Proprietario"
-
-#~ msgid "RMA Confirmation Email"
-#~ msgstr "Email di Conferma RMA"
-
-#~ msgid "RMA Manual Finalization"
-#~ msgstr "Chiusura manuale RMA"
-
-#~ msgid "RMA Receipt Confirmation Email"
-#~ msgstr "E-mail di conferma ricevuta RMA"
-
-#~ msgid "RMA draft notification Email"
-#~ msgstr "E-mail di notifica bozza RMA"
-
-#~ msgid "Remaining delivered qty to done"
-#~ msgstr "Quantità consegnata rimanente da fare"
-
-#~ msgid ""
-#~ "The owner of records created upon receiving emails on this alias. If this "
-#~ "field is not set the system will attempt to find the right owner based on "
-#~ "the sender (From) address, or will use the Administrator account if no "
-#~ "system user is found for that address."
-#~ msgstr ""
-#~ "Il proprietario dei record creati dopo aver ricevuto email con questo "
-#~ "alias. Se questo campo non è impostato il sistema tenterà di trovare il "
-#~ "proprietario corretto in base all'indirizzo del mittente (Da) oppure "
-#~ "utilizzerà l'account amministratore se non viene trovato alcun utente di "
-#~ "sistema per quell'indirizzo."
-
-#~ msgid ""
-#~ "When the RMA is receive, allow to finsish it manually choosing\n"
-#~ "                            a finalization reason."
-#~ msgstr ""
-#~ "Quando si riceve l'RMA, permetti di chiuderlo manualmente scegliendo\n"
-#~ "                            un motivo per la chiusura."
-
-#~ msgid "{{(object.name or '')}}"
-#~ msgstr "{{(object.name or '')}}"
-
-#~ 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."
-
-#, 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/pt.po b/rma/i18n/pt.po
index 4e62e96b9..96198c835 100644
--- a/rma/i18n/pt.po
+++ b/rma/i18n/pt.po
@@ -2205,155 +2205,3 @@ msgid ""
 "{{object.company_id.name}} Your RMA has been succesfully created (Ref "
 "{{object.name or 'n/a' }})"
 msgstr ""
-
-#~ msgid ""
-#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Values set here are "
-#~ "company-specific.\" groups=\"base.group_multi_company\"/>"
-#~ msgstr ""
-#~ "<span class=\"fa fa-lg fa-building-o\" title=\"Estes valores são "
-#~ "específicos por empresa.\" groups=\"base.group_multi_company\"/>"
-
-#~ msgid "Alias domain"
-#~ msgstr "Domínio do Alias"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Última Modificação Em"
-
-#~ msgid "Main Attachment"
-#~ msgstr "Anexo Principal"
-
-#~ msgid "Owner"
-#~ msgstr "Proprietário"
-
-#~ msgid "RMA Confirmation Email"
-#~ msgstr "E-mail de Confirmação da RMA"
-
-#~ msgid "Remaining delivered qty to done"
-#~ msgstr "Qtd. restante entregue a fazer"
-
-#~ msgid ""
-#~ "The owner of records created upon receiving emails on this alias. If this "
-#~ "field is not set the system will attempt to find the right owner based on "
-#~ "the sender (From) address, or will use the Administrator account if no "
-#~ "system user is found for that address."
-#~ msgstr ""
-#~ "O proprietário dos registos criados ao receber emails nesse alias. Se "
-#~ "esse campo não estiver definido, o sistema tentará encontrar o "
-#~ "proprietário certo com base no endereço do remetente (De) ou usará a "
-#~ "conta de Administrador se nenhum utilizador do sistema for encontrado "
-#~ "para esse endereço."
-
-#~ 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 8463a5044..424697490 100644
--- a/rma/i18n/pt_BR.po
+++ b/rma/i18n/pt_BR.po
@@ -2202,145 +2202,3 @@ msgid ""
 "{{object.company_id.name}} Your RMA has been succesfully created (Ref "
 "{{object.name or 'n/a' }})"
 msgstr ""
-
-#~ msgid "Alias domain"
-#~ msgstr "Domínio do Alias"
-
-#~ msgid "Last Modified on"
-#~ msgstr "Última Modificação Feita em"
-
-#~ msgid "Main Attachment"
-#~ msgstr "Anexo Principal"
-
-#~ msgid "Owner"
-#~ msgstr "Proprietário"
-
-#~ msgid "Remaining delivered qty to done"
-#~ msgstr "Quantidade restante entregue a concluir"
-
-#~ msgid ""
-#~ "The owner of records created upon receiving emails on this alias. If this "
-#~ "field is not set the system will attempt to find the right owner based on "
-#~ "the sender (From) address, or will use the Administrator account if no "
-#~ "system user is found for that address."
-#~ msgstr ""
-#~ "O proprietário dos registros criados ao receber emails nesse alias. Se "
-#~ "esse campo não estiver definido, o sistema tentará encontrar o "
-#~ "proprietário certo com base no endereço do remetente (De) ou usará a "
-#~ "conta de Administrador se nenhum usuário do sistema for encontrado para "
-#~ "esse endereço."
-
-#~ 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/ro.po b/rma/i18n/ro.po
index cb1f3a790..861b11351 100644
--- a/rma/i18n/ro.po
+++ b/rma/i18n/ro.po
@@ -2188,122 +2188,3 @@ msgid ""
 "{{object.company_id.name}} Your RMA has been succesfully created (Ref "
 "{{object.name or 'n/a' }})"
 msgstr ""
-
-#~ msgid "Last Modified on"
-#~ msgstr "Ultima modificare în"
-
-#~ msgid "Owner"
-#~ msgstr "Proprietar"
-
-#~ msgid ""
-#~ "The owner of records created upon receiving emails on this alias. If this "
-#~ "field is not set the system will attempt to find the right owner based on "
-#~ "the sender (From) address, or will use the Administrator account if no "
-#~ "system user is found for that address."
-#~ msgstr ""
-#~ "Proprietarul înregistrărilor create la primirea e-mailurilor de la acest "
-#~ "alias. Dacă acest câmp nu este setat, sistemul va încerca să găsească "
-#~ "proprietarul potrivit în funcție de adresa expeditorului (De la) sau va "
-#~ "utiliza contul de administrator dacă nu este găsit niciun utilizator de "
-#~ "sistem pentru acea adresă."
-
-#~ 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/migrations/17.0.1.2.0/post-migration.py b/rma/migrations/17.0.1.2.0/post-migration.py
deleted file mode 100644
index 71132ec73..000000000
--- a/rma/migrations/17.0.1.2.0/post-migration.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2024 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):
-    """Similar behavior to create_rma_routes of post_init_hook."""
-    warehouses = env["stock.warehouse"].search([])
-    warehouses = warehouses.with_context(rma_post_init_hook=True)
-    for wh in warehouses:
-        if not wh.rma_in_type_id or not wh.rma_out_type_id:
-            data = wh._create_or_update_sequences_and_picking_types()
-            wh.write(data)
-        route_vals = wh._create_or_update_route()
-        wh.write(route_vals)
diff --git a/rma/models/account_move.py b/rma/models/account_move.py
index 251f2ff13..de1930123 100644
--- a/rma/models/account_move.py
+++ b/rma/models/account_move.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, fields, models
+from odoo import fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools import float_compare
 
@@ -33,7 +33,7 @@ def action_post(self):
         """
         if self._check_rma_invoice_lines_qty():
             raise ValidationError(
-                _(
+                self.env._(
                     "There is at least one invoice lines whose quantity is "
                     "less than the quantity specified in its linked RMA."
                 )
diff --git a/rma/models/res_company.py b/rma/models/res_company.py
index 2b55930a3..775328428 100644
--- a/rma/models/res_company.py
+++ b/rma/models/res_company.py
@@ -2,7 +2,7 @@
 # Copyright 2023 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 
 
 class ResCompany(models.Model):
@@ -79,7 +79,7 @@ def create_rma_index(self):
             .sudo()
             .create(
                 {
-                    "name": _("RMA Code"),
+                    "name": self.env._("RMA Code"),
                     "prefix": "RMA",
                     "code": "rma",
                     "padding": 4,
diff --git a/rma/models/res_config_settings.py b/rma/models/res_config_settings.py
index c06d9e594..43960f8b6 100644
--- a/rma/models/res_config_settings.py
+++ b/rma/models/res_config_settings.py
@@ -21,6 +21,7 @@ class ResConfigSettings(models.TransientModel):
     )
     rma_mail_confirmation_template_id = fields.Many2one(
         related="company_id.rma_mail_confirmation_template_id",
+        domain="[('model', '=', 'rma')]",
         readonly=False,
     )
     send_rma_receipt_confirmation = fields.Boolean(
@@ -29,6 +30,7 @@ class ResConfigSettings(models.TransientModel):
     )
     rma_mail_receipt_confirmation_template_id = fields.Many2one(
         related="company_id.rma_mail_receipt_confirmation_template_id",
+        domain="[('model', '=', 'rma')]",
         readonly=False,
     )
     send_rma_draft_confirmation = fields.Boolean(
@@ -37,5 +39,6 @@ class ResConfigSettings(models.TransientModel):
     )
     rma_mail_draft_confirmation_template_id = fields.Many2one(
         related="company_id.rma_mail_draft_confirmation_template_id",
+        domain="[('model', '=', 'rma')]",
         readonly=False,
     )
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 9c36e500d..d04282f50 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -9,7 +9,7 @@
 
 from markupsafe import Markup
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import AccessError, ValidationError
 from odoo.tools import html2plaintext
 
@@ -40,7 +40,7 @@ def _domain_location_id(self):
     name = fields.Char(
         index=True,
         copy=False,
-        default=lambda self: _("New"),
+        default=lambda self: self.env._("New"),
     )
     origin = fields.Char(
         string="Source Document",
@@ -314,9 +314,7 @@ def _compute_remaining_qty(self):
         for r in self:
             r.remaining_qty = r.product_uom_qty - r.delivered_qty
 
-    @api.depends(
-        "state",
-    )
+    @api.depends("state")
     def _compute_can_be_refunded(self):
         """Compute 'can_be_refunded'. This field controls the visibility
         of 'Refund' button in the rma form view and determinates if
@@ -497,7 +495,7 @@ def _check_required_after_draft(self):
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:
-            if vals.get("name", _("New")) == _("New"):
+            if vals.get("name", self.env._("New")) == self.env._("New"):
                 ir_sequence = self.env["ir.sequence"]
                 if "company_id" in vals:
                     ir_sequence = ir_sequence.with_company(vals["company_id"])
@@ -514,18 +512,19 @@ def create(self, vals_list):
         return rmas
 
     def copy(self, default=None):
-        team = super().copy(default)
-        for follower in self.message_follower_ids:
-            team.message_subscribe(
-                partner_ids=follower.partner_id.ids,
-                subtype_ids=follower.subtype_ids.ids,
-            )
-        return team
+        new_rmas = super().copy(default)
+        for old_rma, new_rma in zip(self, new_rmas, strict=False):
+            for follower in old_rma.message_follower_ids:
+                new_rma.message_subscribe(
+                    partner_ids=follower.partner_id.ids,
+                    subtype_ids=follower.subtype_ids.ids,
+                )
+        return new_rmas
 
     def unlink(self):
         if self.filtered(lambda r: r.state != "draft"):
             raise ValidationError(
-                _("You cannot delete RMAs that are not in draft state")
+                self.env._("You cannot delete RMAs that are not in draft state")
             )
         return super().unlink()
 
@@ -601,10 +600,6 @@ def _add_message_subscribe_partner(self):
         if self.partner_id and self.partner_id not in self.message_partner_ids:
             self.message_subscribe([self.partner_id.id])
 
-    def _product_is_storable(self, product=None):
-        product = product or self.product_id
-        return product.type in ["product", "consu"]
-
     def _prepare_procurement_group_vals(self):
         return {
             "move_type": "direct",
@@ -643,7 +638,7 @@ def _prepare_reception_procurements(self):
         procurements = []
         group_model = self.env["procurement.group"]
         for rma in self:
-            if not rma._product_is_storable():
+            if not rma.product_id.is_storable:
                 continue
             group = rma.procurement_group_id
             if not group:
@@ -824,7 +819,7 @@ def action_view_refund(self):
         """Invoked when 'Refund' smart button in rma form view is clicked."""
         self.ensure_one()
         return {
-            "name": _("Refund"),
+            "name": self.env._("Refund"),
             "type": "ir.actions.act_window",
             "view_type": "form",
             "view_mode": "form",
@@ -873,7 +868,7 @@ def _ensure_required_fields(self):
                 )
                 desc += f"\n{field_record.field_description}"
             if desc:
-                raise ValidationError(_("Required field(s):%s") % desc)
+                raise ValidationError(self.env._("Required field(s):%s") % desc)
 
     def _ensure_can_be_returned(self):
         """This method is intended to be invoked after user click on
@@ -888,9 +883,11 @@ def _ensure_can_be_returned(self):
         """
         if len(self) == 1:
             if not self.can_be_returned:
-                raise ValidationError(_("This RMA cannot perform a return."))
+                raise ValidationError(self.env._("This RMA cannot perform a return."))
         elif not self.filtered("can_be_returned"):
-            raise ValidationError(_("None of the selected RMAs can perform a return."))
+            raise ValidationError(
+                self.env._("None of the selected RMAs can perform a return.")
+            )
 
     def _ensure_can_be_replaced(self):
         """This method is intended to be invoked after user click on
@@ -903,10 +900,12 @@ def _ensure_can_be_replaced(self):
         """
         if len(self) == 1:
             if not self.can_be_replaced:
-                raise ValidationError(_("This RMA cannot perform a replacement."))
+                raise ValidationError(
+                    self.env._("This RMA cannot perform a replacement.")
+                )
         elif not self.filtered("can_be_replaced"):
             raise ValidationError(
-                _("None of the selected RMAs can perform a replacement.")
+                self.env._("None of the selected RMAs can perform a replacement.")
             )
 
     def _ensure_can_be_split(self):
@@ -917,7 +916,7 @@ def _ensure_can_be_split(self):
         """
         self.ensure_one()
         if not self.can_be_split:
-            raise ValidationError(_("This RMA cannot be split."))
+            raise ValidationError(self.env._("This RMA cannot be split."))
 
     def _ensure_qty_to_return(self, qty=None, uom=None):
         """This method is intended to be invoked after confirm the wizard.
@@ -928,7 +927,9 @@ def _ensure_qty_to_return(self, qty=None, uom=None):
                 qty = uom._compute_quantity(qty, self.product_uom)
             if qty > self.remaining_qty:
                 raise ValidationError(
-                    _("The quantity to return is greater than " "remaining quantity.")
+                    self.env._(
+                        "The quantity to return is greater than " "remaining quantity."
+                    )
                 )
 
     def _ensure_qty_to_extract(self, qty, uom):
@@ -940,7 +941,7 @@ def _ensure_qty_to_extract(self, qty, uom):
             to_split_uom_qty = uom._compute_quantity(qty, self.product_uom)
         if to_split_uom_qty > self.remaining_qty:
             raise ValidationError(
-                _(
+                self.env._(
                     "Quantity to extract cannot be greater than remaining"
                     " delivery quantity (%(remaining_qty)s %(product_uom)s)"
                 )
@@ -980,7 +981,7 @@ def extract_quantity(self, qty, uom):
         )
         self.message_post(
             body=Markup(
-                _(
+                self.env._(
                     'Split: <a href="#" data-oe-model="rma" '
                     'data-oe-id="%(id)d">%(name)s</a> has been created.'
                 )
@@ -1103,7 +1104,7 @@ def create_return(self, scheduled_date, qty=None, uom=None):
         self._ensure_can_be_returned()
         self._ensure_qty_to_return(qty, uom)
         rmas_to_return = self.filtered(
-            lambda rma: rma.can_be_returned and rma._product_is_storable()
+            lambda rma: rma.can_be_returned and rma.product_id.is_storable
         )
         procurements = rmas_to_return._prepare_delivery_procurements(
             scheduled_date, qty, uom
@@ -1116,7 +1117,7 @@ def create_return(self, scheduled_date, qty=None, uom=None):
             pickings[picking] |= rma
             rma.message_post(
                 body=Markup(
-                    _(
+                    self.env._(
                         'Return: <a href="#" data-oe-model="stock.picking" '
                         'data-oe-id="%(id)d">%(name)s</a> has been created.'
                     )
@@ -1146,7 +1147,7 @@ def _prepare_replace_procurements(
         procurements = []
         group_model = self.env["procurement.group"]
         for rma in self:
-            if not rma._product_is_storable(product):
+            if not product.is_storable:
                 continue
 
             if not rma.procurement_group_id:
@@ -1186,7 +1187,7 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
         # MRP BoM Kits
         for new_move in new_moves:
             body += Markup(
-                _(
+                self.env._(
                     '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"'
@@ -1212,7 +1213,7 @@ def _add_replace_message(self, body, qty, uom):
         self.message_post(
             body=body
             or Markup(
-                _(
+                self.env._(
                     "Replacement:<br/>"
                     'Product <a href="#" data-oe-model="product.product" '
                     'data-oe-id="%(id)d">%(name)s</a><br/>'
@@ -1255,14 +1256,14 @@ def message_new(self, msg_dict, custom_values=None):
             custom_values = {}
         subject = msg_dict.get("subject", "")
         body = html2plaintext(msg_dict.get("body", ""))
-        desc = _(
+        desc = self.env._(
             "<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail"
             " body:</b><br/>%(body)s"
         ) % ({"subject": subject, "body": body})
         defaults = {
             "description": desc,
-            "name": _("New"),
-            "origin": _("Incoming e-mail"),
+            "name": self.env._("New"),
+            "origin": self.env._("Incoming e-mail"),
         }
         if msg_dict.get("author_id"):
             partner = self.env["res.partner"].browse(msg_dict.get("author_id"))
@@ -1298,7 +1299,7 @@ def _message_get_suggested_recipients(self):
         try:
             for record in self.filtered("partner_id"):
                 record._message_add_suggested_recipient(
-                    recipients, partner=record.partner_id, reason=_("Customer")
+                    recipients, partner=record.partner_id, reason=self.env._("Customer")
                 )
         except AccessError as e:  # no read access rights
             _logger.debug(e)
@@ -1307,7 +1308,7 @@ def _message_get_suggested_recipients(self):
     # Reporting business methods
     def _get_report_base_filename(self):
         self.ensure_one()
-        return "RMA Report - %s" % self.name
+        return f"RMA Report - {self.name}"
 
     # Other business methods
 
diff --git a/rma/models/rma_team.py b/rma/models/rma_team.py
index fd624f60a..6ba37bb59 100644
--- a/rma/models/rma_team.py
+++ b/rma/models/rma_team.py
@@ -3,7 +3,7 @@
 
 import ast
 
-from odoo import _, fields, models
+from odoo import fields, models
 
 
 class RmaTeam(models.Model):
@@ -40,18 +40,17 @@ class RmaTeam(models.Model):
     )
 
     def copy(self, default=None):
-        self.ensure_one()
-        if default is None:
-            default = {}
-        if not default.get("name"):
-            default["name"] = _("%s (copy)") % self.name
-        team = super().copy(default)
-        for follower in self.message_follower_ids:
-            team.message_subscribe(
-                partner_ids=follower.partner_id.ids,
-                subtype_ids=follower.subtype_ids.ids,
-            )
-        return team
+        default = dict(default or {})
+        new_teams = super().copy(default)
+        for old_team, new_team in zip(self, new_teams, strict=False):
+            if not default.get("name"):
+                new_team.name = self.env._("%s (copy)") % old_team.name
+            for follower in old_team.message_follower_ids:
+                new_team.message_subscribe(
+                    partner_ids=follower.partner_id.ids,
+                    subtype_ids=follower.subtype_ids.ids,
+                )
+        return new_teams
 
     def _alias_get_creation_values(self):
         values = super()._alias_get_creation_values()
diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index 9ea7e1d10..331ffc5f2 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -2,7 +2,7 @@
 # Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools import float_compare
 
@@ -72,7 +72,7 @@ def _action_done(self, cancel_backorder=False):
                 != 0
             ):
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "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)."
diff --git a/rma/models/stock_picking.py b/rma/models/stock_picking.py
index 070cdabd1..157ce63ea 100644
--- a/rma/models/stock_picking.py
+++ b/rma/models/stock_picking.py
@@ -16,18 +16,6 @@ def _compute_rma_count(self):
         for rec in self:
             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.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.env["ir.actions.act_window"]._for_xml_id("rma.rma_action")
diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py
index 79ad9dbfa..9b356d034 100644
--- a/rma/models/stock_warehouse.py
+++ b/rma/models/stock_warehouse.py
@@ -2,7 +2,7 @@
 # Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, fields, models
+from odoo import fields, models
 
 
 class StockWarehouse(models.Model):
@@ -19,17 +19,24 @@ class StockWarehouse(models.Model):
     rma_in_type_id = fields.Many2one(
         comodel_name="stock.picking.type",
         string="RMA In Type",
+        check_company=True,
+        copy=False,
     )
     rma_out_type_id = fields.Many2one(
         comodel_name="stock.picking.type",
         string="RMA Out Type",
+        check_company=True,
+        copy=False,
     )
     rma_loc_id = fields.Many2one(
-        comodel_name="stock.location",
-        string="RMA Location",
+        comodel_name="stock.location", string="RMA Location", check_company=True
+    )
+    rma_in_route_id = fields.Many2one(
+        "stock.route", "RMA in Route", ondelete="restrict", copy=False
+    )
+    rma_out_route_id = fields.Many2one(
+        "stock.route", "RMA out Route", ondelete="restrict", copy=False
     )
-    rma_in_route_id = fields.Many2one("stock.route", "RMA in Route")
-    rma_out_route_id = fields.Many2one("stock.route", "RMA out Route")
 
     def _get_rma_location_values(self, vals, code=False):
         """this method is intended to be used by 'create' method
@@ -49,7 +56,6 @@ def _get_rma_location_values(self, vals, code=False):
         return {
             "name": view_location.name,
             "active": True,
-            "return_location": True,
             "usage": "internal",
             "company_id": company_id,
             "location_id": self.env.ref("rma.stock_location_rma").id,
@@ -63,17 +69,19 @@ def _get_locations_values(self, vals, code=False):
 
     def _get_sequence_values(self, name=False, code=False):
         values = super()._get_sequence_values(name=name, code=code)
+        name = name if name else self.name
+        code = code if code else self.code
         values.update(
             {
                 "rma_in_type_id": {
-                    "name": self.name + " " + _("Sequence RMA in"),
-                    "prefix": self.code + "/RMA/IN/",
+                    "name": name + " " + self.env._("Sequence RMA in"),
+                    "prefix": code + "/RMA/IN/",
                     "padding": 5,
                     "company_id": self.company_id.id,
                 },
                 "rma_out_type_id": {
-                    "name": self.name + " " + _("Sequence RMA out"),
-                    "prefix": self.code + "/RMA/OUT/",
+                    "name": name + " " + self.env._("Sequence RMA out"),
+                    "prefix": code + "/RMA/OUT/",
                     "padding": 5,
                     "company_id": self.company_id.id,
                 },
@@ -96,23 +104,21 @@ def _get_picking_type_create_values(self, max_sequence):
         data.update(
             {
                 "rma_in_type_id": {
-                    "name": _("RMA Receipts"),
+                    "name": self.env._("RMA Receipts"),
                     "code": "incoming",
                     "use_create_lots": False,
                     "use_existing_lots": True,
-                    "default_location_src_id": False,
                     "default_location_dest_id": self.rma_loc_id.id,
                     "sequence": max_sequence + 1,
                     "sequence_code": "RMA/IN",
                     "company_id": self.company_id.id,
                 },
                 "rma_out_type_id": {
-                    "name": _("RMA Delivery Orders"),
+                    "name": self.env._("RMA Delivery Orders"),
                     "code": "outgoing",
                     "use_create_lots": False,
                     "use_existing_lots": True,
                     "default_location_src_id": self.rma_loc_id.id,
-                    "default_location_dest_id": False,
                     "sequence": max_sequence + 2,
                     "sequence_code": "RMA/OUT",
                     "company_id": self.company_id.id,
diff --git a/rma/security/rma_security.xml b/rma/security/rma_security.xml
index 54833bc1d..6916e527f 100644
--- a/rma/security/rma_security.xml
+++ b/rma/security/rma_security.xml
@@ -71,25 +71,19 @@
         <field name="name">RMA multi-company</field>
         <field name="model_id" ref="model_rma" />
         <field name="global" eval="True" />
-        <field
-            name="domain_force"
-        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
     <record id="rma_team_rule_multi_company" model="ir.rule">
         <field name="name">RMA team multi-company</field>
         <field name="model_id" ref="model_rma_team" />
         <field name="global" eval="True" />
-        <field
-            name="domain_force"
-        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
     <record id="rma_finalization_comp_rule" model="ir.rule">
         <field name="name">RMA Finalization Reason multi-company</field>
         <field name="model_id" ref="model_rma_finalization" />
         <field name="global" eval="True" />
-        <field
-            name="domain_force"
-        > ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
     <!-- Allow to refund RMAs -->
     <record id="rma_account_move_personal_rule" model="ir.rule">
diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 1bd399793..046f7d2f0 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -1,5 +1,6 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
+# Copyright 2025 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo.exceptions import UserError, ValidationError
@@ -28,7 +29,7 @@ def setUpClass(cls):
         )
         cls.rma_loc = cls.warehouse_company.rma_loc_id
         cls.product = cls.product_product.create(
-            {"name": "Product test 1", "type": "product"}
+            {"name": "Product test 1", "type": "consu", "is_storable": True}
         )
         cls.account_receiv = cls.env["account.account"].create(
             {
@@ -123,7 +124,7 @@ def _create_delivery(self):
             move.product_uom_qty = 10
         with picking_form.move_ids_without_package.new() as move:
             move.product_id = self.product_product.create(
-                {"name": "Product 2 test", "type": "product"}
+                {"name": "Product 2 test", "type": "consu", "is_storable": True}
             )
             move.product_uom_qty = 20
         picking = picking_form.save()
@@ -169,14 +170,44 @@ def test_rma_replace_pick_ship(self):
         wizard_form.product_uom_qty = rma.product_uom_qty
         wizard = wizard_form.save()
         wizard.action_deliver()
-        self.assertEqual(rma.delivery_picking_count, 2)
-        out_pickings = rma.mapped("delivery_move_ids.picking_id")
-        self.assertIn(
-            self.warehouse.pick_type_id, out_pickings.mapped("picking_type_id")
-        )
-        self.assertIn(
-            self.warehouse.out_type_id, out_pickings.mapped("picking_type_id")
+        out_picking = rma.delivery_move_ids.picking_id
+        out_picking.move_ids.quantity = 1
+        out_picking.button_validate()
+        self.assertEqual(out_picking.state, "done")
+        self.assertEqual(out_picking.picking_type_id, self.warehouse.pick_type_id)
+        next_transfer = out_picking._get_next_transfers()
+        self.assertEqual(next_transfer.picking_type_id, self.warehouse.out_type_id)
+        self.assertEqual(rma.delivery_picking_count, 1)
+
+    def test_rma_replace_pick_pack_ship(self):
+        self.warehouse.write({"delivery_steps": "pick_pack_ship"})
+        rma = self._create_rma(self.partner, self.product, 1, self.rma_loc)
+        rma.action_confirm()
+        rma.reception_move_id.quantity = 1
+        rma.reception_move_id.picking_id.button_validate()
+        self.assertEqual(rma.reception_move_id.picking_id.state, "done")
+        self.assertEqual(rma.state, "received")
+        res = rma.action_replace()
+        wizard_form = Form(self.env[res["res_model"]].with_context(**res["context"]))
+        wizard_form.product_id = self.product
+        wizard_form.product_uom_qty = rma.product_uom_qty
+        wizard = wizard_form.save()
+        wizard.action_deliver()
+        out_picking = rma.delivery_move_ids.picking_id
+        out_picking.move_ids.quantity = 1
+        out_picking.button_validate()
+        self.assertEqual(out_picking.state, "done")
+        self.assertEqual(out_picking.picking_type_id, self.warehouse.pick_type_id)
+        next_transfer = out_picking._get_next_transfers()
+        self.assertEqual(next_transfer.picking_type_id, self.warehouse.pack_type_id)
+        next_transfer.move_ids.quantity = 1
+        next_transfer.button_validate()
+        self.assertEqual(next_transfer.state, "done")
+        next_transfer_extra = next_transfer._get_next_transfers()
+        self.assertEqual(
+            next_transfer_extra.picking_type_id, self.warehouse.out_type_id
         )
+        self.assertEqual(rma.delivery_picking_count, 1)
 
     def test_computed(self):
         # If partner changes, the invoice address is set
@@ -193,7 +224,12 @@ def test_computed(self):
             }
         )
         product_2 = self.product_product.create(
-            {"name": "Product test 2", "type": "product", "uom_id": uom_ten.id}
+            {
+                "name": "Product test 2",
+                "type": "consu",
+                "is_storable": True,
+                "uom_id": uom_ten.id,
+            }
         )
         outgoing_picking_type = self.env["stock.picking.type"].search(
             [
@@ -305,6 +341,7 @@ def test_lock_unlock(self):
         self.assertEqual(rma_2.state, "received")
 
     @users("__system__", "user_rma")
+    @mute_logger("odoo.models.unlink")
     def test_action_refund(self):
         rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         self.assertEqual(rma.state, "received")
@@ -339,6 +376,7 @@ def test_action_refund(self):
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
 
+    @mute_logger("odoo.models.unlink")
     def test_mass_refund(self):
         # Create, confirm and receive rma_1
         rma_1 = self._create_confirm_receive(
@@ -351,7 +389,7 @@ def test_mass_refund(self):
         )
         # rma_3: Same partner and different product than rma_1
         product = self.product_product.create(
-            {"name": "Product 2 test", "type": "product"}
+            {"name": "Product 2 test", "type": "consu", "is_storable": True}
         )
         rma_3 = self._create_confirm_receive(self.partner, product, 20, self.rma_loc)
         # rma_4: Different partner and same product as rma_1
@@ -424,7 +462,7 @@ def test_replace(self):
         rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         # Replace with another product with quantity 2.
         product_2 = self.product_product.create(
-            {"name": "Product 2 test", "type": "product"}
+            {"name": "Product 2 test", "type": "consu", "is_storable": True}
         )
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
@@ -450,7 +488,7 @@ def test_replace(self):
         picking = first_move.picking_id
         # Replace again with another product with the remaining quantity
         product_3 = self.product_product.create(
-            {"name": "Product 3 test", "type": "product"}
+            {"name": "Product 3 test", "type": "consu", "is_storable": True}
         )
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
@@ -572,7 +610,7 @@ def test_mass_return_to_customer(self):
         )
         # rma_3: Same partner and different product than rma_1
         product = self.product_product.create(
-            {"name": "Product 2 test", "type": "product"}
+            {"name": "Product 2 test", "type": "consu", "is_storable": True}
         )
         rma_3 = self._create_confirm_receive(self.partner, product, 20, self.rma_loc)
         # rma_4: Different partner and same product as rma_1
@@ -653,7 +691,7 @@ def test_mass_return_to_customer_ungrouped(self):
         )
         # rma_3: Same partner and different product than rma_1
         product = self.product_product.create(
-            {"name": "Product 2 test", "type": "product"}
+            {"name": "Product 2 test", "type": "consu", "is_storable": True}
         )
         rma_3 = self._create_confirm_receive(self.partner, product, 20, self.rma_loc)
         # rma_4: Different partner and same product as rma_1
@@ -685,7 +723,11 @@ def test_rma_from_picking_return(self):
         stock_return_picking_form.create_rma = True
         stock_return_picking_form.rma_operation_id = self.operation
         return_wizard = stock_return_picking_form.save()
-        picking_action = return_wizard.create_returns()
+        for move in origin_delivery.move_ids_without_package:
+            return_wizard.product_return_moves.filtered(
+                lambda x, move=move: x.move_id == move
+            ).quantity = move.quantity
+        picking_action = return_wizard.action_create_returns()
         # Each origin move is linked to a different RMA
         origin_moves = origin_delivery.move_ids
         self.assertTrue(origin_moves[0].rma_ids)
diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index bccd9b3bb..28de3ee97 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -78,7 +78,6 @@
                                         name="rma_mail_confirmation_template_id"
                                         class="oe_inline"
                                         required="send_rma_confirmation"
-                                        context="{'default_model': 'rma'}"
                                     />
                                 </div>
                             </div>
@@ -116,7 +115,6 @@
                                         name="rma_mail_receipt_confirmation_template_id"
                                         class="oe_inline"
                                         required="send_rma_receipt_confirmation"
-                                        context="{'default_model': 'rma'}"
                                     />
                                 </div>
                             </div>
@@ -154,7 +152,6 @@
                                         name="rma_mail_draft_confirmation_template_id"
                                         class="oe_inline"
                                         required="send_rma_draft_confirmation"
-                                        context="{'default_model': 'rma'}"
                                     />
                                 </div>
                             </div>
diff --git a/rma/views/rma_finalization_views.xml b/rma/views/rma_finalization_views.xml
index 463a74e4a..c34dd81fe 100644
--- a/rma/views/rma_finalization_views.xml
+++ b/rma/views/rma_finalization_views.xml
@@ -45,11 +45,11 @@
         <field name="model">rma.finalization</field>
         <field eval="6" name="priority" />
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field name="company_id" groups="base.group_multi_company" />
                 <field name="company_id" invisible="1" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="action_rma_finalization" model="ir.actions.act_window">
diff --git a/rma/views/rma_portal_templates.xml b/rma/views/rma_portal_templates.xml
index ed82652e3..c0c873dbc 100644
--- a/rma/views/rma_portal_templates.xml
+++ b/rma/views/rma_portal_templates.xml
@@ -73,7 +73,7 @@
                                 <span t-field="rma.product_uom_qty" />
                             </td>
                             <td class="d-none d-md-table-cell tx_status">
-                                <span class="badge badge-pill badge-secondary">
+                                <span class="badge rounded-pill text-bg-info">
                                     <span t-field="rma.state" />
                                 </span>
                             </td>
@@ -93,251 +93,313 @@
                     />
                 </t>
             </t>
-            <t t-call="portal.portal_record_layout">
-                <t t-set="card_header">
-                    <h5 class="mb-0">
-                        <span>
-                            RMA Order -
-                            <span t-field="rma.name" />
-                        </span>
+            <h5 class="mb-0">
+                <span>
+                    RMA Order -
+                    <span t-field="rma.name" />
+                </span>
+                <span style="position: absolute; left: 50%;" class="d-none d-sm-inline">
+                    <a
+                        t-att-href="rma.get_portal_url(report_type='pdf', download=True)"
+                    >
+                        <i
+                            class="fa fa-download"
+                            role="img"
+                            aria-label="Download"
+                            title="Download"
+                        />
+                    </a>
+                </span>
+                <span class="float-right">
+                    <!-- Tags -->
+                    <t t-set="tags" t-value="rma.tag_ids.filtered('is_public')" />
+                    <!-- We don't have the color o_tag_color_# classes available in the frontend -->
+                    <t t-foreach="tags" t-as="tag">
                         <span
-                            style="position: absolute; left: 50%;"
-                            class="d-none d-sm-inline"
-                        >
-                            <a
-                                t-att-href="rma.get_portal_url(report_type='pdf', download=True)"
-                            >
-                                <i
-                                    class="fa fa-download"
-                                    role="img"
-                                    aria-label="Download"
-                                    title="Download"
-                                />
-                            </a>
+                            class="badge badge-pill badge-info label-text-align"
+                            t-esc="tag.name"
+                        />
+                    </t>
+                    <t t-if="rma.state in ['refunded', 'returned', 'replaced']">
+                        <span class="small text-success orders_label_text_align">
+                            <i class="fa fa-fw fa-check" />
+                            <b>
+                                <span t-field="rma.state" />
+                            </b>
                         </span>
-                        <span class="float-right">
-                            <!-- Tags -->
-                            <t
-                                t-set="tags"
-                                t-value="rma.tag_ids.filtered('is_public')"
-                            />
-                            <!-- We don't have the color o_tag_color_# classes available in the frontend -->
-                            <t t-foreach="tags" t-as="tag">
-                                <span
-                                    class="badge badge-pill badge-info label-text-align"
-                                    t-esc="tag.name"
+                    </t>
+                    <t t-elif="rma.state in ['cancelled', 'locked']">
+                        <span class="small text-danger orders_label_text_align">
+                            <i class="fa fa-fw fa-times" />
+                            <b>
+                                <span t-field="rma.state" />
+                            </b>
+                        </span>
+                    </t>
+                    <t t-else="">
+                        <span class="small text-info orders_label_text_align">
+                            <i class="fa fa-fw fa-clock-o" />
+                            <b>
+                                <span t-field="rma.state" />
+                            </b>
+                        </span>
+                    </t>
+                </span>
+            </h5>
+            <div id="general_information">
+                <div class="row mt4">
+                    <!-- Customer -->
+                    <div t-if="rma.partner_id" class="col-12 col-md-6 mb-4 mb-md-0">
+                        <h6>
+                            <strong>Customer:</strong>
+                        </h6>
+                        <div class="row">
+                            <div class="col flex-grow-0 pr-3">
+                                <img
+                                    t-if="rma.partner_id.avatar_1024"
+                                    class="o_avatar o_portal_contact_img rounded"
+                                    t-att-src="image_data_uri(rma.partner_id.avatar_512)"
+                                    alt="Contact"
                                 />
-                            </t>
-                            <t t-if="rma.state in ['refunded', 'returned', 'replaced']">
+                            </div>
+                            <div class="col pl-sm-0">
+                                <address
+                                    t-field="rma.partner_id"
+                                    t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'
+                                />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- Shipping Address -->
+                    <div
+                        t-if="rma.partner_shipping_id"
+                        class="col-12 col-md-6 mb-4 mb-md-0"
+                    >
+                        <h6>
+                            <strong>Shipping address:</strong>
+                        </h6>
+                        <div class="row">
+                            <div class="col flex-grow-0 pr-3">
+                                <img
+                                    t-if="rma.partner_shipping_id.avatar_1024"
+                                    class="o_avatar o_portal_contact_img rounded"
+                                    t-att-src="image_data_uri(rma.partner_shipping_id.avatar_512)"
+                                    alt="Contact"
+                                />
+                            </div>
+                            <div class="col pl-sm-0">
+                                <address
+                                    t-field="rma.partner_shipping_id"
+                                    t-options='{"widget": "contact", "fields": ["name", "email", "phone", "address"]}'
+                                />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- RMA Info -->
+                    <div t-if="rma.user_id" class="col-12 col-md-6">
+                        <h6>
+                            <strong>Responsible:</strong>
+                        </h6>
+                        <div class="row">
+                            <div class="col flex-grow-0 pr-3">
+                                <img
+                                    t-if="rma.user_id.avatar_1024"
+                                    class="o_avatar o_portal_contact_img rounded"
+                                    t-att-src="image_data_uri(rma.user_id.avatar_512)"
+                                    alt="Contact"
+                                />
+                            </div>
+                            <div class="col pl-sm-0">
+                                <address
+                                    t-field="rma.user_id"
+                                    t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row mt32" id="product_information">
+                    <div class="col-12 col-md-6 mb-4 mb-md-0">
+                        <div t-if="rma.picking_id" class="row mb-2 mb-sm-1">
+                            <div class="col-12 col-sm-4">
+                                <strong>Origin delivery</strong>
+                            </div>
+                            <div class="col-12 col-sm-8">
+                                <span t-field="rma.picking_id" />
+                            </div>
+                        </div>
+                        <!-- We need to prevent access errors if the product is
+                                unpublished-->
+                        <div t-if="rma.sudo().product_id" class="row mb-2 mb-sm-1">
+                            <div class="col-12 col-sm-4">
+                                <strong>Product</strong>
+                            </div>
+                            <div class="col-12 col-sm-8">
+                                <span t-esc="rma.sudo().product_id.display_name" />
+                            </div>
+                        </div>
+                        <div t-if="rma.product_uom_qty" class="row mb-2 mb-sm-1">
+                            <div class="col-12 col-sm-4">
+                                <strong>Quantity</strong>
+                            </div>
+                            <div class="col-12 col-sm-8">
+                                <span t-field="rma.product_uom_qty" />
+                            </div>
+                        </div>
+                        <div t-if="rma.delivered_qty" class="row">
+                            <div class="col-12 col-sm-4">
+                                <strong>Delivered quantity</strong>
+                            </div>
+                            <div class="col-12 col-sm-8">
+                                <span t-field="rma.delivered_qty" />
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-12 col-md-6">
+                        <div t-if="rma.date" class="row mb-2 mb-sm-1">
+                            <div class="col-12 col-sm-4">
+                                <strong>RMA Date</strong>
+                            </div>
+                            <div class="col-12 col-sm-8">
                                 <span
-                                    class="small text-success orders_label_text_align"
-                                >
-                                    <i class="fa fa-fw fa-check" />
-                                    <b>
-                                        <span t-field="rma.state" />
-                                    </b>
-                                </span>
-                            </t>
-                            <t t-elif="rma.state in ['cancelled', 'locked']">
-                                <span class="small text-danger orders_label_text_align">
-                                    <i class="fa fa-fw fa-times" />
-                                    <b>
-                                        <span t-field="rma.state" />
-                                    </b>
-                                </span>
-                            </t>
-                            <t t-else="">
-                                <span class="small text-info orders_label_text_align">
-                                    <i class="fa fa-fw fa-clock-o" />
-                                    <b>
-                                        <span t-field="rma.state" />
-                                    </b>
-                                </span>
-                            </t>
-                        </span>
-                    </h5>
-                </t>
-                <t t-set="card_body">
-                    <div id="general_information">
-                        <div class="row mt4">
-                            <!-- Customer -->
-                            <div
-                                t-if="rma.partner_id"
-                                class="col-12 col-md-6 mb-4 mb-md-0"
-                            >
-                                <h6>
-                                    <strong>Customer:</strong>
-                                </h6>
-                                <div class="row">
-                                    <div class="col flex-grow-0 pr-3">
-                                        <img
-                                            t-if="rma.partner_id.image_1024"
-                                            class="rounded-circle mt-1 o_portal_contact_img"
-                                            t-att-src="image_data_uri(rma.partner_id.image_1024)"
-                                            alt="Contact"
-                                        />
-                                        <img
-                                            t-else=""
-                                            class="rounded-circle mt-1 o_portal_contact_img"
-                                            src="/web/static/src/img/user_menu_avatar.png"
-                                            alt="Contact"
-                                        />
-                                    </div>
-                                    <div class="col pl-sm-0">
-                                        <address
-                                            t-field="rma.partner_id"
-                                            t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'
-                                        />
-                                    </div>
-                                </div>
+                                    t-field="rma.date"
+                                    t-options='{"widget": "date"}'
+                                />
                             </div>
-                            <!-- Shipping Address -->
-                            <div
-                                t-if="rma.partner_shipping_id"
-                                class="col-12 col-md-6 mb-4 mb-md-0"
-                            >
-                                <h6>
-                                    <strong>Shipping address:</strong>
-                                </h6>
-                                <div class="row">
-                                    <div class="col flex-grow-0 pr-3">
-                                        <img
-                                            t-if="rma.partner_shipping_id.image_1024"
-                                            class="rounded-circle mt-1 o_portal_contact_img"
-                                            t-att-src="image_data_uri(rma.partner_shipping_id.image_1024)"
-                                            alt="Contact"
-                                        />
-                                        <img
-                                            t-else=""
-                                            class="rounded-circle mt-1 o_portal_contact_img"
-                                            src="/web/static/src/img/user_menu_avatar.png"
-                                            alt="Contact"
-                                        />
-                                    </div>
-                                    <div class="col pl-sm-0">
-                                        <address
-                                            t-field="rma.partner_shipping_id"
-                                            t-options='{"widget": "contact", "fields": ["name", "email", "phone", "address"]}'
-                                        />
-                                    </div>
-                                </div>
+                        </div>
+                        <div t-if="rma.deadline" class="row mb-2 mb-sm-1">
+                            <div class="col-12 col-sm-4">
+                                <strong>Deadline</strong>
                             </div>
-                            <!-- RMA Info -->
-                            <div t-if="rma.user_id" class="col-12 col-md-6">
-                                <h6>
-                                    <strong>Responsible:</strong>
-                                </h6>
-                                <div class="row">
-                                    <div class="col flex-grow-0 pr-3">
-                                        <img
-                                            t-if="rma.user_id.image_1024"
-                                            class="rounded-circle mt-1 o_portal_contact_img"
-                                            t-att-src="image_data_uri(rma.user_id.image_1024)"
-                                            alt="Contact"
-                                        />
-                                        <img
-                                            t-else=""
-                                            class="rounded-circle mt-1 o_portal_contact_img"
-                                            src="/web/static/src/img/user_menu_avatar.png"
-                                            alt="Contact"
-                                        />
-                                    </div>
-                                    <div class="col pl-sm-0">
-                                        <address
-                                            t-field="rma.user_id"
-                                            t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'
-                                        />
-                                    </div>
-                                </div>
+                            <div class="col-12 col-sm-8">
+                                <span
+                                    t-field="rma.deadline"
+                                    t-options='{"widget": "date"}'
+                                />
                             </div>
                         </div>
-                        <div class="row mt32" id="product_information">
-                            <div class="col-12 col-md-6 mb-4 mb-md-0">
-                                <div t-if="rma.picking_id" class="row mb-2 mb-sm-1">
-                                    <div class="col-12 col-sm-4">
-                                        <strong>Origin delivery</strong>
-                                    </div>
-                                    <div class="col-12 col-sm-8">
-                                        <span t-field="rma.picking_id" />
-                                    </div>
-                                </div>
-                                <!-- We need to prevent access errors if the product is
-                                     unpublished-->
-                                <div
-                                    t-if="rma.sudo().product_id"
-                                    class="row mb-2 mb-sm-1"
-                                >
-                                    <div class="col-12 col-sm-4">
-                                        <strong>Product</strong>
-                                    </div>
-                                    <div class="col-12 col-sm-8">
-                                        <span
-                                            t-esc="rma.sudo().product_id.display_name"
-                                        />
-                                    </div>
-                                </div>
-                                <div
-                                    t-if="rma.product_uom_qty"
-                                    class="row mb-2 mb-sm-1"
-                                >
-                                    <div class="col-12 col-sm-4">
-                                        <strong>Quantity</strong>
-                                    </div>
-                                    <div class="col-12 col-sm-8">
-                                        <span t-field="rma.product_uom_qty" />
-                                    </div>
-                                </div>
-                                <div t-if="rma.delivered_qty" class="row">
-                                    <div class="col-12 col-sm-4">
-                                        <strong>Delivered quantity</strong>
-                                    </div>
-                                    <div class="col-12 col-sm-8">
-                                        <span t-field="rma.delivered_qty" />
-                                    </div>
-                                </div>
+                        <div t-if="rma.origin" class="row">
+                            <div class="col-12 col-sm-4">
+                                <strong>Origin</strong>
                             </div>
-                            <div class="col-12 col-md-6">
-                                <div t-if="rma.date" class="row mb-2 mb-sm-1">
-                                    <div class="col-12 col-sm-4">
-                                        <strong>RMA Date</strong>
-                                    </div>
-                                    <div class="col-12 col-sm-8">
-                                        <span
-                                            t-field="rma.date"
-                                            t-options='{"widget": "date"}'
-                                        />
-                                    </div>
-                                </div>
-                                <div t-if="rma.deadline" class="row mb-2 mb-sm-1">
-                                    <div class="col-12 col-sm-4">
-                                        <strong>Deadline</strong>
-                                    </div>
-                                    <div class="col-12 col-sm-8">
-                                        <span
-                                            t-field="rma.deadline"
-                                            t-options='{"widget": "date"}'
-                                        />
-                                    </div>
-                                </div>
-                                <div t-if="rma.origin" class="row">
-                                    <div class="col-12 col-sm-4">
-                                        <strong>Origin</strong>
-                                    </div>
-                                    <div class="col-12 col-sm-8">
-                                        <span t-field="rma.origin" />
-                                    </div>
-                                </div>
+                            <div class="col-12 col-sm-8">
+                                <span t-field="rma.origin" />
                             </div>
                         </div>
                     </div>
-                    <section
-                        t-if="rma.reception_move_id"
-                        id="reception_section"
-                        style="page-break-inside: auto;"
-                        class="mt32"
+                </div>
+            </div>
+            <section
+                t-if="rma.reception_move_id"
+                id="reception_section"
+                style="page-break-inside: auto;"
+                class="mt32"
+            >
+                <strong class="d-block mb-1">Reception</strong>
+                <t t-set="picking" t-value="rma.reception_move_id.picking_id" />
+                <t
+                    t-set="report_url"
+                    t-value="'/my/rma/picking/pdf/%s/%s?%s' % (rma.id, picking.id, keep_query())"
+                />
+                <a
+                    class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3"
+                    t-att-href="report_url"
+                >
+                    <div>
+                        <i
+                            class="fa fa-truck mr-1"
+                            role="img"
+                            aria-label="Download"
+                            title="Download"
+                        />
+                        <span t-esc="picking.name" class="mr-lg-3" />
+                        <div class="d-lg-inline-block">
+                            Date:
+                            <span class="text-muted" t-field="picking.date" />
+                        </div>
+                    </div>
+                    <t t-if="picking.state == 'done'">
+                        <span class="badge badge-success label-text-align">
+                            <i class="fa fa-fw fa-truck" />
+                            Shipped
+                        </span>
+                    </t>
+                    <t t-if="picking.state == 'partially_available'">
+                        <span class="badge badge-warning label-text-align">
+                            <i class="fa fa-fw fa-clock-o" />
+                            Partially Available
+                        </span>
+                    </t>
+                    <t t-if="picking.state == 'cancel'">
+                        <span class="badge badge-danger label-text-align">
+                            <i class="fa fa-fw fa-times" />
+                            Cancelled
+                        </span>
+                    </t>
+                    <t
+                        t-if="picking.state in ['draft', 'waiting', 'confirmed', 'assigned']"
+                    >
+                        <span class="badge badge-info label-text-align">
+                            <i class="fa fa-fw fa-clock-o" />
+                            Preparation
+                        </span>
+                    </t>
+                </a>
+            </section>
+            <section
+                t-if="rma.refund_id"
+                id="refund_section"
+                style="page-break-inside: auto;"
+                class="mt32"
+            >
+                <strong class="d-block mb-1">Refund</strong>
+                <t t-set="refund" t-value="rma.refund_id" />
+                <t
+                    t-set="report_url"
+                    t-value="refund.get_portal_url(report_type='pdf')"
+                />
+                <a
+                    class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3"
+                    t-att-href="report_url"
+                >
+                    <div>
+                        <i
+                            class="fa fa-pencil-square-o mr-1"
+                            role="img"
+                            aria-label="Download"
+                            title="Download"
+                        />
+                        <span t-esc="refund.name" class="mr-lg-3" />
+                        <div class="d-lg-inline-block">
+                            Date:
+                            <span class="text-muted" t-field="refund.invoice_date" />
+                        </div>
+                    </div>
+                    <span
+                        t-if="refund.state == 'paid'"
+                        class="small text-success orders_label_text_align"
+                    >
+                        <i class="fa fa-fw fa-check" />
+                        <b>Paid</b>
+                    </span>
+                    <span t-else="" class="small text-info orders_label_text_align">
+                        <i class="fa fa-fw fa-clock-o" />
+                        <b>Waiting Payment</b>
+                    </span>
+                </a>
+            </section>
+            <section
+                t-if="rma.delivery_move_ids"
+                id="reception_section"
+                style="page-break-inside: auto;"
+                class="mt32"
+            >
+                <strong class="d-block mb-1">Delivery</strong>
+                <ul class="list-group mb-4">
+                    <t
+                        t-foreach="rma.delivery_move_ids.mapped('picking_id')"
+                        t-as="picking"
                     >
-                        <strong class="d-block mb-1">Reception</strong>
-                        <t t-set="picking" t-value="rma.reception_move_id.picking_id" />
                         <t
                             t-set="report_url"
                             t-value="'/my/rma/picking/pdf/%s/%s?%s' % (rma.id, picking.id, keep_query())"
@@ -386,134 +448,14 @@
                                 </span>
                             </t>
                         </a>
-                    </section>
-                    <section
-                        t-if="rma.refund_id"
-                        id="refund_section"
-                        style="page-break-inside: auto;"
-                        class="mt32"
-                    >
-                        <strong class="d-block mb-1">Refund</strong>
-                        <t t-set="refund" t-value="rma.refund_id" />
-                        <t
-                            t-set="report_url"
-                            t-value="refund.get_portal_url(report_type='pdf')"
-                        />
-                        <a
-                            class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3"
-                            t-att-href="report_url"
-                        >
-                            <div>
-                                <i
-                                    class="fa fa-pencil-square-o mr-1"
-                                    role="img"
-                                    aria-label="Download"
-                                    title="Download"
-                                />
-                                <span t-esc="refund.name" class="mr-lg-3" />
-                                <div class="d-lg-inline-block">
-                                    Date:
-                                    <span
-                                    class="text-muted"
-                                    t-field="refund.invoice_date"
-                                />
-                                </div>
-                            </div>
-                            <span
-                                t-if="refund.state == 'paid'"
-                                class="small text-success orders_label_text_align"
-                            >
-                                <i class="fa fa-fw fa-check" />
-                                <b>Paid</b>
-                            </span>
-                            <span
-                                t-else=""
-                                class="small text-info orders_label_text_align"
-                            >
-                                <i class="fa fa-fw fa-clock-o" />
-                                <b>Waiting Payment</b>
-                            </span>
-                        </a>
-                    </section>
-                    <section
-                        t-if="rma.delivery_move_ids"
-                        id="reception_section"
-                        style="page-break-inside: auto;"
-                        class="mt32"
-                    >
-                        <strong class="d-block mb-1">Delivery</strong>
-                        <ul class="list-group mb-4">
-                            <t
-                                t-foreach="rma.delivery_move_ids.mapped('picking_id')"
-                                t-as="picking"
-                            >
-                                <t
-                                    t-set="report_url"
-                                    t-value="'/my/rma/picking/pdf/%s/%s?%s' % (rma.id, picking.id, keep_query())"
-                                />
-                                <a
-                                    class="list-group-item list-group-item-action d-flex flex-wrap align-items-center justify-content-between py-2 px-3"
-                                    t-att-href="report_url"
-                                >
-                                    <div>
-                                        <i
-                                            class="fa fa-truck mr-1"
-                                            role="img"
-                                            aria-label="Download"
-                                            title="Download"
-                                        />
-                                        <span t-esc="picking.name" class="mr-lg-3" />
-                                        <div class="d-lg-inline-block">
-                                            Date:
-                                            <span
-                                            class="text-muted"
-                                            t-field="picking.date"
-                                        />
-                                        </div>
-                                    </div>
-                                    <t t-if="picking.state == 'done'">
-                                        <span
-                                            class="badge badge-success label-text-align"
-                                        >
-                                            <i class="fa fa-fw fa-truck" />
-                                            Shipped
-                                        </span>
-                                    </t>
-                                    <t t-if="picking.state == 'partially_available'">
-                                        <span
-                                            class="badge badge-warning label-text-align"
-                                        >
-                                            <i class="fa fa-fw fa-clock-o" />
-                                            Partially Available
-                                        </span>
-                                    </t>
-                                    <t t-if="picking.state == 'cancel'">
-                                        <span
-                                            class="badge badge-danger label-text-align"
-                                        >
-                                            <i class="fa fa-fw fa-times" />
-                                            Cancelled
-                                        </span>
-                                    </t>
-                                    <t
-                                        t-if="picking.state in ['draft', 'waiting', 'confirmed', 'assigned']"
-                                    >
-                                        <span class="badge badge-info label-text-align">
-                                            <i class="fa fa-fw fa-clock-o" />
-                                            Preparation
-                                        </span>
-                                    </t>
-                                </a>
-                            </t>
-                        </ul>
-                    </section>
-                    <section id="description" class="mt-5" t-if="rma.description">
-                        <h3 class="">Description</h3>
-                        <hr class="mt-0 mb-1" />
-                        <t t-out="rma.description" />
-                    </section>
-                </t>
-            </t>
+                    </t>
+                </ul>
+            </section>
+            <section id="description" class="mt-5" t-if="rma.description">
+                <h3 class="">Description</h3>
+                <hr class="mt-0 mb-1" />
+                <t t-out="rma.description" />
+            </section>
             <!-- chatter -->
             <div id="rma_communication" class="mt-4">
                 <h2>Communication</h2>
diff --git a/rma/views/rma_tag_views.xml b/rma/views/rma_tag_views.xml
index 3cd8b9150..f62464aa9 100644
--- a/rma/views/rma_tag_views.xml
+++ b/rma/views/rma_tag_views.xml
@@ -37,11 +37,11 @@
         <field name="model">rma.tag</field>
         <field eval="6" name="priority" />
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="name" />
                 <field name="is_public" />
                 <field name="active" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="action_rma_tag" model="ir.actions.act_window">
diff --git a/rma/views/rma_team_views.xml b/rma/views/rma_team_views.xml
index 49a1c76e3..ba6fa0133 100644
--- a/rma/views/rma_team_views.xml
+++ b/rma/views/rma_team_views.xml
@@ -5,13 +5,13 @@
     <record id="rma_team_view_tree" model="ir.ui.view">
         <field name="model">rma.team</field>
         <field name="arch" type="xml">
-            <tree>
+            <list>
                 <field name="sequence" widget="handle" />
                 <field name="name" />
                 <field name="user_id" />
                 <field name="company_id" groups="base.group_multi_company" />
                 <field name="company_id" column_invisible="1" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="rma_team_view_form" model="ir.ui.view">
@@ -52,30 +52,32 @@
                                     <field name="id" />
                                     <field name="name" />
                                     <templates>
-                                        <t t-name="kanban-box">
-                                            <div
-                                                class="oe_kanban_global_click"
-                                                style="max-width: 200px"
-                                            >
-                                                <div class="o_kanban_record_top">
-                                                    <img
-                                                        t-att-src="kanban_image('res.users', 'avatar_128', record.id.raw_value)"
-                                                        height="40"
-                                                        width="40"
-                                                        class="oe_avatar oe_kanban_avatar_smallbox mb0"
-                                                        alt="Avatar"
+                                        <t t-name="card" class="flex-row">
+                                            <aside>
+                                                <field
+                                                    name="avatar_128"
+                                                    widget="image"
+                                                    class="o_image_64_cover"
+                                                    alt="Avatar"
+                                                />
+                                            </aside>
+                                            <main class="ms-3">
+                                                <field
+                                                    name="name"
+                                                    class="fw-bold fs-5"
+                                                />
+                                                <div
+                                                    class="d-flex align-items-baseline text-break"
+                                                >
+                                                    <i
+                                                        class="fa fa-envelope me-1"
+                                                        role="img"
+                                                        aria-label="Email"
+                                                        title="Email"
                                                     />
-                                                    <div
-                                                        class="o_kanban_record_headings ml8"
-                                                    >
-                                                        <strong
-                                                            class="o_kanban_record_title"
-                                                        >
-                                                            <field name="name" />
-                                                        </strong>
-                                                    </div>
+                                                    <field name="email" />
                                                 </div>
-                                            </div>
+                                            </main>
                                         </t>
                                     </templates>
                                 </kanban>
@@ -115,17 +117,14 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" />
-                    <field name="message_ids" widget="mail_thread" />
-                </div>
+                <chatter />
             </form>
         </field>
     </record>
     <record id="rma_team_action" model="ir.actions.act_window">
         <field name="name">RMA team</field>
         <field name="res_model">rma.team</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
                 Click to add a new RMA.
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index bccfd6faa..47020b0cc 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -103,7 +103,7 @@
         <field name="name">rma.view.tree</field>
         <field name="model">rma</field>
         <field name="arch" type="xml">
-            <tree
+            <list
                 decoration-muted="state in ['cancelled', 'locked']"
                 decoration-bf="state == 'draft' and product_id == False"
                 decoration-danger="deadline and (deadline &lt; current_date)"
@@ -119,7 +119,7 @@
                 <field name="deadline" />
                 <field name="finalization_id" optional="hide" />
                 <field name="state" />
-            </tree>
+            </list>
         </field>
     </record>
     <record id="rma_view_form" model="ir.ui.view">
@@ -340,11 +340,7 @@
                                 groups="base.group_multi_company"
                                 readonly="state in ['locked', 'cancelled']"
                             />
-                            <field
-                                name="company_id"
-                                invisible="1"
-                                readonly="state in ['locked', 'cancelled']"
-                            />
+                            <field name="company_id" invisible="1" />
                         </group>
                     </group>
                     <notebook>
@@ -373,7 +369,6 @@
                                         widget="priority"
                                         readonly="state != 'draft'"
                                     />
-                                    <field name="origin_split_rma_id" invisible="1" />
                                 </group>
                             </group>
                             <group>
@@ -386,23 +381,8 @@
                             </group>
                         </page>
                     </notebook>
-                    <field name="sent" invisible="1" />
-                    <field name="reception_move_id" invisible="1" />
-                    <field name="refund_id" invisible="1" />
-                    <field name="can_be_refunded" invisible="1" />
-                    <field name="can_be_returned" invisible="1" />
-                    <field name="can_be_replaced" invisible="1" />
-                    <field name="can_be_split" invisible="1" />
-                    <field name="can_be_locked" invisible="1" />
-                    <field name="can_be_finished" invisible="1" />
-                    <field name="commercial_partner_id" invisible="1" />
-                    <field name="remaining_qty" invisible="1" />
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" />
-                    <field name="activity_ids" widget="mail_activity" />
-                    <field name="message_ids" widget="mail_thread" />
-                </div>
+                <chatter />
             </form>
         </field>
     </record>
@@ -458,7 +438,7 @@
     <record id="rma_action" model="ir.actions.act_window">
         <field name="name">RMA</field>
         <field name="res_model">rma</field>
-        <field name="view_mode">tree,form,pivot,calendar,activity</field>
+        <field name="view_mode">list,form,pivot,calendar,activity</field>
         <field name="context">{}</field>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
diff --git a/rma/wizard/rma_delivery.py b/rma/wizard/rma_delivery.py
index b47aa75e8..b4c7ba28b 100644
--- a/rma/wizard/rma_delivery.py
+++ b/rma/wizard/rma_delivery.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 
 
@@ -40,7 +40,7 @@ def _check_product_uom_qty(self):
         self.ensure_one()
         rma_ids = self.env.context.get("active_ids")
         if len(rma_ids) == 1 and self.product_uom_qty <= 0:
-            raise ValidationError(_("Quantity must be greater than 0."))
+            raise ValidationError(self.env._("Quantity must be greater than 0."))
 
     @api.model
     def default_get(self, fields_list):
diff --git a/rma/wizard/rma_delivery_views.xml b/rma/wizard/rma_delivery_views.xml
index 3209002f6..0694e7627 100644
--- a/rma/wizard/rma_delivery_views.xml
+++ b/rma/wizard/rma_delivery_views.xml
@@ -18,7 +18,6 @@
                         />
                     </group>
                     <group>
-                        <field name="uom_category_id" invisible="1" />
                         <field
                             name="product_id"
                             invisible="type != 'replace' or rma_count > 1"
@@ -37,8 +36,6 @@
                         </div>
                     </group>
                 </group>
-                <field name="rma_count" invisible="1" />
-                <field name="type" invisible="1" />
                 <footer>
                     <button
                         name="action_deliver"
diff --git a/rma/wizard/rma_split.py b/rma/wizard/rma_split.py
index e30d204c4..2c093ad71 100644
--- a/rma/wizard/rma_split.py
+++ b/rma/wizard/rma_split.py
@@ -1,7 +1,7 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 
 
 class RmaReSplitWizard(models.TransientModel):
@@ -60,7 +60,7 @@ def action_split(self):
             self.product_uom_qty, self.product_uom
         )
         return {
-            "name": _("Extracted RMA"),
+            "name": self.env._("Extracted RMA"),
             "type": "ir.actions.act_window",
             "view_type": "form",
             "view_mode": "form",
diff --git a/rma/wizard/rma_split_views.xml b/rma/wizard/rma_split_views.xml
index b141e47e3..0c962ada0 100644
--- a/rma/wizard/rma_split_views.xml
+++ b/rma/wizard/rma_split_views.xml
@@ -14,7 +14,6 @@
                         <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 3bed8265a..065f7ecd5 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -1,11 +1,12 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
+# Copyright 2025 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from copy import deepcopy
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
-from odoo.tools import float_compare
+from odoo.tools import float_is_zero
 
 
 class ReturnPickingLine(models.TransientModel):
@@ -27,12 +28,13 @@ def _compute_rma_operation_id(self):
 
     def _prepare_rma_vals(self):
         self.ensure_one()
+        warehouse = self.move_id.picking_id.picking_type_id.warehouse_id
         return {
             "move_id": self.move_id.id,
             "product_id": self.move_id.product_id.id,
             "product_uom_qty": self.quantity,
             "product_uom": self.product_id.uom_id.id,
-            "location_id": self.wizard_id.location_id.id or self.move_id.location_id.id,
+            "location_id": warehouse.rma_loc_id.id,
             "operation_id": self.rma_operation_id.id,
         }
 
@@ -42,47 +44,17 @@ 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"
-    )
     rma_operation_id = fields.Many2one(
         comodel_name="rma.operation",
         string="Requested operation",
     )
-    # 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
             # 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 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
 
     def _prepare_rma_partner_values(self):
         self.ensure_one()
@@ -119,10 +91,8 @@ def _prepare_rma_vals_list(self):
         for return_picking in self:
             global_vals = return_picking._prepare_rma_vals()
             for line in return_picking.product_return_moves:
-                if (
-                    not line.move_id
-                    or float_compare(line.quantity, 0, line.product_id.uom_id.rounding)
-                    <= 0
+                if not line.move_id or float_is_zero(
+                    line.quantity, precision_rounding=line.uom_id.rounding
                 ):
                     continue
                 vals = deepcopy(global_vals)
@@ -130,7 +100,7 @@ def _prepare_rma_vals_list(self):
                 vals_list.append(vals)
         return vals_list
 
-    def create_returns(self):
+    def action_create_returns(self):
         """Override create_returns method for creating one or more
         'confirmed' RMAs after return a delivery picking in case
         'Create RMAs' checkbox is checked in this wizard.
@@ -141,7 +111,7 @@ def create_returns(self):
         if self.create_rma:
             if not self.picking_id.partner_id:
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "You must specify the 'Customer' in the "
                         "'Stock Picking' from which RMAs will be created"
                     )
@@ -165,11 +135,11 @@ def create_returns(self):
                 }
             )
             return {
-                "name": _("Returned Picking"),
-                "view_mode": "form,tree,calendar",
+                "name": self.env._("Returned Picking"),
+                "view_mode": "form,list,calendar",
                 "res_model": "stock.picking",
                 "res_id": picking.id,
                 "type": "ir.actions.act_window",
                 "context": ctx,
             }
-        return super().create_returns()
+        return super().action_create_returns()
diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
index 167519d9b..4cc0b1e79 100644
--- a/rma/wizard/stock_picking_return_views.xml
+++ b/rma/wizard/stock_picking_return_views.xml
@@ -8,7 +8,7 @@
         <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="//field[@name='product_return_moves']//tree" position="inside">
+            <xpath expr="//field[@name='product_return_moves']//list" position="inside">
                 <field
                     name="rma_operation_id"
                     required="parent.create_rma and quantity>0"
@@ -22,10 +22,6 @@
                         invisible="picking_type_code != 'outgoing'"
                     />
                     <field name="rma_operation_id" invisible="not create_rma" />
-                    <field name="rma_location_ids" invisible="1" />
-                    <field name="picking_id" invisible="1" />
-                    <field name="picking_type_code" invisible="1" />
-                    <field name="location_id" invisible="1" />
                 </group>
             </field>
         </field>