admin.suherdy/stock_restrict_source_location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: update location filtering to use child_of operator for improved sub-location support

Browse Source
This commit is contained in:
Suherdy Yacob 2026-04-03 20:19:28 +07:00
parent 726034dcbf
commit 1791df4fd2
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
models/stock_location.py
View File

@ -14,11 +14,10 @@ class StockLocation(models.Model):
Used by UI-level overrides in StockQuant and StockLot. Used by UI-level overrides in StockQuant and StockLot.
Returns: Returns:
list: IDs of allowed locations. list: IDs of allowed locations.
False: If no restriction should be applied (e.g. no picking type found). False: If no restriction should be applied.
""" """
ctx = self.env.context ctx = self.env.context
# 1. Identify the Picking Type (Operation Type) # 1. Identify the Picking Type (Operation Type)
# Check multiple common context keys used by stock/mrp models
picking_type_id = (ctx.get('default_picking_type_id') or picking_type_id = (ctx.get('default_picking_type_id') or
ctx.get('picking_type_id') or ctx.get('picking_type_id') or
ctx.get('active_picking_type_id')) ctx.get('active_picking_type_id'))
@ -36,7 +35,6 @@ class StockLocation(models.Model):
picking_type_id = mo.picking_type_id.id picking_type_id = mo.picking_type_id.id
if not picking_type_id: if not picking_type_id:
# NO identification of operation type = NO restriction (safe fallback)
return False return False
# 3. Retrieve allowed locations from the picking type # 3. Retrieve allowed locations from the picking type
@ -59,13 +57,14 @@ class StockQuant(models.Model):
def web_search_read(self, domain, specification, offset=0, limit=None, order=None, count_limit=None): def web_search_read(self, domain, specification, offset=0, limit=None, order=None, count_limit=None):
""" """
UI-SURFACE OVERRIDE: Applies location filtering ONLY for the web interface. UI-SURFACE OVERRIDE: Applies location filtering ONLY for the web interface.
Uses 'child_of' to support stock stored in shelves/aisles of allowed locations.
""" """
ctx = self.env.context ctx = self.env.context
if not ctx.get('skip_location_restriction') and ctx.get('uid'): if not ctx.get('skip_location_restriction') and ctx.get('uid'):
allowed_location_ids = self.env['stock.location']._get_allowed_locations() allowed_location_ids = self.env['stock.location']._get_allowed_locations()
if allowed_location_ids: if allowed_location_ids:
# Add location filter to the domain ONLY if we have an explicit list # FIX (Attempt 9): Switch to 'child_of' to support sub-locations
domain = expression.AND([domain, [('location_id', 'in', allowed_location_ids)]]) domain = expression.AND([domain, [('location_id', 'child_of', allowed_location_ids)]])
return super().web_search_read(domain, specification, offset=offset, limit=limit, order=order, count_limit=count_limit) return super().web_search_read(domain, specification, offset=offset, limit=limit, order=order, count_limit=count_limit)
@ -81,14 +80,13 @@ class StockLot(models.Model):
if not ctx.get('skip_location_restriction') and ctx.get('uid'): if not ctx.get('skip_location_restriction') and ctx.get('uid'):
allowed_location_ids = self.env['stock.location']._get_allowed_locations() allowed_location_ids = self.env['stock.location']._get_allowed_locations()
# If our custom helper failed to find a picking-type restriction,
# we check if a simple default_location_id filter was passed directly.
if not allowed_location_ids and ctx.get('default_location_id'): if not allowed_location_ids and ctx.get('default_location_id'):
allowed_location_ids = [ctx.get('default_location_id')] allowed_location_ids = [ctx.get('default_location_id')]
if allowed_location_ids: if allowed_location_ids:
quant_domain = [ quant_domain = [
('location_id', 'in', allowed_location_ids), # FIX (Attempt 9): Switch to 'child_of' to support sub-locations
('location_id', 'child_of', allowed_location_ids),
('quantity', '>', 0), ('quantity', '>', 0),
('lot_id', '!=', False) ('lot_id', '!=', False)
] ]
@ -117,7 +115,8 @@ class StockLot(models.Model):
if allowed_location_ids: if allowed_location_ids:
quant_domain = [ quant_domain = [
('location_id', 'in', allowed_location_ids), # FIX (Attempt 9): Switch to 'child_of' to support sub-locations
('location_id', 'child_of', allowed_location_ids),
('quantity', '>', 0), ('quantity', '>', 0),
('lot_id', '!=', False) ('lot_id', '!=', False)
] ]