Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IMP] rma: custom route for replace action #434

Open
wants to merge 1 commit into
base: 16.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions rma/models/rma.py
Original file line number Diff line number Diff line change
Expand Up @@ -1193,10 +1193,11 @@ def create_return(self, scheduled_date, qty=None, uom=None):
rmas_to_return.write({"state": "waiting_return"})

def _prepare_replace_procurement_vals(self, warehouse=None, scheduled_date=None):
"""This method is used only for Replace (not Delivery). We do not use any
specific route here."""
"""This method is used only for Replace (not Delivery)."""
vals = self._prepare_common_procurement_vals(warehouse, scheduled_date)
vals["rma_id"] = self.id
if self.warehouse_id.rma_out_replace_route_id:
vals["route_ids"] = self.warehouse_id.rma_out_replace_route_id
return vals

def _prepare_replace_procurements(
Expand Down
1 change: 1 addition & 0 deletions rma/models/stock_warehouse.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class StockWarehouse(models.Model):
)
rma_in_route_id = fields.Many2one("stock.route", "RMA in Route")
rma_out_route_id = fields.Many2one("stock.route", "RMA out Route")
rma_out_replace_route_id = fields.Many2one("stock.route", "RMA out Replace Route")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbejaoui Should'nt we use the mechanisms to create that route (see _get_route_values()) ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the common use case is to use the default delivery route, which is why I didn't create or assign a custom route to the warehouse. If more people feel that having a custom route for RMA delivery by default is necessary, I will make the change.


def _get_rma_location_values(self, vals, code=False):
"""this method is intended to be used by 'create' method
Expand Down
65 changes: 65 additions & 0 deletions rma/tests/test_rma.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Copyright 2023 Michael Tietz (MT Software) <[email protected]>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

from odoo import Command
from odoo.exceptions import UserError, ValidationError
from odoo.tests import Form, TransactionCase, new_test_user, users
from odoo.tools import mute_logger
Expand Down Expand Up @@ -108,6 +109,20 @@ def _create_confirm_receive(
rma.reception_move_id.picking_id._action_done()
return rma

def _receive_and_replace(self, partner, product, qty, location):
rma = self._create_confirm_receive(partner, product, qty, location)
delivery_form = Form(
self.env["rma.delivery.wizard"].with_context(
active_ids=rma.ids,
rma_delivery_type="replace",
)
)
delivery_form.product_id = rma.product_id
delivery_form.product_uom_qty = qty
delivery_wizard = delivery_form.save()
delivery_wizard.action_deliver()
return rma

def _create_delivery(self):
picking_type = self.env["stock.picking.type"].search(
[
Expand Down Expand Up @@ -848,3 +863,53 @@ def test_autoconfirm_email(self):
)
self.assertTrue(rma.name in mail_receipt.subject)
self.assertTrue("products received" in mail_receipt.subject)

def test_replace_picking_type(self):
"""
Test that by default, the replace operation uses the default delivery route,
meaning the warehouse's default delivery picking type is applied.

RMA replacement orders are not separated from regular deliveries, and both use
the same picking type.
"""
rma = self._receive_and_replace(self.partner, self.product, 2, self.rma_loc)
rma_in_type = self.warehouse.rma_in_type_id
out_type = self.warehouse.out_type_id
self.assertEqual(rma.reception_move_id.picking_type_id, rma_in_type)
self.assertEqual(rma.delivery_move_ids.picking_type_id, out_type)

def test_replace_picking_type_custom_picking_type(self):
"""
Test that when configured to use a custom route, the replace operation uses a
custom picking type, separating RMA replacement orders from regular deliveries.

The custom picking type is applied specifically for RMA replacements, instead
of the default delivery picking type.
"""
rma_in_type = self.warehouse.rma_in_type_id
rma_out_type = self.warehouse.rma_out_type_id
route = self.env["stock.route"].create(
{
"name": "RMA OUT replace",
"active": True,
"sequence": 100,
"product_selectable": True,
"rule_ids": [
Command.create(
{
"name": "RMA OUT",
"action": "pull",
"picking_type_id": rma_out_type.id,
"location_src_id": self.warehouse.lot_stock_id.id,
"location_dest_id": self.env.ref(
"stock.stock_location_customers"
).id,
},
)
],
}
)
self.warehouse.rma_out_replace_route_id = route
rma = self._receive_and_replace(self.partner, self.product, 2, self.rma_loc)
self.assertEqual(rma.reception_move_id.picking_type_id, rma_in_type)
self.assertEqual(rma.delivery_move_ids.picking_type_id, rma_out_type)
4 changes: 4 additions & 0 deletions rma/views/stock_warehouse_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
<xpath expr="//field[@name='out_type_id']/..">
<field name="rma_in_type_id" groups="rma.rma_group_user_own" />
<field name="rma_out_type_id" groups="rma.rma_group_user_own" />
<field
name="rma_out_replace_route_id"
groups="rma.rma_group_user_own"
/>
</xpath>
</field>
</record>
Expand Down
Loading