diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index f63ea855..fe9c9af8 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 aeb6d1c8..d590b0f0 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 dd2e0d74..b807bbd7 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 04274808..6475bdf3 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 1f74e33f..0e633fe8 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 00000000..77fe95b4
--- /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 191bc965..ee40d060 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -176,7 +176,7 @@ class Rma(models.Model):
         copy=False,
         track_visibility="onchange",
     )
-    description = fields.Text(
+    description = fields.Html(
         states={
             'locked': [('readonly', True)],
             'cancelled': [('readonly', True)],
@@ -965,8 +965,9 @@ class Rma(models.Model):
                     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 @@ class Rma(models.Model):
     ):
         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 29556146..217d4c6c 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -57,7 +57,7 @@ class StockMove(models.Model):
         """
         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 c6320d0d..2225bab3 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 9219c044..33b6e98e 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 f77660a6..6885d52b 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>