Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Barcode validation fix #9127

Merged
merged 3 commits into from
Feb 21, 2025
Merged

Barcode validation fix #9127

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28a318e
Fix logic for adding items to SalesOrder
SchrodingersGat Feb 21, 2025
bdff761
Same thing for purchase orders
SchrodingersGat Feb 21, 2025
dd89f2b
Update serializers.py
SchrodingersGat Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/backend/InvenTree/plugin/base/barcodes/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
import plugin.base.barcodes.helper
import stock.models
from InvenTree.serializers import UserSerializer
from order.status_codes import PurchaseOrderStatus, SalesOrderStatus
from order.status_codes import (
PurchaseOrderStatus,
PurchaseOrderStatusGroups,
SalesOrderStatusGroups,
)


class BarcodeScanResultSerializer(serializers.ModelSerializer):
Expand Down Expand Up @@ -135,8 +139,8 @@ class BarcodePOAllocateSerializer(BarcodeSerializer):

def validate_purchase_order(self, order: order.models.PurchaseOrder):
"""Validate the provided order."""
if order.status != PurchaseOrderStatus.PENDING.value:
raise ValidationError(_('Purchase order is not pending'))
if order.status not in PurchaseOrderStatusGroups.OPEN:
raise ValidationError(_('Purchase order is not open'))

return order

Expand Down Expand Up @@ -213,8 +217,8 @@ class BarcodeSOAllocateSerializer(BarcodeSerializer):

def validate_sales_order(self, order: order.models.SalesOrder):
"""Validate the provided order."""
if order and order.status != SalesOrderStatus.PENDING.value:
raise ValidationError(_('Sales order is not pending'))
if order and order.status not in SalesOrderStatusGroups.OPEN:
raise ValidationError(_('Sales order is not open'))

return order

Expand Down
Loading