diff --git a/rma/__manifest__.py b/rma/__manifest__.py index 9159646c..978c45ac 100644 --- a/rma/__manifest__.py +++ b/rma/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Return Merchandise Authorization Management", "summary": "Return Merchandise Authorization (RMA)", - "version": "14.0.1.0.2", + "version": "14.0.1.0.3", "development_status": "Production/Stable", "category": "RMA", "website": "https://github.com/OCA/rma", diff --git a/rma/models/rma.py b/rma/models/rma.py index 8277c7b7..b204e25c 100644 --- a/rma/models/rma.py +++ b/rma/models/rma.py @@ -18,7 +18,14 @@ class Rma(models.Model): _inherit = ["mail.thread", "portal.mixin", "mail.activity.mixin"] def _domain_location_id(self): - rma_loc = self.env["stock.warehouse"].search([]).mapped("rma_loc_id") + # this is done with sudo, intercompany rules are not applied by default so we + # add company in domain explicitly to avoid multi-company rule error when + # the user will try to choose a location + rma_loc = ( + self.env["stock.warehouse"] + .search([("company_id", "in", self.env.companies.ids)]) + .mapped("rma_loc_id") + ) return [("id", "child_of", rma_loc.ids)] # General fields