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

PEP fixes

Browse Source
This commit is contained in:
Oliver Walters 2021-01-07 22:34:17 +11:00
parent b7203f0ebb
commit 38b6367453
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/order/api.py
View File

@ -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

14
InvenTree/order/models.py
View File

@ -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