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

Icer button rendering for PurchaseOrder page

Browse Source
This commit is contained in:
Oliver Walters 2019-09-08 23:26:41 +10:00
parent fa8056f4b9
commit 8817b4d692
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
InvenTree/order/templates/order/purchase_order_detail.html
View File

@ -25,6 +25,27 @@ InvenTree | {{ order }}
{% if order.URL %} {% if order.URL %}
<a href="{{ order.URL }}">{{ order.URL }}</a> <a href="{{ order.URL }}">{{ order.URL }}</a>
{% endif %} {% endif %}
<p>
<div class='btn-row'>
<div class='btn-group'>
<button type='button' class='btn btn-default btn-glyph' id='edit-order' title='Edit order information'>
<span class='glyphicon glyphicon-edit'></span>
</button>
<button type='button' class='btn btn-default btn-glyph' id='export-order' title='Export order to file'>
<span class='glyphicon glyphicon-download-alt'></span>
</button>
{% if order.status == OrderStatus.PENDING and order.lines.count > 0 %}
<button type='button' class='btn btn-default btn-glyph' id='place-order' title='Place order'>
<span class='glyphicon glyphicon-send'></span>
</button>
{% elif order.status == OrderStatus.PLACED %}
<button type='button' class='btn btn-default btn-glyph' id='receive-order' title='Receive items'>
<span class='glyphicon glyphicon-check'></span>
</button>
{% endif %}
</div>
</div>
</p>
</div> </div>
</div> </div>
</div> </div>
@ -65,13 +86,6 @@ InvenTree | {{ order }}
{% if order.status == OrderStatus.PENDING %} {% if order.status == OrderStatus.PENDING %}
<button type='button' class='btn btn-default' id='new-po-line'>Add Line Item</button> <button type='button' class='btn btn-default' id='new-po-line'>Add Line Item</button>
{% endif %} {% endif %}
<button type='button' class='btn btn-primary' id='edit-order'>Edit Order</button>
{% if order.status == OrderStatus.PENDING and order.lines.count > 0 %}
<button type='button' class='btn btn-primary' id='place-order'>Place Order</button>
{% elif order.status == OrderStatus.PLACED %}
<button type='button' class='btn btn-primary' id='receive-order'>Receive Items</button>
{% endif %}
<button type='button' class='btn btn-primary' id='export-order' title='Export order to file'>Export</button>
</div> </div>
<h4>Order Items</h4> <h4>Order Items</h4>

2
InvenTree/stock/views.py
View File

@ -176,7 +176,6 @@ class StockExport(AjaxView):
except (ValueError, StockLocation.DoesNotExist): except (ValueError, StockLocation.DoesNotExist):
location = None location = None
if export_format not in GetExportFormats(): if export_format not in GetExportFormats():
export_format = 'csv' export_format = 'csv'
@ -186,7 +185,6 @@ class StockExport(AjaxView):
fmt=export_format fmt=export_format
) )
if location: if location:
stock_items = location.get_stock_items(cascade) stock_items = location.get_stock_items(cascade)
else: else: