This commit is contained in:
Oliver Walters 2020-04-25 13:31:42 +10:00
parent 66b6036827
commit 4e40d92db7

View File

@ -315,7 +315,6 @@ class SalesOrder(Order):
def ship_order(self, user): def ship_order(self, user):
""" Mark this order as 'shipped' """ """ Mark this order as 'shipped' """
# The order can only be 'shipped' if the current status is PENDING # The order can only be 'shipped' if the current status is PENDING
if not self.status == SalesOrderStatus.PENDING: if not self.status == SalesOrderStatus.PENDING:
raise ValidationError({'status': _("SalesOrder cannot be shipped as it is not currently pending")}) raise ValidationError({'status': _("SalesOrder cannot be shipped as it is not currently pending")})
@ -323,7 +322,7 @@ class SalesOrder(Order):
# Complete the allocation for each allocated StockItem # Complete the allocation for each allocated StockItem
for line in self.lines.all(): for line in self.lines.all():
for allocation in line.allocations.all(): for allocation in line.allocations.all():
allocation.complete_allocation(user) allocation.complete_allocation(user)
# Ensure the order status is marked as "Shipped" # Ensure the order status is marked as "Shipped"
self.status = SalesOrderStatus.SHIPPED self.status = SalesOrderStatus.SHIPPED