inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-01 11:10:54 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master'

Browse Source
This commit is contained in:
Oliver Walters
2019-06-04 21:22:36 +10:00
parent a13e50445e 937763f961
commit 166b41196b
22 changed files with 43 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/stock/templates/stock/location.html
View File

@ -46,8 +46,6 @@
{% include "stock_table.html" %}
{% include 'modals.html' %}
{% endblock %}
{% block js_load %}

2
InvenTree/stock/templates/stock/stock_adjust.html
View File

@ -17,7 +17,7 @@
</tr>
{% for item in stock_items %}
<tr id='stock-row-{{ item.id }}' class='error'>
<td>{% include "hover_image.html" with image=item.part.image %}
<td>{% include "hover_image.html" with image=item.part.image hover=True %}
{{ item.part.full_name }} <small><i>{{ item.part.description }}</i></small></td>
<td>{{ item.location.pathstring }}</td>
<td>

2
InvenTree/stock/templates/stock/tracking.html
View File

@ -8,8 +8,6 @@
<table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='tracking-table'>
</table>
{% include 'modals.html' %}
{% endblock %}
{% block js_ready %}