inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-01 04:56:45 +00:00
Code

Bug fix for cancelling purchase orders

Browse Source
This commit is contained in:
Oliver Walters 2021-01-14 14:37:49 +11:00
parent 76c938762c
commit be41741b1e
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/order/models.py
View File

@ -257,7 +257,11 @@ class PurchaseOrder(Order):
self.save() self.save()
def can_cancel(self): def can_cancel(self):
return self.status not in [ """
A PurchaseOrder can only be cancelled under the following circumstances:
"""
return self.status in [
PurchaseOrderStatus.PLACED, PurchaseOrderStatus.PLACED,
PurchaseOrderStatus.PENDING PurchaseOrderStatus.PENDING
] ]

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

@ -47,7 +47,7 @@ src="{% static 'img/blank_image.png' %}"
<span class='fas fa-check-circle'></span> <span class='fas fa-check-circle'></span>
</button> </button>
{% endif %} {% endif %}
{% if order.status == PurchaseOrderStatus.PENDING or order.status == PurchaseOrderStatus.PLACED %} {% if order.can_cancel %}
<button type='button' class='btn btn-default' id='cancel-order' title='{% trans "Cancel order" %}'> <button type='button' class='btn btn-default' id='cancel-order' title='{% trans "Cancel order" %}'>
<span class='fas fa-times-circle icon-red'></span> <span class='fas fa-times-circle icon-red'></span>
</button> </button>

2
InvenTree/order/views.py
View File

@ -432,7 +432,7 @@ class PurchaseOrderCancel(AjaxUpdateView):
form.add_error('confirm', _('Confirm order cancellation')) form.add_error('confirm', _('Confirm order cancellation'))
if not order.can_cancel(): if not order.can_cancel():
form.add_error(None, _('Order cannot be cancelled as either pending or placed')) form.add_error(None, _('Order cannot be cancelled'))
def save(self, order, form, **kwargs): def save(self, order, form, **kwargs):
""" """