inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-28 19:46:46 +00:00
Code

Merge pull request #2812 from eeintech/fix_upload

Browse Source 
Fix part and po files import

(cherry picked from commit d0fa40a40860e949313607c925ddeaeb90afb4a7)
This commit is contained in:
Oliver 2022-04-07 08:23:02 +10:00 committed by Oliver Walters
parent f7b91f55e0
commit 1597f6dda4
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
InvenTree/order/templates/order/order_wizard/po_upload.html
View File

@ -11,10 +11,14 @@
{% block page_content %} {% block page_content %}
{% trans "Upload File for Purchase Order" as header_text %} {% 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 %} {% trans "Order is already processed. Files cannot be uploaded." as error_text %}
{% "panel-upload-file" as panel_id %} {% with "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 %} {% 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 %} {% endblock %}
{% block js_ready %} {% block js_ready %}

3
InvenTree/part/templates/part/import_wizard/part_upload.html
View File

@ -11,9 +11,8 @@
{% block content %} {% block content %}
{% trans "Import Parts from File" as header_text %} {% trans "Import Parts from File" as header_text %}
{% roles.part.change as upload_go_ahead %}
{% trans "Unsuffitient privileges." as error_text %} {% 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 %} {% endblock %}
{% block js_ready %} {% block js_ready %}

2
InvenTree/templates/patterns/wizard/upload.html
View File

@ -1,3 +1,5 @@
{% load i18n %}
<div class='panel' id='{{ panel_id }}'> <div class='panel' id='{{ panel_id }}'>
<div class='panel-heading'> <div class='panel-heading'>
<h4> <h4>