diff --git a/rma_reason/README.rst b/rma_reason/README.rst
index f9815c476..febe27a34 100644
--- a/rma_reason/README.rst
+++ b/rma_reason/README.rst
@@ -85,7 +85,7 @@ Contributors
 ------------
 
 -  Jacques-Etienne Baudoux - BCIM je@bcim.be
--  Souheil Bejaoui - ACSONE SA/NV souheil.bejaoui@acsone.eu.com
+-  Souheil Bejaoui - ACSONE SA/NV souheil.bejaoui@acsone.eu
 
 Maintainers
 -----------
diff --git a/rma_reason/readme/CONTRIBUTORS.md b/rma_reason/readme/CONTRIBUTORS.md
index 354d493cf..9e08567ce 100644
--- a/rma_reason/readme/CONTRIBUTORS.md
+++ b/rma_reason/readme/CONTRIBUTORS.md
@@ -1,2 +1,2 @@
 - Jacques-Etienne Baudoux - BCIM <je@bcim.be>
-- Souheil Bejaoui - ACSONE SA/NV <souheil.bejaoui@acsone.eu.com>
+- Souheil Bejaoui - ACSONE SA/NV <souheil.bejaoui@acsone.eu>
diff --git a/rma_reason/static/description/index.html b/rma_reason/static/description/index.html
index b502c1a47..e91875140 100644
--- a/rma_reason/static/description/index.html
+++ b/rma_reason/static/description/index.html
@@ -429,7 +429,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
 <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
 <ul class="simple">
 <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.com">souheil.bejaoui&#64;acsone.eu.com</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">
diff --git a/rma_sale/static/src/js/rma_portal_form.js b/rma_sale/static/src/js/rma_portal_form.js
index 89e3d3103..d1b214bc3 100644
--- a/rma_sale/static/src/js/rma_portal_form.js
+++ b/rma_sale/static/src/js/rma_portal_form.js
@@ -132,4 +132,5 @@ odoo.define("rma_sale.animation", function (require) {
             $(ev.currentTarget).addClass("bg-primary").addClass("text-primary");
         },
     });
+    return publicWidget;
 });
diff --git a/rma_sale/views/sale_portal_template.xml b/rma_sale/views/sale_portal_template.xml
index d9196057f..f2367ae49 100644
--- a/rma_sale/views/sale_portal_template.xml
+++ b/rma_sale/views/sale_portal_template.xml
@@ -92,7 +92,10 @@
                             <th class="text-start">Product</th>
                             <th class="text-end">Quantity</th>
                             <th class="text-start">Delivery</th>
-                            <th class="text-start">Requested operation</th>
+                            <th
+                                class="text-start"
+                                name="operation"
+                            >Requested operation</th>
                             <th name="portal_rma_button_desc" />
                         </tr>
                     </thead>
@@ -147,7 +150,7 @@
                                             t-att-value="data['picking'] and data['picking'].id"
                                         />
                                     </td>
-                                    <td class="text-start">
+                                    <td class="text-start" name="operation">
                                         <select
                                             t-attf-name="#{data_index}-operation_id"
                                             class="form-control rma-operation"
diff --git a/rma_sale_reason/README.rst b/rma_sale_reason/README.rst
new file mode 100644
index 000000000..9a95c2d13
--- /dev/null
+++ b/rma_sale_reason/README.rst
@@ -0,0 +1,101 @@
+===============
+Rma Sale Reason
+===============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:cbc6042f5078d432134c3bb0f3aa3ca2eaaca763041004ab982997f8f44b9a58
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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/16.0/rma_sale_reason
+    :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_sale_reason
+    :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
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+Getting the information as soon as possible is crucial for any business.
+That's why, when creating an RMA order from a sales order, it's more
+efficient to give the salesperson the possibility to record the return
+reason instead of waiting for the RMA team to do it when they process
+the order. This ensures accurate recording of customer issues and
+improves data accuracy.
+
+This addon is an extension of the rma_sale and rma_reason addons. It
+allows salespersons to specify the return reason when creating the RMA
+order from the sales order.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+When creating an RMA from a sale order select the reason for the return.
+
+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_sale_reason%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.
+
+Credits
+=======
+
+Authors
+-------
+
+* Raumschmiede GmbH
+* BCIM
+* ACSONE SA/NV
+
+Contributors
+------------
+
+-  Jacques-Etienne Baudoux - BCIM je@bcim.be
+-  Souheil Bejaoui - ACSONE SA/NV souheil.bejaoui@acsone.eu
+
+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-sbejaoui| image:: https://github.com/sbejaoui.png?size=40px
+    :target: https://github.com/sbejaoui
+    :alt: sbejaoui
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-sbejaoui| 
+
+This module is part of the `OCA/rma <https://github.com/OCA/rma/tree/16.0/rma_sale_reason>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/rma_sale_reason/__init__.py b/rma_sale_reason/__init__.py
new file mode 100644
index 000000000..9fa1272a9
--- /dev/null
+++ b/rma_sale_reason/__init__.py
@@ -0,0 +1,2 @@
+from . import controllers
+from . import wizards
diff --git a/rma_sale_reason/__manifest__.py b/rma_sale_reason/__manifest__.py
new file mode 100644
index 000000000..1cb5d136b
--- /dev/null
+++ b/rma_sale_reason/__manifest__.py
@@ -0,0 +1,27 @@
+# Copyright 2024 Raumschmiede GmbH
+# Copyright 2024 BCIM
+# Copyright 2024 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Rma Sale Reason",
+    "version": "16.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "Raumschmiede GmbH,BCIM,ACSONE SA/NV,Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/rma",
+    "depends": ["rma_sale", "rma_reason"],
+    "maintainers": ["sbejaoui"],
+    "data": [
+        "wizards/sale_order_rma_wizard.xml",
+        "views/rma_portal_templates.xml",
+    ],
+    "demo": [],
+    "assets": {
+        "web.assets_frontend": [
+            "/rma_sale_reason/static/src/js/rma_portal_form.js",
+        ],
+        "web.assets_tests": [
+            "/rma_sale_reason/static/src/tests/*.js",
+        ],
+    },
+}
diff --git a/rma_sale_reason/controllers/__init__.py b/rma_sale_reason/controllers/__init__.py
new file mode 100644
index 000000000..81ac87644
--- /dev/null
+++ b/rma_sale_reason/controllers/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import rma_portal
diff --git a/rma_sale_reason/controllers/rma_portal.py b/rma_sale_reason/controllers/rma_portal.py
new file mode 100644
index 000000000..475549176
--- /dev/null
+++ b/rma_sale_reason/controllers/rma_portal.py
@@ -0,0 +1,27 @@
+# Copyright 2024 Raumschmiede GmbH
+# Copyright 2024 BCIM
+# Copyright 2024 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import http
+
+from odoo.addons.rma_sale.controllers.sale_portal import CustomerPortal
+
+
+class RmaPortal(CustomerPortal):
+    @http.route(
+        ["/my/orders/<int:order_id>/requestrma"],
+        type="http",
+        auth="public",
+        methods=["POST"],
+        website=True,
+    )
+    def request_rma(self, order_id, access_token=None, **post):
+        """
+        We used a hidden input to determine whether the reason is required or not.
+        Now, we remove it from the post data as the base controller puts all custom
+        inputs in the description field.
+        """
+        if "is_rma_reason_required" in post:
+            del post["is_rma_reason_required"]
+        return super().request_rma(order_id, access_token=access_token, **post)
diff --git a/rma_sale_reason/readme/CONTRIBUTORS.md b/rma_sale_reason/readme/CONTRIBUTORS.md
new file mode 100644
index 000000000..9e08567ce
--- /dev/null
+++ b/rma_sale_reason/readme/CONTRIBUTORS.md
@@ -0,0 +1,2 @@
+- Jacques-Etienne Baudoux - BCIM <je@bcim.be>
+- Souheil Bejaoui - ACSONE SA/NV <souheil.bejaoui@acsone.eu>
diff --git a/rma_sale_reason/readme/DESCRIPTION.md b/rma_sale_reason/readme/DESCRIPTION.md
new file mode 100644
index 000000000..a968ce67e
--- /dev/null
+++ b/rma_sale_reason/readme/DESCRIPTION.md
@@ -0,0 +1,10 @@
+Getting the information as soon as possible is crucial for any business. 
+That's why, when creating an RMA order from a sales order, 
+it's more efficient to give the salesperson the possibility to record the 
+return reason instead of waiting for the RMA team to do it when they process 
+the order. This ensures accurate recording of customer issues and improves 
+data accuracy.
+
+This addon is an extension of the rma_sale and rma_reason addons. 
+It allows salespersons to specify the return reason when creating the RMA 
+order from the sales order.
diff --git a/rma_sale_reason/readme/USAGE.md b/rma_sale_reason/readme/USAGE.md
new file mode 100644
index 000000000..9a9da63d6
--- /dev/null
+++ b/rma_sale_reason/readme/USAGE.md
@@ -0,0 +1 @@
+When creating an RMA from a sale order select the reason for the return.
diff --git a/rma_sale_reason/static/description/icon.png b/rma_sale_reason/static/description/icon.png
new file mode 100644
index 000000000..3a0328b51
Binary files /dev/null and b/rma_sale_reason/static/description/icon.png differ
diff --git a/rma_sale_reason/static/description/index.html b/rma_sale_reason/static/description/index.html
new file mode 100644
index 000000000..0c4c0852f
--- /dev/null
+++ b/rma_sale_reason/static/description/index.html
@@ -0,0 +1,438 @@
+<!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: https://docutils.sourceforge.io/" />
+<title>Rma Sale Reason</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+: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 https://docutils.sourceforge.io/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="rma-sale-reason">
+<h1 class="title">Rma Sale Reason</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:cbc6042f5078d432134c3bb0f3aa3ca2eaaca763041004ab982997f8f44b9a58
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" 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 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_sale_reason"><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_sale_reason"><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>Getting the information as soon as possible is crucial for any business.
+That’s why, when creating an RMA order from a sales order, it’s more
+efficient to give the salesperson the possibility to record the return
+reason instead of waiting for the RMA team to do it when they process
+the order. This ensures accurate recording of customer issues and
+improves data accuracy.</p>
+<p>This addon is an extension of the rma_sale and rma_reason addons. It
+allows salespersons to specify the return reason when creating the RMA
+order from the sales order.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
+<p>When creating an RMA from a sale order select the reason for the return.</p>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-2">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_sale_reason%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="#toc-entry-3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<ul class="simple">
+<li>Raumschmiede GmbH</li>
+<li>BCIM</li>
+<li>ACSONE SA/NV</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<ul class="simple">
+<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-6">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 image-reference" href="https://github.com/sbejaoui"><img alt="sbejaoui" src="https://github.com/sbejaoui.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_sale_reason">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_sale_reason/static/src/js/rma_portal_form.js b/rma_sale_reason/static/src/js/rma_portal_form.js
new file mode 100644
index 000000000..5bdd65a02
--- /dev/null
+++ b/rma_sale_reason/static/src/js/rma_portal_form.js
@@ -0,0 +1,40 @@
+/*  Copyright 2024 Raumschmiede GmbH
+    Copyright 2024 BCIM
+    Copyright 2024 ACSONE SA/NV
+    License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).*/
+
+odoo.define("rma_sale_reason.animation", function (require) {
+    "use strict";
+    const publicWidget = require("rma_sale.animation");
+    publicWidget.registry.PortalRmaSale.include({
+        events: _.extend({}, publicWidget.registry.PortalRmaSale.prototype.events, {
+            "change .rma-reason": "_onChangeReasonId",
+        }),
+        _onChangeReasonId: function () {
+            this._checkCanSubmit();
+        },
+        _canSubmit: function () {
+            var can_submit = false;
+            var is_rma_reason_required = this.$el
+                .find('input[name="is_rma_reason_required"]')
+                .val();
+            if (is_rma_reason_required === "0") {
+                return this._super(...arguments);
+            }
+            for (const id of this.rows_ids) {
+                const row = this.rows[id];
+                var reason = this.$(`[name='${id}-reason_id']`);
+                if (
+                    row &&
+                    // A reason is defined
+                    reason &&
+                    reason.val()
+                ) {
+                    can_submit = true;
+                    break;
+                }
+            }
+            return can_submit && this._super(...arguments);
+        },
+    });
+});
diff --git a/rma_sale_reason/static/src/tests/test_rma_sale_portal_tour.esm.js b/rma_sale_reason/static/src/tests/test_rma_sale_portal_tour.esm.js
new file mode 100644
index 000000000..ca4df0dc3
--- /dev/null
+++ b/rma_sale_reason/static/src/tests/test_rma_sale_portal_tour.esm.js
@@ -0,0 +1,69 @@
+/** @odoo-module */
+/* Copyright 2021 Tecnativa - David Vidal
+   License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl). */
+
+import tour from "web_tour.tour";
+
+tour.register(
+    "rma_sale_reason_portal",
+    {
+        test: true,
+        url: "/my/orders",
+    },
+    [
+        {
+            content: "Open the test sale order",
+            trigger: 'a:containsExact("Test Sale RMA SO")',
+        },
+        {
+            content: "Open the RMA request pop-up",
+            trigger: 'a:contains("Request RMAs")',
+        },
+        {
+            content:
+                "Submit button is disabled until we set quanity and requested operation",
+            trigger: "button[type='submit'][disabled]",
+        },
+        {
+            content: "Return 1 unit for the first row",
+            trigger: "input[name='0-quantity']",
+            run: "text 1",
+        },
+        {
+            content: "Select the reason",
+            trigger: "select[name='0-reason_id']",
+            run: "text Reason",
+        },
+        {
+            content: "Select the operation",
+            trigger: "select[name='0-operation_id']",
+            run: "text Replace",
+        },
+        {
+            content: "Write some comments",
+            trigger: "textarea[name='0-description']",
+            run: "text I'd like to change this product",
+        },
+        {
+            content: "Unfold the Delivery Address picker",
+            trigger: "button:contains('Choose a delivery address')",
+        },
+        {
+            content: "Choose another address",
+            trigger: ".o_rma_portal_shipping_card:contains('Another address')",
+            run: "click",
+        },
+        {
+            content: "Submit the RMA",
+            trigger: "button[type='submit']",
+        },
+        {
+            content: "We're redirected to the new draft RMA",
+            trigger: "h5:contains('RMA Order')",
+        },
+        {
+            content: "We're redirected to the new draft RMA",
+            trigger: "h5:contains('RMA Order')",
+        },
+    ]
+);
diff --git a/rma_sale_reason/tests/__init__.py b/rma_sale_reason/tests/__init__.py
new file mode 100644
index 000000000..f4a02181b
--- /dev/null
+++ b/rma_sale_reason/tests/__init__.py
@@ -0,0 +1,2 @@
+from . import test_rma_sale_reason
+from . import test_rma_sale_portal
diff --git a/rma_sale_reason/tests/test_rma_sale_portal.py b/rma_sale_reason/tests/test_rma_sale_portal.py
new file mode 100644
index 000000000..76ca965b0
--- /dev/null
+++ b/rma_sale_reason/tests/test_rma_sale_portal.py
@@ -0,0 +1,24 @@
+# Copyright 2024 Raumschmiede GmbH
+# Copyright 2024 BCIM
+# Copyright 2024 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo.tests import tagged
+
+from odoo.addons.rma_sale.tests.test_rma_sale_portal import (
+    TestRmaSalePortal as TestRmaSalePortalBase,
+)
+
+
+@tagged("-at-install", "post-install")
+class TestRmaSalePortal(TestRmaSalePortalBase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.rma_reason = cls.env["rma.reason"].create({"name": "Reason"})
+
+    def test_rma_sale_reason_portal(self):
+        self.start_tour("/", "rma_sale_reason_portal", login="rma_portal")
+        rma = self.sale_order.rma_ids
+        # Check that the portal values are properly transmited
+        self.assertEqual(rma.reason_id, self.rma_reason)
diff --git a/rma_sale_reason/tests/test_rma_sale_reason.py b/rma_sale_reason/tests/test_rma_sale_reason.py
new file mode 100644
index 000000000..bd3dee968
--- /dev/null
+++ b/rma_sale_reason/tests/test_rma_sale_reason.py
@@ -0,0 +1,63 @@
+# Copyright 2024 Raumschmiede GmbH
+# Copyright 2024 BCIM
+# Copyright 2024 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+
+from odoo import Command
+from odoo.tests.common import users
+
+from odoo.addons.rma_sale.tests.test_rma_sale import TestRmaSaleBase
+
+
+class TestRmaSaleReason(TestRmaSaleBase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.rma_reason = cls.env.ref("rma_reason.rma_reason_defective_product")
+        cls.operation = cls.rma_operation_model.sudo().search([], limit=1)
+        cls.sale_order = cls._create_sale_order(cls, [[cls.product_1, 5]])
+        cls.sale_order.action_confirm()
+        cls.order_line = cls.sale_order.order_line.filtered(
+            lambda r: r.product_id == cls.product_1
+        )
+        cls.order_out_picking = cls.sale_order.picking_ids
+        cls.order_out_picking.move_ids.quantity_done = 5
+        cls.order_out_picking.button_validate()
+
+    def _create_wizard(self):
+        order = self.sale_order
+        wizard_obj = (
+            self.env["sale.order.rma.wizard"].sudo().with_context(active_id=order.id)
+        )
+
+        line_vals = [
+            Command.create(
+                {
+                    "product_id": order.order_line.product_id.id,
+                    "sale_line_id": order.order_line.id,
+                    "quantity": order.order_line.product_uom_qty,
+                    "uom_id": order.order_line.product_uom.id,
+                    "picking_id": order.picking_ids[0].id,
+                    "operation_id": self.operation.id,
+                },
+            )
+        ]
+        return wizard_obj.create(
+            {
+                "line_ids": line_vals,
+                "location_id": order.warehouse_id.rma_loc_id.id,
+            }
+        )
+
+    @users("partner@rma")
+    def test_create_rma_from_wizard(self):
+        order = self.sale_order
+        wizard = self._create_wizard()
+        self.assertFalse(wizard.reason_id)
+        self.assertFalse(wizard.line_ids.reason_id)
+        wizard.reason_id = self.rma_reason
+        self.assertEqual(wizard.line_ids.reason_id, self.rma_reason)
+        rma = wizard.sudo().create_rma(from_portal=True)
+        self.assertEqual(rma.order_id, order)
+        self.assertEqual(rma.reason_id, self.rma_reason)
diff --git a/rma_sale_reason/views/rma_portal_templates.xml b/rma_sale_reason/views/rma_portal_templates.xml
new file mode 100644
index 000000000..401937a9c
--- /dev/null
+++ b/rma_sale_reason/views/rma_portal_templates.xml
@@ -0,0 +1,42 @@
+<?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="sale_rma_request_form"
+        name="My RMA"
+        inherit_id="rma_sale.sale_rma_request_form"
+    >
+        <xpath expr="//t[@t-set='operations']" position="after">
+
+        <t t-set="reasons" t-value="sale_order.env['rma.reason'].search([])" />
+
+            <input
+                type="hidden"
+                name="is_rma_reason_required"
+                t-att-value="'1' if sale_order.company_id.is_rma_reason_required else '0'"
+            />
+        </xpath>
+        <xpath expr="//th[@name='operation']" position="before">
+            <th class="text-start">Reason</th>
+        </xpath>
+        <xpath expr="//td[@name='operation']" position="before">
+        <td class="text-start">
+            <select
+                    t-attf-name="#{data_index}-reason_id"
+                    class="form-control rma-reason"
+                >
+                <option value="">---</option>
+                <t t-foreach="reasons" t-as="reason">
+                    <option t-att-value="reason.id">
+                        <t t-out="reason.name" />
+                    </option>
+                </t>
+            </select>
+
+        </td>
+                </xpath>
+
+    </template>
+</odoo>
diff --git a/rma_sale_reason/wizards/__init__.py b/rma_sale_reason/wizards/__init__.py
new file mode 100644
index 000000000..59e3468ff
--- /dev/null
+++ b/rma_sale_reason/wizards/__init__.py
@@ -0,0 +1,2 @@
+from . import sale_order_line_rma_wizard
+from . import sale_order_rma_wizard
diff --git a/rma_sale_reason/wizards/sale_order_line_rma_wizard.py b/rma_sale_reason/wizards/sale_order_line_rma_wizard.py
new file mode 100644
index 000000000..0d669a55f
--- /dev/null
+++ b/rma_sale_reason/wizards/sale_order_line_rma_wizard.py
@@ -0,0 +1,33 @@
+# Copyright 2024 Raumschmiede GmbH
+# Copyright 2024 BCIM
+# Copyright 2024 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, fields, models
+
+
+class SaleOrderLineRmaWizard(models.TransientModel):
+
+    _inherit = "sale.order.line.rma.wizard"
+
+    reason_id = fields.Many2one(
+        comodel_name="rma.reason",
+        compute="_compute_reason_id",
+        store=True,
+        readonly=False,
+    )
+    is_rma_reason_required = fields.Boolean(
+        related="order_id.company_id.is_rma_reason_required"
+    )
+
+    @api.depends("wizard_id.reason_id")
+    def _compute_reason_id(self):
+        for rec in self:
+            if rec.wizard_id.reason_id:
+                rec.reason_id = rec.wizard_id.reason_id
+
+    def _prepare_rma_values(self):
+        values = super()._prepare_rma_values()
+        if self.reason_id:
+            values["reason_id"] = self.reason_id.id
+        return values
diff --git a/rma_sale_reason/wizards/sale_order_rma_wizard.py b/rma_sale_reason/wizards/sale_order_rma_wizard.py
new file mode 100644
index 000000000..2ce939257
--- /dev/null
+++ b/rma_sale_reason/wizards/sale_order_rma_wizard.py
@@ -0,0 +1,11 @@
+# Copyright 2024 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class SaleOrderRmaWizard(models.TransientModel):
+
+    _inherit = "sale.order.rma.wizard"
+
+    reason_id = fields.Many2one(comodel_name="rma.reason")
diff --git a/rma_sale_reason/wizards/sale_order_rma_wizard.xml b/rma_sale_reason/wizards/sale_order_rma_wizard.xml
new file mode 100644
index 000000000..55e1a7c3b
--- /dev/null
+++ b/rma_sale_reason/wizards/sale_order_rma_wizard.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2024 Raumschmiede GmbH
+     Copyright 2024 BCIM
+     Copyright 2024 ACSONE SA/NV
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record model="ir.ui.view" id="sale_order_rma_wizard_form_view">
+        <field name="model">sale.order.rma.wizard</field>
+        <field name="inherit_id" ref="rma_sale.sale_order_rma_wizard_form_view" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='line_ids']" position="before">
+                <field name="reason_id" />
+            </xpath>
+            <xpath
+                expr="//field[@name='line_ids']//field[@name='operation_id']"
+                position="after"
+            >
+                <field name="is_rma_reason_required" invisible="True" />
+                <field
+                    name="reason_id"
+                    attrs="{'required': [('is_rma_reason_required', '=', True)]}"
+                />
+            </xpath>
+        </field>
+    </record>
+
+
+
+</odoo>
diff --git a/setup/rma_sale_reason/odoo/addons/rma_sale_reason b/setup/rma_sale_reason/odoo/addons/rma_sale_reason
new file mode 120000
index 000000000..ae60d2221
--- /dev/null
+++ b/setup/rma_sale_reason/odoo/addons/rma_sale_reason
@@ -0,0 +1 @@
+../../../../rma_sale_reason
\ No newline at end of file
diff --git a/setup/rma_sale_reason/setup.py b/setup/rma_sale_reason/setup.py
new file mode 100644
index 000000000..28c57bb64
--- /dev/null
+++ b/setup/rma_sale_reason/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)