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

Display overdue purchase orders in the calendar view

Browse Source
This commit is contained in:
Oliver Walters 2021-01-14 22:19:32 +11:00
parent fef5b7548e
commit 959914c78c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
InvenTree/order/models.py
View File

@ -135,7 +135,7 @@ class PurchaseOrder(Order):
To be "interesting": To be "interesting":
- A "received" order where the received date lies within the date range - A "received" order where the received date lies within the date range
- TODO: A "pending" order where the target date lies within the date range - A "pending" order where the target date lies within the date range
- TODO: An "overdue" order where the target date is in the past - TODO: An "overdue" order where the target date is in the past
""" """
@ -152,13 +152,12 @@ class PurchaseOrder(Order):
# Construct a queryset for "received" orders within the range # Construct a queryset for "received" orders within the range
received = Q(status=PurchaseOrderStatus.COMPLETE) & Q(complete_date__gte=min_date) & Q(complete_date__lte=max_date) received = Q(status=PurchaseOrderStatus.COMPLETE) & Q(complete_date__gte=min_date) & Q(complete_date__lte=max_date)
# TODO - Construct a queryset for "pending" orders within the range # Construct a queryset for "pending" orders within the range
pending = Q(status__in=PurchaseOrderStatus.OPEN) & ~Q(target_date=None) & Q(target_date__gte=min_date) & Q(target_date__lte=max_date)
# TODO - Construct a queryset for "overdue" orders within the range # TODO - Construct a queryset for "overdue" orders within the range
flt = received queryset = queryset.filter(received | pending)
queryset = queryset.filter(flt)
return queryset return queryset

2
InvenTree/order/templates/order/purchase_orders.html
View File

@ -70,6 +70,8 @@ InvenTree | {% trans "Purchase Orders" %}
if (order.complete_date) { if (order.complete_date) {
date = order.complete_date; date = order.complete_date;
} else if (order.target_date) {
date = order.target_date;
} }
var title = `${prefix}${order.reference} - ${order.supplier_detail.name}`; var title = `${prefix}${order.reference} - ${order.supplier_detail.name}`;