Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Variant low stock (#5102)

Browse Source 
* Handle FileNotFoundError

* Adjust "low_stock" query filter

- Include variant stock
This commit is contained in:
Oliver 2023-06-24 22:31:52 +10:00 committed by GitHub
parent 5dfc389c06
commit 0458b5c53a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/InvenTree/version.py
View File

@ -24,7 +24,7 @@ INVENTREE_SW_VERSION = "0.12.0 dev"
try:
main_repo = Repo(pathlib.Path(__file__).parent.parent.parent)
main_commit = main_repo[main_repo.head()]
except NotGitRepository:
except (NotGitRepository, FileNotFoundError):
main_commit = None

4
InvenTree/part/api.py
View File

@ -856,10 +856,10 @@ class PartFilter(rest_filters.FilterSet):
if str2bool(value):
# Ignore any parts which do not have a specified 'minimum_stock' level
# Filter items which have an 'in_stock' level lower than 'minimum_stock'
return queryset.exclude(minimum_stock=0).filter(Q(in_stock__lt=F('minimum_stock')))
return queryset.exclude(minimum_stock=0).filter(Q(total_in_stock__lt=F('minimum_stock')))
else:
# Filter items which have an 'in_stock' level higher than 'minimum_stock'
return queryset.filter(Q(in_stock__gte=F('minimum_stock')))
return queryset.filter(Q(total_in_stock__gte=F('minimum_stock')))
# has_stock filter
has_stock = rest_filters.BooleanFilter(label='Has stock', method='filter_has_stock')