audrius/stock-logistics-warehouse
1
0
Fork 1
mirror of https://github.com/OCA/stock-logistics-warehouse.git synced 2025-01-21 14:27:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2078 into 16.0

Browse Source 
Signed-off-by jbaudoux
This commit is contained in:
OCA-git-bot
2024-12-31 11:50:04 +00:00
parent 1460b83a05 e4901deafc
commit 590105a6c5
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stock_location_zone/__manifest__.py
View File

@@ -1,5 +1,5 @@
# Copyright 2017 Syvain Van Hoof (Okia sprl) <sylvainvh@okia.be> # Copyright 2017 Syvain Van Hoof (Okia sprl) <sylvainvh@okia.be>
# Copyright 2016-2019 Jacques-Etienne Baudoux (BCIM) <je@bcim.be> # Copyright 2016 Jacques-Etienne Baudoux (BCIM) <je@bcim.be>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{ {

14
stock_location_zone/models/stock_location.py
View File

@@ -1,5 +1,5 @@
# Copyright 2017 Sylvain Van Hoof <svh@sylvainvh.be> # Copyright 2017 Sylvain Van Hoof <svh@sylvainvh.be>
# Copyright 2018-2019 Jacques-Etienne Baudoux (BCIM sprl) <je@bcim.be> # Copyright 2018 Jacques-Etienne Baudoux (BCIM) <je@bcim.be>
# Copyright 2019 Camptocamp SA # Copyright 2019 Camptocamp SA
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
@@ -81,13 +81,17 @@ class StockLocation(models.Model):
) )
def _compute_location_kind(self): def _compute_location_kind(self):
for location in self: for location in self:
if location.zone_location_id and not location.area_location_id: if location == location.zone_location_id:
location.location_kind = "zone" location.location_kind = "zone"
continue continue
parent = location.location_id parent = location.location_id
if location.usage == "internal" and parent.usage == "view": if (
# Internal locations whose parent is view are main stocks # Internal locations whose parent is view are main stocks
location.usage in ("internal", "view")
and not location.zone_location_id
and parent.usage == "view"
):
location.location_kind = "stock" location.location_kind = "stock"
elif ( elif (
# Internal locations having a zone and no children are bins # Internal locations having a zone and no children are bins
@@ -98,12 +102,12 @@ class StockLocation(models.Model):
): ):
location.location_kind = "bin" location.location_kind = "bin"
elif ( elif (
location.usage == "internal" # Internal locations having a zone and children are areas
location.usage in ("internal", "view")
and location.zone_location_id and location.zone_location_id
and location.area_location_id and location.area_location_id
and location.child_ids and location.child_ids
): ):
# Internal locations having a zone and children are areas
location.location_kind = "area" location.location_kind = "area"
else: else:
# All the rest are other locations # All the rest are other locations