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] [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 43188179..708f0981 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 709d3ffd..2a4fae66 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 d188deec..8959a6e8 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -366,7 +366,7 @@ ul.auto-toc {
 !! 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 4c1af5e7..9b2978e4 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">