inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 12:36:45 +00:00
Code

Fix stock location structural check (#4089) (#4095)

Browse Source 
* Fix stock location structural check

Exclude sub stock location items from preventing that a stock location can be switched to structural.

* Fix structural check on both storage location and parts category

Exclude children of sub- locations/categories in the check to allow this location/category to be structural

(cherry picked from commit 14a2c128a95c79899e4f393a957552824c22a055)

Co-authored-by: bloemp <pbloem@upcmail.nl>
This commit is contained in:
Oliver 2022-12-22 07:48:50 +11:00 committed by GitHub
parent eb7aba4dd8
commit 641adb6ae8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/part/models.py
View File

@ -148,7 +148,7 @@ class PartCategory(MetadataMixin, InvenTreeTree):
- Ensure that the structural parameter cannot get set if products already assigned to the category - Ensure that the structural parameter cannot get set if products already assigned to the category
""" """
if self.pk and self.structural and self.item_count > 0: if self.pk and self.structural and self.partcount(False, False) > 0:
raise ValidationError( raise ValidationError(
_("You cannot make this part category structural because some parts " _("You cannot make this part category structural because some parts "
"are already assigned to it!")) "are already assigned to it!"))

2
InvenTree/stock/models.py
View File

@ -152,7 +152,7 @@ class StockLocation(InvenTreeBarcodeMixin, MetadataMixin, InvenTreeTree):
- Ensure stock location can't be made structural if stock items already located to them - Ensure stock location can't be made structural if stock items already located to them
""" """
if self.pk and self.structural and self.item_count > 0: if self.pk and self.structural and self.stock_item_count(False) > 0:
raise ValidationError( raise ValidationError(
_("You cannot make this stock location structural because some stock items " _("You cannot make this stock location structural because some stock items "
"are already located into it!")) "are already located into it!"))