Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate "completed shipments" onto its own tab

Browse Source
This commit is contained in:
Oliver 2021-11-26 10:50:43 +11:00
parent 68e2b0850b
commit d3b9adc87a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
InvenTree/order/templates/order/sales_order_detail.html
View File

@ -37,8 +37,8 @@
</div> </div>
</div> </div>
<div class='panel panel-hidden' id='panel-order-shipments'>
{% if order.is_pending %} {% if order.is_pending %}
<div class='panel panel-hidden' id='panel-order-shipments'>
<div class='panel-heading'> <div class='panel-heading'>
<div class='d-flex flex-row'> <div class='d-flex flex-row'>
<h4>{% trans "Pending Shipments" %}</h4> <h4>{% trans "Pending Shipments" %}</h4>
@ -57,7 +57,10 @@
{% endif %} {% endif %}
<table class='table table-striped table-condensed' id='pending-shipments-table' data-toolbar='#pending-shipment-toolbar'></table> <table class='table table-striped table-condensed' id='pending-shipments-table' data-toolbar='#pending-shipment-toolbar'></table>
</div> </div>
</div>
{% endif %} {% endif %}
<div class='panel panel-hidden' id='panel-order-shipments-complete'>
<div class='panel-heading'> <div class='panel-heading'>
<h4>{% trans "Completed Shipments" %}</h4> <h4>{% trans "Completed Shipments" %}</h4>
</div> </div>

8
InvenTree/order/templates/order/so_sidebar.html
View File

@ -4,8 +4,12 @@
{% trans "Line Items" as text %} {% trans "Line Items" as text %}
{% include "sidebar_item.html" with label='order-items' text=text icon="fa-list-ol" %} {% include "sidebar_item.html" with label='order-items' text=text icon="fa-list-ol" %}
{% trans "Shipments" as text %} {% if order.is_pending %}
{% include "sidebar_item.html" with label='order-shipments' text=text icon="fa-truck" %} {% trans "Pending Shipments" as text %}
{% include "sidebar_item.html" with label='order-shipments' text=text icon="fa-truck-loading" %}
{% endif %}
{% trans "Completed Shipments" as text %}
{% include "sidebar_item.html" with label='order-shipments-complete' text=text icon="fa-truck" %}
{% trans "Build Orders" as text %} {% trans "Build Orders" as text %}
{% include "sidebar_item.html" with label='order-builds' text=text icon="fa-tools" %} {% include "sidebar_item.html" with label='order-builds' text=text icon="fa-tools" %}
{% trans "Attachments" as text %} {% trans "Attachments" as text %}