mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-29 12:06:44 +00:00
* Update overdue order notification - Check individual line items too * Fix typo (cherry picked from commit 67bdf3162afed8280df3190a6eab9918c1d4a97b) Co-authored-by: Oliver <oliver.henry.walters@gmail.com>
This commit is contained in:
parent
5e26394500
commit
00470a844c
@ -5,6 +5,7 @@ from datetime import datetime, timedelta
|
|||||||
|
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
|
from django.db.models import F
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
import common.notifications
|
import common.notifications
|
||||||
@ -60,12 +61,28 @@ def check_overdue_purchase_orders():
|
|||||||
"""
|
"""
|
||||||
yesterday = datetime.now().date() - timedelta(days=1)
|
yesterday = datetime.now().date() - timedelta(days=1)
|
||||||
|
|
||||||
|
# Check for PurchaseOrder objects that have a target date of yesterday
|
||||||
overdue_orders = order.models.PurchaseOrder.objects.filter(
|
overdue_orders = order.models.PurchaseOrder.objects.filter(
|
||||||
target_date=yesterday, status__in=PurchaseOrderStatusGroups.OPEN
|
target_date=yesterday, status__in=PurchaseOrderStatusGroups.OPEN
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Check for individual line items that are overdue
|
||||||
|
overdue_lines = order.models.PurchaseOrderLineItem.objects.filter(
|
||||||
|
target_date=yesterday,
|
||||||
|
order__status__in=PurchaseOrderStatusGroups.OPEN,
|
||||||
|
received__lt=F('quantity'),
|
||||||
|
)
|
||||||
|
|
||||||
|
notified_orders = set()
|
||||||
|
|
||||||
for po in overdue_orders:
|
for po in overdue_orders:
|
||||||
notify_overdue_purchase_order(po)
|
notify_overdue_purchase_order(po)
|
||||||
|
notified_orders.add(po.pk)
|
||||||
|
|
||||||
|
for line in overdue_lines:
|
||||||
|
if line.order.pk not in notified_orders:
|
||||||
|
notify_overdue_purchase_order(line.order)
|
||||||
|
notified_orders.add(line.order.pk)
|
||||||
|
|
||||||
|
|
||||||
def notify_overdue_sales_order(so: order.models.SalesOrder):
|
def notify_overdue_sales_order(so: order.models.SalesOrder):
|
||||||
@ -113,8 +130,22 @@ def check_overdue_sales_orders():
|
|||||||
target_date=yesterday, status__in=SalesOrderStatusGroups.OPEN
|
target_date=yesterday, status__in=SalesOrderStatusGroups.OPEN
|
||||||
)
|
)
|
||||||
|
|
||||||
|
overdue_lines = order.models.SalesOrderLineItem.objects.filter(
|
||||||
|
target_date=yesterday,
|
||||||
|
order__status__in=SalesOrderStatusGroups.OPEN,
|
||||||
|
shipped__lt=F('quantity'),
|
||||||
|
)
|
||||||
|
|
||||||
|
notified_orders = set()
|
||||||
|
|
||||||
for po in overdue_orders:
|
for po in overdue_orders:
|
||||||
notify_overdue_sales_order(po)
|
notify_overdue_sales_order(po)
|
||||||
|
notified_orders.add(po.pk)
|
||||||
|
|
||||||
|
for line in overdue_lines:
|
||||||
|
if line.order.pk not in notified_orders:
|
||||||
|
notify_overdue_sales_order(line.order)
|
||||||
|
notified_orders.add(line.order.pk)
|
||||||
|
|
||||||
|
|
||||||
def complete_sales_order_shipment(shipment_id: int, user_id: int) -> None:
|
def complete_sales_order_shipment(shipment_id: int, user_id: int) -> None:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user