diff --git a/InvenTree/InvenTree/version.py b/InvenTree/InvenTree/version.py index 8735a8253c..101f95e822 100644 --- a/InvenTree/InvenTree/version.py +++ b/InvenTree/InvenTree/version.py @@ -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 diff --git a/InvenTree/part/api.py b/InvenTree/part/api.py index 20878fae13..d88791df09 100644 --- a/InvenTree/part/api.py +++ b/InvenTree/part/api.py @@ -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')