From 38b6367453d5d804631e0ccfe1033d80361327cf Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 7 Jan 2021 22:34:17 +1100 Subject: [PATCH] PEP fixes --- InvenTree/order/api.py | 2 -- InvenTree/order/models.py | 14 +++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/InvenTree/order/api.py b/InvenTree/order/api.py index 12f0854c19..e240c69861 100644 --- a/InvenTree/order/api.py +++ b/InvenTree/order/api.py @@ -9,8 +9,6 @@ from django_filters.rest_framework import DjangoFilterBackend from rest_framework import generics from rest_framework import filters -from django.db.models import Q - from django.conf.urls import url, include from InvenTree.helpers import str2bool diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py index d0373fa324..27bcd4acca 100644 --- a/InvenTree/order/models.py +++ b/InvenTree/order/models.py @@ -316,26 +316,26 @@ class SalesOrder(Order): - TODO: An "overdue" order where the target date is in the past """ - DATE_FMT = '%Y-%m-%d' # ISO format date string + date_fmt = '%Y-%m-%d' # ISO format date string # Ensure that both dates are valid try: - min_date = datetime.strptime(str(min_date), DATE_FMT).date() - max_date = datetime.strptime(str(max_date), DATE_FMT).date() + min_date = datetime.strptime(str(min_date), date_fmt).date() + max_date = datetime.strptime(str(max_date), date_fmt).date() except (ValueError, TypeError): # Date processing error, return queryset unchanged return queryset # Construct a queryset for "completed" orders within the range - COMPLETED = Q(status__in=SalesOrderStatus.COMPLETE) & Q(shipment_date__gte=min_date) & Q(shipment_date__lte=max_date) + completed = Q(status__in=SalesOrderStatus.COMPLETE) & Q(shipment_date__gte=min_date) & Q(shipment_date__lte=max_date) # Construct a queryset for "pending" orders within the range - PENDING = Q(status__in=SalesOrderStatus.OPEN) & ~Q(target_date=None) & Q(target_date__gte=min_date) & Q(target_date__lte=max_date) + pending = Q(status__in=SalesOrderStatus.OPEN) & ~Q(target_date=None) & Q(target_date__gte=min_date) & Q(target_date__lte=max_date) # Construct a queryset for "overdue" orders within the range - FILTER = COMPLETED | PENDING + flt = completed | pending - queryset = queryset.filter(FILTER) + queryset = queryset.filter(flt) return queryset