[FIX] rma: set route for out procurment

OCA · Jul 3, 2024 · f018f60 · f018f60
1 parent 8c35146
commit f018f60
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/rma/models/rma.py b/rma/models/rma.py
@@ -8,7 +8,6 @@
 
 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
@@ -1219,7 +1218,9 @@ def _group_delivery_if_needed(self):
 
     def _prepare_outgoing_procurement_values(self, warehouse=None, scheduled_date=None):
         values = self._prepare_procurement_values(warehouse, scheduled_date)
-        values.update({"rma_id": self.id})
+        values.update(
+            {"rma_id": self.id, "route_ids": self.warehouse_id.rma_out_route_id}
+        )
         return values
 
     def _prepare_delivery_procurement_values(self, scheduled_date=None):
@@ -1282,9 +1283,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})
             )
         for picking, rmas in pickings.items():
             picking.action_confirm()
@@ -1384,13 +1385,13 @@ def create_replace(self, scheduled_date, warehouse, product, qty, uom):
                     "the previously created moves was updated with this data."
                 )
                 % (
-                {
-                    "id": product.id,
-                    "name": product.display_name,
-                    "qty": qty,
-                    "uom": uom.name,
-                }
-            )
+                    {
+                        "id": product.id,
+                        "name": product.display_name,
+                        "qty": qty,
+                        "uom": uom.name,
+                    }
+                )
             )
         self.write({"state": "waiting_replacement"})
 

diff --git a/rma/models/stock_warehouse.py b/rma/models/stock_warehouse.py
@@ -28,8 +28,8 @@ class StockWarehouse(models.Model):
         comodel_name="stock.location",
         string="RMA Location",
     )
-    rma_in_route_id = fields.Many2one("stock.location.route", "RMA in Route")
-    rma_out_route_id = fields.Many2one("stock.location.route", "RMA out Route")
+    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

diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
@@ -555,6 +555,13 @@ def test_mass_return_to_customer(self):
         self.assertEqual(len(pick_1), 1)
         self.assertEqual(len(pick_2), 1)
         self.assertNotEqual(pick_1, pick_2)
+        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)
         self.assertEqual((pick_1 | pick_2).mapped("state"), ["assigned"] * 2)
         # One picking per partner
         self.assertNotEqual(pick_1.partner_id, pick_2.partner_id)