diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index 575dd4a74b..2ddbdc3052 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -25,6 +25,27 @@ InvenTree | {{ order }} {% if order.URL %} {{ order.URL }} {% endif %} +

+

+
+ + + {% if order.status == OrderStatus.PENDING and order.lines.count > 0 %} + + {% elif order.status == OrderStatus.PLACED %} + + {% endif %} +
+
+

@@ -65,13 +86,6 @@ InvenTree | {{ order }} {% if order.status == OrderStatus.PENDING %} {% endif %} - - {% if order.status == OrderStatus.PENDING and order.lines.count > 0 %} - - {% elif order.status == OrderStatus.PLACED %} - - {% endif %} -

Order Items

diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py index ab482b38f8..c831cd76a9 100644 --- a/InvenTree/stock/views.py +++ b/InvenTree/stock/views.py @@ -176,7 +176,6 @@ class StockExport(AjaxView): except (ValueError, StockLocation.DoesNotExist): location = None - if export_format not in GetExportFormats(): export_format = 'csv' @@ -186,7 +185,6 @@ class StockExport(AjaxView): fmt=export_format ) - if location: stock_items = location.get_stock_items(cascade) else: