inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-08-07 20:32:12 +00:00
Code Activity

Merge branch 'master' of https://github.com/inventree/InvenTree into sn-append

Browse Source
This commit is contained in:
Matthias
2021-12-29 23:45:19 +01:00
parent f2c1fe1f95 724dd2a9c8
commit 95ee4f908f
63 changed files with 20963 additions and 16113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
InvenTree/order/models.py
View File

@@ -628,28 +628,30 @@ class SalesOrder(Order):
Throws a ValidationError if cannot be completed.
"""
# Order without line items cannot be completed
if self.lines.count() == 0:
if raise_error:
try:
# Order without line items cannot be completed
if self.lines.count() == 0:
raise ValidationError(_('Order cannot be completed as no parts have been assigned'))
# Only a PENDING order can be marked as SHIPPED
elif self.status != SalesOrderStatus.PENDING:
if raise_error:
# Only a PENDING order can be marked as SHIPPED
elif self.status != SalesOrderStatus.PENDING:
raise ValidationError(_('Only a pending order can be marked as complete'))
elif self.pending_shipment_count > 0:
if raise_error:
elif self.pending_shipment_count > 0:
raise ValidationError(_("Order cannot be completed as there are incomplete shipments"))
elif self.pending_line_count > 0:
if raise_error:
elif self.pending_line_count > 0:
raise ValidationError(_("Order cannot be completed as there are incomplete line items"))
else:
return True
except ValidationError as e:
return False
if raise_error:
raise e
else:
return False
return True
def complete_order(self, user):
"""