- |
- {% trans "Supplier" %} |
- {{ order.supplier }} |
+ |
+ {% trans "Order Reference" %} |
+ {{ order.reference }} |
|
- {% trans "Status" %} |
+ {% trans "Order Status" %} |
{% order_status order.status %} |
+
+ |
+ {% trans "Supplier" %} |
+ {{ order.supplier.name }} |
+
+ {% if order.supplier_reference %}
+
+ |
+ {% trans "Supplier Reference" %} |
+ {{ order.supplier_reference }} |
+
+ {% endif %}
{% if order.link %}
|
diff --git a/InvenTree/part/api.py b/InvenTree/part/api.py
index 7d193fa1ee..e36d4a568b 100644
--- a/InvenTree/part/api.py
+++ b/InvenTree/part/api.py
@@ -153,6 +153,7 @@ class PartList(generics.ListCreateAPIView):
The Part object list can be filtered by:
- category: Filter by PartCategory reference
- cascade: If true, include parts from sub-categories
+ - starred: Is the part "starred" by the current user?
- is_template: Is the part a template part?
- variant_of: Filter by variant_of Part reference
- assembly: Filter by assembly field
@@ -257,12 +258,18 @@ class PartList(generics.ListCreateAPIView):
# Filter items which have an 'in_stock' level higher than 'minimum_stock'
data = data.filter(Q(in_stock__gte=F('minimum_stock')))
+ # Get a list of the parts that this user has starred
+ starred_parts = [star.part.pk for star in self.request.user.starred_parts.all()]
+
# Reduce the number of lookups we need to do for the part categories
categories = {}
for item in data:
if item['image']:
+ # Is this part 'starred' for the current user?
+ item['starred'] = item['pk'] in starred_parts
+
img = item['image']
# Use the 'thumbnail' image here instead of the full-size image
@@ -294,32 +301,53 @@ class PartList(generics.ListCreateAPIView):
return Response(data)
def get_queryset(self):
-
- # Does the user wish to filter by category?
- cat_id = self.request.query_params.get('category', None)
+ """
+ Implement custom filtering for the Part list API
+ """
# Start with all objects
parts_list = Part.objects.all()
- cascade = str2bool(self.request.query_params.get('cascade', False))
+ # Filter by 'starred' parts?
+ starred = str2bool(self.request.query_params.get('starred', None))
+
+ if starred is not None:
+ starred_parts = [star.part.pk for star in self.request.user.starred_parts.all()]
+
+ if starred:
+ parts_list = parts_list.filter(pk__in=starred_parts)
+ else:
+ parts_list = parts_list.exclude(pk__in=starred_parts)
+
+ cascade = str2bool(self.request.query_params.get('cascade', None))
+
+ # Does the user wish to filter by category?
+ cat_id = self.request.query_params.get('category', None)
if cat_id is None:
- # Top-level parts
- if not cascade:
- parts_list = parts_list.filter(category=None)
-
+ # No category filtering if category is not specified
+ pass
+
else:
- try:
- category = PartCategory.objects.get(pk=cat_id)
+ # Category has been specified!
+ if isNull(cat_id):
+ # A 'null' category is the top-level category
+ if cascade is False:
+ # Do not cascade, only list parts in the top-level category
+ parts_list = parts_list.filter(category=None)
- # If '?cascade=true' then include parts which exist in sub-categories
- if cascade:
- parts_list = parts_list.filter(category__in=category.getUniqueChildren())
- # Just return parts directly in the requested category
- else:
- parts_list = parts_list.filter(category=cat_id)
- except (ValueError, PartCategory.DoesNotExist):
- pass
+ else:
+ try:
+ category = PartCategory.objects.get(pk=cat_id)
+
+ # If '?cascade=true' then include parts which exist in sub-categories
+ if cascade:
+ parts_list = parts_list.filter(category__in=category.getUniqueChildren())
+ # Just return parts directly in the requested category
+ else:
+ parts_list = parts_list.filter(category=cat_id)
+ except (ValueError, PartCategory.DoesNotExist):
+ pass
# Ensure that related models are pre-loaded to reduce DB trips
parts_list = self.get_serializer_class().setup_eager_loading(parts_list)
diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index c182cc6583..ca5b8f11c2 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -478,11 +478,11 @@ class Part(models.Model):
""" Return a JSON string for formatting a barcode for this Part object """
return helpers.MakeBarcode(
- "Part",
- self.id,
- reverse('api-part-detail', kwargs={'pk': self.id}),
+ "part",
{
- 'name': self.name,
+ "id": self.id,
+ "name": self.full_name,
+ "url": reverse('api-part-detail', kwargs={'pk': self.id}),
}
)
diff --git a/InvenTree/part/serializers.py b/InvenTree/part/serializers.py
index d5270cabb2..788613e104 100644
--- a/InvenTree/part/serializers.py
+++ b/InvenTree/part/serializers.py
@@ -96,6 +96,8 @@ class PartSerializer(InvenTreeModelSerializer):
queryset = queryset.prefetch_related('builds')
return queryset
+ # TODO - Include a 'category_detail' field which serializers the category object
+
class Meta:
model = Part
partial = True
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index cc663a63c4..9382259cce 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -137,29 +137,30 @@
$("#cat-create").click(function() {
launchModalForm(
- "{% url 'category-create' %}",
- {
- follow: true,
- {% if category %}
- data: {
- category: {{ category.id }}
- },
- {% endif %}
- secondary: [
- {
- field: 'default_location',
- label: 'New Location',
- title: 'Create new location',
- url: "{% url 'stock-location-create' %}",
- },
- {
- field: 'parent',
- label: 'New Category',
- title: 'Create new category',
- url: "{% url 'category-create' %}",
- },
- ]
- });
+ "{% url 'category-create' %}",
+ {
+ follow: true,
+ {% if category %}
+ data: {
+ category: {{ category.id }}
+ },
+ {% endif %}
+ secondary: [
+ {
+ field: 'default_location',
+ label: 'New Location',
+ title: 'Create new location',
+ url: "{% url 'stock-location-create' %}",
+ },
+ {
+ field: 'parent',
+ label: 'New Category',
+ title: 'Create new category',
+ url: "{% url 'category-create' %}",
+ },
+ ]
+ }
+ );
})
$("#part-export").click(function() {
@@ -200,11 +201,11 @@
{% if category %}
$("#cat-edit").click(function () {
launchModalForm(
- "{% url 'category-edit' category.id %}",
- {
- reload: true
- },
- );
+ "{% url 'category-edit' category.id %}",
+ {
+ reload: true
+ },
+ );
return false;
});
@@ -227,9 +228,9 @@
"#part-table",
"{% url 'api-part-list' %}",
{
- query: {
- {% if category %}
- category: {{ category.id }},
+ params: {
+ {% if category %}category: {{ category.id }},
+ {% else %}category: "null",
{% endif %}
},
buttons: ['#part-options'],
diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py
index e68e9c23dc..ab3b0694ac 100644
--- a/InvenTree/part/templatetags/inventree_extras.py
+++ b/InvenTree/part/templatetags/inventree_extras.py
@@ -70,7 +70,7 @@ def inventree_commit_date(*args, **kwargs):
@register.simple_tag()
def inventree_github_url(*args, **kwargs):
""" Return URL for InvenTree github site """
- return "https://github.com/InvenTree"
+ return "https://github.com/InvenTree/InvenTree/"
@register.simple_tag()
diff --git a/InvenTree/plugins/__init__.py b/InvenTree/plugins/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/InvenTree/plugins/action/__init__.py b/InvenTree/plugins/action/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/InvenTree/plugins/action/action.py b/InvenTree/plugins/action/action.py
new file mode 100644
index 0000000000..4e0b0f5cb0
--- /dev/null
+++ b/InvenTree/plugins/action/action.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+
+import plugins.plugin as plugin
+
+
+class ActionPlugin(plugin.InvenTreePlugin):
+ """
+ The ActionPlugin class is used to perform custom actions
+ """
+
+ ACTION_NAME = ""
+
+ @classmethod
+ def action_name(cls):
+ """
+ Return the action name for this plugin.
+ If the ACTION_NAME parameter is empty,
+ look at the PLUGIN_NAME instead.
+ """
+ action = cls.ACTION_NAME
+
+ if not action:
+ action = cls.PLUGIN_NAME
+
+ return action
+
+ def __init__(self, user, data=None):
+ """
+ An action plugin takes a user reference, and an optional dataset (dict)
+ """
+ plugin.InvenTreePlugin.__init__(self)
+
+ self.user = user
+ self.data = data
+
+ def perform_action(self):
+ """
+ Override this method to perform the action!
+ """
+ pass
+
+ def get_result(self):
+ """
+ Result of the action?
+ """
+
+ # Re-implement this for cutsom actions
+ return False
+
+ def get_info(self):
+ """
+ Extra info? Can be a string / dict / etc
+ """
+ return None
+
+ def get_response(self):
+ """
+ Return a response. Default implementation is a simple response
+ which can be overridden.
+ """
+ return {
+ "action": self.action_name(),
+ "result": self.get_result(),
+ "info": self.get_info(),
+ }
+
+
+class SimpleActionPlugin(ActionPlugin):
+ """
+ An EXTREMELY simple action plugin which demonstrates
+ the capability of the ActionPlugin class
+ """
+
+ PLUGIN_NAME = "SimpleActionPlugin"
+ ACTION_NAME = "simple"
+
+ def perform_action(self):
+ print("Action plugin in action!")
+
+ def get_info(self):
+ return {
+ "user": self.user.username,
+ "hello": "world",
+ }
+
+ def get_result(self):
+ return True
diff --git a/InvenTree/plugins/barcode/__init__.py b/InvenTree/plugins/barcode/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/InvenTree/plugins/barcode/barcode.py b/InvenTree/plugins/barcode/barcode.py
new file mode 100644
index 0000000000..f8bd82f744
--- /dev/null
+++ b/InvenTree/plugins/barcode/barcode.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+
+import hashlib
+
+from rest_framework.renderers import JSONRenderer
+
+from stock.serializers import StockItemSerializer, LocationSerializer
+from part.serializers import PartSerializer
+
+import plugins.plugin as plugin
+
+
+class BarcodePlugin(plugin.InvenTreePlugin):
+ """
+ The BarcodePlugin class is the base class for any barcode plugin.
+ """
+
+ def __init__(self, barcode_data):
+ plugin.InvenTreePlugin.__init__(self)
+
+ self.data = barcode_data
+
+ def hash(self):
+ """
+ Calculate a hash for the barcode data.
+ This is supposed to uniquely identify the barcode contents,
+ at least within the bardcode sub-type.
+
+ The default implementation simply returns an MD5 hash of the barcode data,
+ encoded to a string.
+
+ This may be sufficient for most applications, but can obviously be overridden
+ by a subclass.
+
+ """
+
+ hash = hashlib.md5(str(self.data).encode())
+ return str(hash.hexdigest())
+
+ def validate(self):
+ """
+ Default implementation returns False
+ """
+ return False
+
+ def decode(self):
+ """
+ Decode the barcode, and craft a response
+ """
+
+ return None
+
+ def render_part(self, part):
+ """
+ Render a Part object to JSON
+ Use the existing serializer to do this.
+ """
+
+ serializer = PartSerializer(part)
+
+ return serializer.data
+
+ def render_stock_location(self, loc):
+ """
+ Render a StockLocation object to JSON
+ Use the existing serializer to do this.
+ """
+
+ serializer = LocationSerializer(loc)
+
+ return serializer.data
+
+ def render_stock_item(self, item):
+ """
+ Render a StockItem object to JSON.
+ Use the existing serializer to do this
+ """
+
+ serializer = StockItemSerializer(item, part_detail=True, location_detail=True, supplier_detail=True)
+
+ return serializer.data
diff --git a/InvenTree/plugins/barcode/digikey.py b/InvenTree/plugins/barcode/digikey.py
new file mode 100644
index 0000000000..2542fe964a
--- /dev/null
+++ b/InvenTree/plugins/barcode/digikey.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+from . import barcode
+
+
+class DigikeyBarcodePlugin(barcode.BarcodePlugin):
+
+ PLUGIN_NAME = "DigikeyBarcodePlugin"
diff --git a/InvenTree/plugins/barcode/inventree.py b/InvenTree/plugins/barcode/inventree.py
new file mode 100644
index 0000000000..93b86d42b7
--- /dev/null
+++ b/InvenTree/plugins/barcode/inventree.py
@@ -0,0 +1,94 @@
+"""
+The InvenTreeBarcodePlugin validates barcodes generated by InvenTree itself.
+It can be used as a template for developing third-party barcode plugins.
+
+The data format is very simple, and maps directly to database objects,
+via the "id" parameter.
+
+Parsing an InvenTree barcode simply involves validating that the
+references model objects actually exist in the database.
+"""
+
+# -*- coding: utf-8 -*-
+
+import json
+
+from . import barcode
+
+from stock.models import StockItem, StockLocation
+from part.models import Part
+
+from django.utils.translation import ugettext as _
+
+
+class InvenTreeBarcodePlugin(barcode.BarcodePlugin):
+
+ PLUGIN_NAME = "InvenTreeBarcodePlugin"
+
+ def validate(self):
+ """
+ An "InvenTree" barcode must include the following tags:
+
+ {
+ 'tool': 'InvenTree',
+ 'version':
+ }
+
+ """
+
+ # The data must either be dict or be able to dictified
+ if type(self.data) is dict:
+ pass
+ elif type(self.data) is str:
+ try:
+ self.data = json.loads(self.data)
+ except json.JSONDecodeError:
+ return False
+ else:
+ return False
+
+ for key in ['tool', 'version']:
+ if key not in self.data.keys():
+ return False
+
+ if not self.data['tool'] == 'InvenTree':
+ return False
+
+ return True
+
+ def decode(self):
+
+ response = {}
+
+ if 'part' in self.data.keys():
+ id = self.data['part'].get('id', None)
+
+ try:
+ part = Part.objects.get(id=id)
+ response['part'] = self.render_part(part)
+ except (ValueError, Part.DoesNotExist):
+ response['error'] = _('Part does not exist')
+
+ elif 'stocklocation' in self.data.keys():
+ id = self.data['stocklocation'].get('id', None)
+
+ try:
+ loc = StockLocation.objects.get(id=id)
+ response['stocklocation'] = self.render_stock_location(loc)
+ except (ValueError, StockLocation.DoesNotExist):
+ response['error'] = _('StockLocation does not exist')
+
+ elif 'stockitem' in self.data.keys():
+
+ id = self.data['stockitem'].get('id', None)
+
+ try:
+ item = StockItem.objects.get(id=id)
+ response['stockitem'] = self.render_stock_item(item)
+ except (ValueError, StockItem.DoesNotExist):
+ response['error'] = _('StockItem does not exist')
+
+ else:
+ response['error'] = _('No matching data')
+
+ return response
diff --git a/InvenTree/plugins/plugin.py b/InvenTree/plugins/plugin.py
new file mode 100644
index 0000000000..11de4d1365
--- /dev/null
+++ b/InvenTree/plugins/plugin.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+
+class InvenTreePlugin():
+ """
+ Base class for a Barcode plugin
+ """
+
+ # Override the plugin name for each concrete plugin instance
+ PLUGIN_NAME = ''
+
+ def plugin_name(self):
+ return self.PLUGIN_NAME
+
+ def __init__(self):
+ pass
diff --git a/InvenTree/plugins/plugins.py b/InvenTree/plugins/plugins.py
new file mode 100644
index 0000000000..f913c1f295
--- /dev/null
+++ b/InvenTree/plugins/plugins.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+
+import inspect
+import importlib
+import pkgutil
+
+# Barcode plugins
+import plugins.barcode as barcode
+from plugins.barcode.barcode import BarcodePlugin
+
+# Action plugins
+import plugins.action as action
+from plugins.action.action import ActionPlugin
+
+
+def iter_namespace(pkg):
+
+ return pkgutil.iter_modules(pkg.__path__, pkg.__name__ + ".")
+
+
+def get_modules(pkg):
+ # Return all modules in a given package
+ return [importlib.import_module(name) for finder, name, ispkg in iter_namespace(pkg)]
+
+
+def get_classes(module):
+ # Return all classes in a given module
+ return inspect.getmembers(module, inspect.isclass)
+
+
+def get_plugins(pkg, baseclass):
+ """
+ Return a list of all modules under a given package.
+
+ - Modules must be a subclass of the provided 'baseclass'
+ - Modules must have a non-empty PLUGIN_NAME parameter
+ """
+
+ plugins = []
+
+ modules = get_modules(pkg)
+
+ # Iterate through each module in the package
+ for mod in modules:
+ # Iterate through each class in the module
+ for item in get_classes(mod):
+ plugin = item[1]
+ if issubclass(plugin, baseclass) and plugin.PLUGIN_NAME:
+ plugins.append(plugin)
+
+ return plugins
+
+
+def load_barcode_plugins():
+ """
+ Return a list of all registered barcode plugins
+ """
+
+ print("Loading barcode plugins")
+
+ plugins = get_plugins(barcode, BarcodePlugin)
+
+ if len(plugins) > 0:
+ print("Discovered {n} barcode plugins:".format(n=len(plugins)))
+
+ for bp in plugins:
+ print(" - {bp}".format(bp=bp.PLUGIN_NAME))
+
+ return plugins
+
+
+def load_action_plugins():
+ """
+ Return a list of all registered action plugins
+ """
+
+ print("Loading action plugins")
+
+ plugins = get_plugins(action, ActionPlugin)
+
+ if len(plugins) > 0:
+ print("Discovered {n} action plugins:".format(n=len(plugins)))
+
+ for ap in plugins:
+ print(" - {ap}".format(ap=ap.PLUGIN_NAME))
+
+ return plugins
diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py
index b9132ab557..9f485ba5f7 100644
--- a/InvenTree/stock/api.py
+++ b/InvenTree/stock/api.py
@@ -344,6 +344,7 @@ class StockList(generics.ListCreateAPIView):
data = queryset.values(
'pk',
+ 'uid',
'parent',
'quantity',
'serial',
@@ -540,7 +541,7 @@ class StockList(generics.ListCreateAPIView):
'supplier_part',
'customer',
'belongs_to',
- 'build'
+ 'build',
]
diff --git a/InvenTree/stock/migrations/0026_stockitem_uid.py b/InvenTree/stock/migrations/0026_stockitem_uid.py
new file mode 100644
index 0000000000..c00e858815
--- /dev/null
+++ b/InvenTree/stock/migrations/0026_stockitem_uid.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.10 on 2020-04-14 12:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('stock', '0025_auto_20200405_2243'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='stockitem',
+ name='uid',
+ field=models.CharField(blank=True, help_text='Unique identifier field', max_length=128),
+ ),
+ ]
diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py
index ff0cf7b21a..51b61ff3fd 100644
--- a/InvenTree/stock/models.py
+++ b/InvenTree/stock/models.py
@@ -44,11 +44,11 @@ class StockLocation(InvenTreeTree):
""" Return a JSON string for formatting a barcode for this StockLocation object """
return helpers.MakeBarcode(
- 'StockLocation',
- self.id,
- reverse('api-location-detail', kwargs={'pk': self.id}),
+ 'stocklocation',
{
- 'name': self.name,
+ "id": self.id,
+ "name": self.name,
+ "url": reverse('api-location-detail', kwargs={'pk': self.id}),
}
)
@@ -108,6 +108,7 @@ class StockItem(MPTTModel):
Attributes:
parent: Link to another StockItem from which this StockItem was created
+ uid: Field containing a unique-id which is mapped to a third-party identifier (e.g. a barcode)
part: Link to the master abstract part that this StockItem is an instance of
supplier_part: Link to a specific SupplierPart (optional)
location: Where this StockItem is located
@@ -288,15 +289,15 @@ class StockItem(MPTTModel):
"""
return helpers.MakeBarcode(
- 'StockItem',
- self.id,
- reverse('api-stock-detail', kwargs={'pk': self.id}),
+ "stockitem",
{
- 'part_id': self.part.id,
- 'part_name': self.part.full_name
+ "id": self.id,
+ "url": reverse('api-stock-detail', kwargs={'pk': self.id}),
}
)
+ uid = models.CharField(blank=True, max_length=128, help_text=("Unique identifier field"))
+
parent = TreeForeignKey('self',
on_delete=models.DO_NOTHING,
blank=True, null=True,
diff --git a/InvenTree/stock/serializers.py b/InvenTree/stock/serializers.py
index ce4041fec3..fe4f850658 100644
--- a/InvenTree/stock/serializers.py
+++ b/InvenTree/stock/serializers.py
@@ -39,6 +39,7 @@ class StockItemSerializerBrief(InvenTreeModelSerializer):
model = StockItem
fields = [
'pk',
+ 'uid',
'part',
'part_name',
'supplier_part',
@@ -106,6 +107,7 @@ class StockItemSerializer(InvenTreeModelSerializer):
'status',
'status_text',
'tracking_items',
+ 'uid',
'url',
]
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index 46e26b6ff1..9785b78850 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -85,7 +85,7 @@
{% if item.belongs_to %}
- |
+ |
{% trans "Belongs To" %} |
{{ item.belongs_to }} |
@@ -96,6 +96,13 @@
{{ item.location.name }} |
{% endif %}
+ {% if item.uid %}
+
+ |
+ {% trans "Unique Identifier" %} |
+ {{ item.uid }} |
+
+ {% endif %}
{% if item.serialized %}
|
diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html
index c4eb5990cc..570378e55d 100644
--- a/InvenTree/templates/InvenTree/index.html
+++ b/InvenTree/templates/InvenTree/index.html
@@ -9,13 +9,7 @@ InvenTree | Index
{% include "InvenTree/starred_parts.html" with collapse_id="starred" %}
-{% if to_order %}
-{% include "InvenTree/parts_to_order.html" with collapse_id="order" %}
-{% endif %}
-
-{% if to_build %}
-{% include "InvenTree/parts_to_build.html" with collapse_id="build" %}
-{% endif %}
+{% include "InvenTree/low_stock.html" with collapse_id="order" %}
{% endblock %}
@@ -25,15 +19,31 @@ InvenTree | Index
{% block js_ready %}
-console.log("abcde?");
-
{{ block.super }}
-//TODO: These calls to bootstrapTable() are failing, for some reason?
-//$("#to-build-table").bootstrapTable();
-//$("#to-order-table").bootstrapTable();
-//$("#starred-parts-table").bootstrapTable();
+loadPartTable("#starred-parts-table", "{% url 'api-part-list' %}", {
+ params: {
+ "starred": true,
+ }
+});
+
+loadPartTable("#low-stock-table", "{% url 'api-part-list' %}", {
+ params: {
+ "low_stock": true,
+ }
+});
+
+$("#starred-parts-table").on('load-success.bs.table', function() {
+ var count = $("#starred-parts-table").bootstrapTable('getData').length;
+
+ $("#starred-parts-count").html(count);
+});
+
+$("#low-stock-table").on('load-success.bs.table', function() {
+ var count = $("#low-stock-table").bootstrapTable('getData').length;
+
+ $("#low-stock-count").html(count);
+});
-console.log("Got to here...");
{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/low_stock.html b/InvenTree/templates/InvenTree/low_stock.html
new file mode 100644
index 0000000000..edafab1756
--- /dev/null
+++ b/InvenTree/templates/InvenTree/low_stock.html
@@ -0,0 +1,15 @@
+{% extends "collapse.html" %}
+
+{% load i18n %}
+
+{% block collapse_title %}
+
+{% trans "Low Stock" %}0
+{% endblock %}
+
+{% block collapse_content %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/parts_to_order.html b/InvenTree/templates/InvenTree/parts_to_order.html
deleted file mode 100644
index 5d2c3472b4..0000000000
--- a/InvenTree/templates/InvenTree/parts_to_order.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "collapse.html" %}
-{% block collapse_title %}
-
-Parts to Order{{ to_order | length }}
-{% endblock %}
-
-{% block collapse_heading %}
-There are {{ to_order | length }} parts which need to be ordered.
-{% endblock %}
-
-{% block collapse_content %}
-
-{% include "required_part_table.html" with parts=to_order table_id="to-order-table" %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html
index e8cda96809..76fd62b697 100644
--- a/InvenTree/templates/InvenTree/search.html
+++ b/InvenTree/templates/InvenTree/search.html
@@ -104,6 +104,7 @@ InvenTree | {% trans "Search Results" %}
],
});
+
$("#location-results-table").inventreeTable({
url: "{% url 'api-location-list' %}",
queryParams: {
@@ -124,20 +125,22 @@ InvenTree | {% trans "Search Results" %}
],
});
+
loadPartTable("#part-results-table",
"{% url 'api-part-list' %}",
{
- query: {
+ params: {
search: "{{ query }}",
},
- allowInactive: true,
checkbox: false,
+ disableFilters: true,
}
);
+
loadCompanyTable('#company-results-table', "{% url 'api-company-list' %}", {
params: {
- serach: "{{ query }}",
+ search: "{{ query }}",
}
});
@@ -153,5 +156,5 @@ InvenTree | {% trans "Search Results" %}
},
}
);
-
+
{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/search_parts.html b/InvenTree/templates/InvenTree/search_parts.html
index 69c5c29051..ca75b096c2 100644
--- a/InvenTree/templates/InvenTree/search_parts.html
+++ b/InvenTree/templates/InvenTree/search_parts.html
@@ -9,6 +9,13 @@
{% endblock %}
{% block collapse_content %}
+
+
{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/starred_parts.html b/InvenTree/templates/InvenTree/starred_parts.html
index 091afde064..f13987e3c5 100644
--- a/InvenTree/templates/InvenTree/starred_parts.html
+++ b/InvenTree/templates/InvenTree/starred_parts.html
@@ -1,15 +1,15 @@
{% extends "collapse.html" %}
+
+{% load i18n %}
+
{% block collapse_title %}
-Starred Parts{{ starred | length }}
-{% endblock %}
-
-{% block collapse_heading %}
-You have {{ starred | length }} favourite parts
+{% trans "Starred Parts" %}0
{% endblock %}
{% block collapse_content %}
-{% include "required_part_table.html" with parts=starred table_id="starred-parts-table" %}
+
{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 3cae9fd37b..8559e6d5f1 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -102,6 +102,7 @@ InvenTree
+
diff --git a/InvenTree/templates/table_filters.html b/InvenTree/templates/table_filters.html
index e3dd78be19..f976e977a6 100644
--- a/InvenTree/templates/table_filters.html
+++ b/InvenTree/templates/table_filters.html
@@ -89,6 +89,10 @@ function getAvailableTableFilters(tableKey) {
type: 'bool',
title: '{% trans "Component" %}',
},
+ starred: {
+ type: 'bool',
+ title: '{% trans "Starred" %}',
+ },
};
}
diff --git a/docs/start.rst b/docs/start.rst
index 1b389d7e5b..45a32ffb0b 100644
--- a/docs/start.rst
+++ b/docs/start.rst
@@ -17,10 +17,16 @@ Requirements
To install InvenTree you will need the following system components installed:
* python3
+* python3-dev
* python3-pip (pip3)
+* g++
* make
-Each of these programs need to be installed (e.g. using apt or similar) before running the ``make install`` script.
+Each of these programs need to be installed (e.g. using apt or similar) before running the ``make install`` script:
+
+```
+sudo apt-get install python3 python3-dev python3-pip g++ make
+```
Virtual Environment
-------------------
@@ -115,4 +121,4 @@ Other shorthand functions are provided for the development and testing process:
* ``make coverage`` - Run all unit tests and generate code coverage report
* ``make style`` - Check Python codebase against PEP coding standards (using Flake)
* ``make docreqs`` - Install the packages required to generate documentation
-* ``make docs`` - Generate this documentation
\ No newline at end of file
+* ``make docs`` - Generate this documentation
diff --git a/requirements.txt b/requirements.txt
index ff65664282..4eace551ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
-Django==2.2.10 # Django package
+wheel>=0.34.2 # Wheel
+Django==2.2.10 # Django package
pillow==6.2.0 # Image manipulation
djangorestframework==3.10.3 # DRF framework
django-cors-headers==3.2.0 # CORS headers extension for DRF