Skip to content

Commit

Permalink
[FIX] rma: set route for out procurment
Browse files Browse the repository at this point in the history
  • Loading branch information
sbejaoui committed Jul 4, 2024
1 parent bfde2b7 commit 3842abd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
4 changes: 3 additions & 1 deletion rma/models/rma.py
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,9 @@ def _group_delivery_if_needed(self):

def _prepare_outgoing_procurement_vals(self, warehouse=None, scheduled_date=None):
values = self._prepare_common_procurement_vals(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_vals(self, scheduled_date=None):
Expand Down
4 changes: 2 additions & 2 deletions rma/models/stock_warehouse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions rma/tests/test_rma.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 3842abd

Please sign in to comment.