diff --git a/InvenTree/order/forms.py b/InvenTree/order/forms.py index ba2707133f..c7942e3549 100644 --- a/InvenTree/order/forms.py +++ b/InvenTree/order/forms.py @@ -49,4 +49,3 @@ class EditPurchaseOrderLineItemForm(HelperForm): 'reference', 'notes', ] - diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index 7028f96a8b..4360f4de4f 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -83,7 +83,9 @@ InvenTree | {{ order }} Received {% endif %} Note + {% if order.status == OrderStatus.PENDING %} + {% endif %} {% for line in order.lines.all %} @@ -107,6 +109,7 @@ InvenTree | {{ order }} {{ line.notes }} + {% if order.status == OrderStatus.PENDING %}
+ {% endif %} {% endfor %} diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py index 3b789301de..ea9da7e373 100644 --- a/InvenTree/order/views.py +++ b/InvenTree/order/views.py @@ -190,7 +190,7 @@ class OrderParts(AjaxView): except SupplierPart.DoesNotExist: continue - if not supplier.name in suppliers: + if supplier.name not in suppliers: supplier.order_items = [] supplier.selected_purchase_order = None suppliers[supplier.name] = supplier @@ -387,7 +387,7 @@ class OrderParts(AjaxView): if form_step == 'select_parts': # No errors? Proceed to PO selection form - if part_errors == False: + if part_errors is False: self.ajax_template_name = 'order/order_wizard/select_pos.html' else: @@ -567,4 +567,4 @@ class POLineItemDelete(AjaxDeleteView): def get_data(self): return { 'danger': 'Deleted line item', - } \ No newline at end of file + } diff --git a/setup.cfg b/setup.cfg index 697f6d1f02..d6e7ca056a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,6 +3,8 @@ ignore = # - W293 - blank lines contain whitespace W293, # - E501 - line too long (82 characters) - E501 + E501, + # - C901 - function is too complex + C901, exclude = .git,__pycache__,*/migrations/* max-complexity = 20