From ad366ef0bda2ed5dfdc91a32a48d21a7322c0a27 Mon Sep 17 00:00:00 2001 From: eeintech Date: Wed, 6 Apr 2022 16:45:23 -0400 Subject: [PATCH] Fix part and po files import --- .../order/templates/order/order_wizard/po_upload.html | 10 +++++++--- .../part/templates/part/import_wizard/part_upload.html | 3 +-- InvenTree/templates/patterns/wizard/upload.html | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/InvenTree/order/templates/order/order_wizard/po_upload.html b/InvenTree/order/templates/order/order_wizard/po_upload.html index b101cfc8b5..d33d27f6c6 100644 --- a/InvenTree/order/templates/order/order_wizard/po_upload.html +++ b/InvenTree/order/templates/order/order_wizard/po_upload.html @@ -11,10 +11,14 @@ {% block page_content %} {% trans "Upload File for Purchase Order" as header_text %} - {% order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change as upload_go_ahead %} {% trans "Order is already processed. Files cannot be uploaded." as error_text %} - {% "panel-upload-file" as panel_id %} - {% include "patterns/wizard/upload.html" with header_text=header_text upload_go_ahead=upload_go_ahead error_text=error_text panel_id=panel_id %} + {% with "panel-upload-file" as panel_id %} + {% if order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change %} + {% include "patterns/wizard/upload.html" with header_text=header_text upload_go_ahead=True error_text=error_text panel_id=panel_id %} + {% else %} + {% include "patterns/wizard/upload.html" with header_text=header_text upload_go_ahead=False error_text=error_text panel_id=panel_id %} + {% endif %} + {% endwith %} {% endblock %} {% block js_ready %} diff --git a/InvenTree/part/templates/part/import_wizard/part_upload.html b/InvenTree/part/templates/part/import_wizard/part_upload.html index 4fef625d1d..025a4e997c 100644 --- a/InvenTree/part/templates/part/import_wizard/part_upload.html +++ b/InvenTree/part/templates/part/import_wizard/part_upload.html @@ -11,9 +11,8 @@ {% block content %} {% trans "Import Parts from File" as header_text %} - {% roles.part.change as upload_go_ahead %} {% trans "Unsuffitient privileges." as error_text %} - {% include "patterns/wizard/upload.html" with header_text=header_text upload_go_ahead=upload_go_ahead error_text=error_text %} + {% include "patterns/wizard/upload.html" with header_text=header_text upload_go_ahead=roles.part.change error_text=error_text %} {% endblock %} {% block js_ready %} diff --git a/InvenTree/templates/patterns/wizard/upload.html b/InvenTree/templates/patterns/wizard/upload.html index 11ab48eced..6a7049247d 100644 --- a/InvenTree/templates/patterns/wizard/upload.html +++ b/InvenTree/templates/patterns/wizard/upload.html @@ -1,3 +1,5 @@ +{% load i18n %} +