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
2020-04-12 01:05:42 +10:00
parent ba2b1ce581 a921b3fcee
commit a8ceddc8e4
51 changed files with 1934 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
InvenTree/stock/api.py
View File

@ -410,8 +410,16 @@ class StockList(generics.ListCreateAPIView):
# Start with all objects
stock_list = super(StockList, self).get_queryset()
# Filter out parts which are not actually "in stock"
stock_list = stock_list.filter(customer=None, belongs_to=None)
# Do we wish to filter by "active parts"
active = self.request.query_params.get('active', None)
if active is not None:
active = str2bool(active)
stock_list = stock_list.filter(part__active=active)
# Does the client wish to filter by the Part ID?
part_id = self.request.query_params.get('part', None)

3
InvenTree/stock/templates/stock/item_base.html
View File

@ -1,6 +1,7 @@
{% extends "stock/stock_app_base.html" %}
{% load static %}
{% load inventree_extras %}
{% load status_codes %}
{% load i18n %}
{% block content %}
@ -172,7 +173,7 @@
<tr>
<td><span class='fas fa-info'></span></td>
<td>{% trans "Status" %}</td>
<td>{{ item.get_status_display }}</td>
<td>{% stock_status item.status %}</td>
</tr>
</table>
</div>