odoo-addon-rma 17.0.2.0.1__py3-none-any.whl → 17.0.2.1.0__py3-none-any.whl

odoo/addons/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:e589c7d0276b5aa4a5684b55b4656c68b9198412353cabc34ee898e4c30cb3ab
+   !! source digest: sha256:ed0186c1b1c6a13851afd390ffec85f8d907d167dfdefd525057f63f8e5aa96e
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

odoo/addons/rma/__manifest__.py

@@ -5,7 +5,7 @@
 {
     "name": "Return Merchandise Authorization Management",
     "summary": "Return Merchandise Authorization (RMA)",
-    "version": "17.0.2.0.1",
+    "version": "17.0.2.1.0",
     "development_status": "Production/Stable",
     "category": "RMA",
     "website": "https://github.com/OCA/rma",

odoo/addons/rma/i18n/rma.pot

@@ -254,26 +254,11 @@ msgstr ""
 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>"
@@ -289,21 +274,11 @@ msgstr ""
 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>"
@@ -685,6 +660,11 @@ msgstr ""
 msgid "Delivered Qty"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Delivered Quantity"
+msgstr ""
+
 #. module: rma
 #: model_terms:ir.ui.view,arch_db:rma.rma_view_form
 msgid "Delivery"
@@ -1155,6 +1135,11 @@ msgstr ""
 msgid "Origin Delivery"
 msgstr ""
 
+#. module: rma
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
+msgid "Origin delivery"
+msgstr ""
+
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__move_id
 msgid "Origin move"
@@ -1220,6 +1205,7 @@ 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
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "Product"
 msgstr ""
 
@@ -1236,6 +1222,7 @@ 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
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "Quantity"
 msgstr ""
 
@@ -1610,6 +1597,7 @@ msgstr ""
 
 #. module: rma
 #: model:ir.model.fields,field_description:rma.field_rma__operation_id
+#: model_terms:ir.ui.view,arch_db:rma.report_rma_document
 msgid "Requested operation"
 msgstr ""
 

odoo/addons/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
@@ -303,16 +306,10 @@ class Rma(models.Model):
 
     @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
@@ -377,7 +374,7 @@ class Rma(models.Model):
         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:
@@ -981,11 +978,13 @@ class Rma(models.Model):
             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 +1114,13 @@ class Rma(models.Model):
             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 +1184,7 @@ class Rma(models.Model):
         # 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 +1210,23 @@ class Rma(models.Model):
         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,
+                    }
+                )
             )
         )
 

odoo/addons/rma/static/description/index.html

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:e589c7d0276b5aa4a5684b55b4656c68b9198412353cabc34ee898e4c30cb3ab
+!! source digest: sha256:ed0186c1b1c6a13851afd390ffec85f8d907d167dfdefd525057f63f8e5aa96e
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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

odoo/addons/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" />

{odoo_addon_rma-17.0.2.0.1.dist-info → odoo_addon_rma-17.0.2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-rma
-Version: 17.0.2.0.1
+Version: 17.0.2.1.0
 Requires-Python: >=3.10
 Requires-Dist: odoo>=17.0a,<17.1dev
 Summary: Return Merchandise Authorization (RMA)
@@ -23,7 +23,7 @@ Return Merchandise Authorization Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:e589c7d0276b5aa4a5684b55b4656c68b9198412353cabc34ee898e4c30cb3ab
+   !! source digest: sha256:ed0186c1b1c6a13851afd390ffec85f8d907d167dfdefd525057f63f8e5aa96e
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png

{odoo_addon_rma-17.0.2.0.1.dist-info → odoo_addon_rma-17.0.2.1.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/rma/README.rst,sha256=yGEEzexQYO9jbrKoKYy-CDeo0jbzSw5srXwfH4Xq3A8,8246
+odoo/addons/rma/README.rst,sha256=E890OYkVIR410p4G1e9uKN2YeuSf99Sv9PW83_8wyfo,8246
 odoo/addons/rma/__init__.py,sha256=KD8ElbTlUwRgGDQzvMIqp-WeEXGTuHqQT352BCbK2I0,168
-odoo/addons/rma/__manifest__.py,sha256=aCqn-bqVKiasVeEKZg544T2Lk33Q512JrcExbdD9FnU,1527
+odoo/addons/rma/__manifest__.py,sha256=HqYsALpSuyfLg1K6dLh_aXGBvPiAegYBB5_TLGL8irA,1527
 odoo/addons/rma/hooks.py,sha256=60r6gSDlRMblJByj8Gp1j1oGBOEfloFjDXFNkp72uMk,3226
 odoo/addons/rma/controllers/__init__.py,sha256=ZAYSY9pxyJjumL2QVLuxqtBzjLwKPiQsVXMBAWvNGGY,85
 odoo/addons/rma/controllers/main.py,sha256=luAXQnt-pSpM0QpZjZqLwyz-ktPWGCN-jhjM3oJpY7w,5455
@@ -15,7 +15,7 @@ odoo/addons/rma/i18n/it.po,sha256=eCTukh8o9hB_1IhoWtzSrF33qaVrUICRBcyxdy3fNAE,88
 odoo/addons/rma/i18n/nl.po,sha256=w9cAnQ_myaElrODNn6zghbD1JL1JBZGVRcDIvTOEdiE,62230
 odoo/addons/rma/i18n/pt.po,sha256=fqFXUZ_1_tnLn8jotkxKdOi7Mtq12M91u7NVMQWDlCI,74616
 odoo/addons/rma/i18n/pt_BR.po,sha256=McYUI_uGFmzfbZgT6EWVA5kYDm3L7CwM3g0nEVeoXr8,73588
-odoo/addons/rma/i18n/rma.pot,sha256=XY-Tj7aPGV3ceqz2jXXtBoNQAYBiuucClo0CEw4H8tY,62238
+odoo/addons/rma/i18n/rma.pot,sha256=mPGAPHxNp9BGhECODrfDoE89pa1QHXuKt6kNTMmgohg,62029
 odoo/addons/rma/i18n/ro.po,sha256=1-cvbtG2Pm2n8XU5fYXAUREzaAm0W5wAULd0_iuH3Wo,70200
 odoo/addons/rma/i18n/zh_CN.po,sha256=Da3X5EY_ZAT0EU9QQLhEktQ4GQkFwGR112399VZ2BEk,62341
 odoo/addons/rma/migrations/17.0.1.2.0/post-migration.py,sha256=jQn_F-J2amiqJZQZ33nQZeb_hOebJBXJMHdYbgiakd4,654
@@ -25,7 +25,7 @@ odoo/addons/rma/models/res_company.py,sha256=46aercxmY3p3t0JoIzlSSP_pjkvjaQb1pHR
 odoo/addons/rma/models/res_config_settings.py,sha256=-X3NWCfEG1LJ2iE2dYl3Ut-suDskrHMkp0D597EFhIw,1493
 odoo/addons/rma/models/res_partner.py,sha256=PEjLvtn7RpZVO5Ez_Fts9cDI2UgAIGfJUsMJU8WDNpg,1233
 odoo/addons/rma/models/res_users.py,sha256=43A5IHYXEXe9M4G0cONf1l7EZ1AWl5mhWJ24EdtAfhI,351
-odoo/addons/rma/models/rma.py,sha256=VVro_Qs2pMyBypkZDu-sDSwf-TxJg46VVKWjCqx4q5g,49838
+odoo/addons/rma/models/rma.py,sha256=a6-3b-tHSmyAn_Iyz24KTEaZf_LZxFZJosehWrmoSyU,49828
 odoo/addons/rma/models/rma_finalization.py,sha256=kgJ6EFWBXJKGCwKy7bbWRUynExsCMQyjqcflDpvwtaE,681
 odoo/addons/rma/models/rma_operation.py,sha256=xbDjthojPoZpSpqKg3eNyYcctv40hPsmrFcUHV3BUyg,460
 odoo/addons/rma/models/rma_tag.py,sha256=RVFLyo8XmgjK_ftrRHWiEtzUQGs4b-OMhg0hwr-5Rzw,833
@@ -42,11 +42,11 @@ odoo/addons/rma/report/report.xml,sha256=rMg9_lccL-dJClHvMCmRI1Feh499gnExeskIylc
 odoo/addons/rma/security/ir.model.access.csv,sha256=zACDkLgOfICGiJGb4A9RNKbtlpBcFIC4rDZxESyBzbQ,1724
 odoo/addons/rma/security/rma_security.xml,sha256=_tz_MXqW8bWfzGhgQ3pDI7xdx6tX321DrkIaRAd2W6E,5374
 odoo/addons/rma/static/description/icon.png,sha256=0VH8J6xmJMYW0dBaW-Ts-Gm5oRvbf9mOglT4vqUKxdU,7450
-odoo/addons/rma/static/description/index.html,sha256=9va91ZOF5QAcIB3xm46-tihpDLJuGKCCvxPABqzDe-Y,19139
+odoo/addons/rma/static/description/index.html,sha256=o2MEdhLHd0BB4YfQGNjwUSTsRjEYXNCYODugTYCi5lM,19139
 odoo/addons/rma/tests/__init__.py,sha256=Q2ntkew4ZtzTd3zhA1Ly6e-C1NrU6zIPUVEr7hDD-CY,89
 odoo/addons/rma/tests/test_rma.py,sha256=M5Glq4B1HGAPvanKFv76mNK3c49fx-5IuhGWWlQCWfQ,36034
 odoo/addons/rma/views/menus.xml,sha256=KWrTOvwY6IB-liNjRvBxTkdCSkes-CMTFI0iakxoavE,603
-odoo/addons/rma/views/report_rma.xml,sha256=84Q7vXyUoMnUgJsf_V5SMqiVT1iD8lEpD9v0-hszN4s,6683
+odoo/addons/rma/views/report_rma.xml,sha256=cnndKUgpZNZW7s98cMQvzJhyZJ8y9uNUwFm3Gy2b0IA,6977
 odoo/addons/rma/views/res_config_settings_views.xml,sha256=0dUpIXHbMNAg0hkka-5OwTF_RCK3J0rdCTlWTnw9geQ,4195
 odoo/addons/rma/views/res_partner_views.xml,sha256=3tTGUOwoAk1KWTfNsBCo7KF7zMNZnx_d-8KXFD2R9OI,967
 odoo/addons/rma/views/rma_finalization_views.xml,sha256=GPwPFolEJoGVFmmgov2oJkDdU9hE7MXCS_5GFAuTmwA,2910
@@ -65,7 +65,7 @@ odoo/addons/rma/wizard/rma_split.py,sha256=PZuVAGCXzRkycxJQIgfbPY__EPRXGPAkiKaGX
 odoo/addons/rma/wizard/rma_split_views.xml,sha256=jtrUmgS9rsUfbgx6y77cUXPnmd1ObY7lmQ_8XZDxxuo,1581
 odoo/addons/rma/wizard/stock_picking_return.py,sha256=KQljpW-kNL9h35-H20kbW6T20WyjCIT9SYQg-HKc-Dg,6510
 odoo/addons/rma/wizard/stock_picking_return_views.xml,sha256=g34JqBFRZ0g-yk2bhWylrhzyKPXMCTE66MZ4np2OUfQ,1129
-odoo_addon_rma-17.0.2.0.1.dist-info/METADATA,sha256=sXBqdG3QZ68nhH1P1rpzdMCJTyezIpcYo9dyobqf6XM,8808
-odoo_addon_rma-17.0.2.0.1.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
-odoo_addon_rma-17.0.2.0.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_rma-17.0.2.0.1.dist-info/RECORD,,
+odoo_addon_rma-17.0.2.1.0.dist-info/METADATA,sha256=ysxeVZzJQznrXNNBbVIHUiTLchdCQwpo7exededeA-o,8808
+odoo_addon_rma-17.0.2.1.0.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
+odoo_addon_rma-17.0.2.1.0.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_rma-17.0.2.1.0.dist-info/RECORD,,