Skip to content
Merged
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
6 changes: 6 additions & 0 deletions rma/wizard/stock_picking_return.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ def _compute_rma_operation_id(self):
def _prepare_rma_vals(self):
self.ensure_one()
warehouse = self.move_id.picking_id.picking_type_id.warehouse_id
if not warehouse:
# Dropship compatibility
warehouse = self.env["stock.warehouse"].search(
[("company_id", "=", self.move_id.picking_id.company_id.id)],
limit=1,
)
return {
"move_id": self.move_id.id,
"product_id": self.move_id.product_id.id,
Expand Down
2 changes: 1 addition & 1 deletion rma/wizard/stock_picking_return_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<group name="group_rma">
<field
name="create_rma"
invisible="picking_type_code != 'outgoing'"
invisible="picking_type_code not in ('outgoing', 'dropship')"
/>
<field name="rma_operation_id" invisible="not create_rma" />
</group>
Expand Down
Loading