- | {% trans "Order Multiple" %} | {{ part.multiple }} |
- {% if part.base_cost > 0 %}
- | {% trans "Base Price (Flat Fee)" %} | {{ part.base_cost }} |
- {% endif %}
-
- | {% trans "Price Breaks" %} |
-
-
-
-
- |
-
-
- | {% trans "Quantity" %} |
- {% trans "Price" %} |
-
- {% if part.price_breaks.all %}
- {% for pb in part.price_breaks.all %}
-
- | {% decimal pb.quantity %} |
-
- {% if pb.currency %}{{ pb.currency.symbol }}{% endif %}
- {% decimal pb.cost %}
- {% if pb.currency %}{{ pb.currency.suffix }}{% endif %}
-
-
-
-
- |
-
- {% endfor %}
- {% else %}
-
- |
- {% trans "No price breaks have been added for this part" %}
- |
-
- {% endif %}
+
+
+
+
+
+
{% endblock %}
@@ -56,7 +23,80 @@
{% block js_ready %}
{{ block.super }}
+function reloadPriceBreaks() {
+ $("#price-break-table").bootstrapTable("refresh");
+}
+$('#price-break-table').inventreeTable({
+ name: 'buypricebreaks',
+ formatNoMatches: function() { return "{% trans "No price break information found" %}"; },
+ queryParams: {
+ part: {{ part.id }},
+ },
+ url: "{% url 'api-part-supplier-price' %}",
+ onLoadSuccess: function() {
+ var table = $('#price-break-table');
+
+ table.find('.button-price-break-delete').click(function() {
+ var pk = $(this).attr('pk');
+
+ launchModalForm(
+ `/price-break/${pk}/delete/`,
+ {
+ success: reloadPriceBreaks
+ }
+ );
+ });
+
+ table.find('.button-price-break-edit').click(function() {
+ var pk = $(this).attr('pk');
+
+ launchModalForm(
+ `/price-break/${pk}/edit/`,
+ {
+ success: reloadPriceBreaks
+ }
+ );
+ });
+ },
+ columns: [
+ {
+ field: 'pk',
+ title: 'ID',
+ visible: false,
+ switchable: false,
+ },
+ {
+ field: 'quantity',
+ title: '{% trans "Quantity" %}',
+ sortable: true,
+ },
+ {
+ field: 'cost',
+ title: '{% trans "Price" %}',
+ sortable: true,
+ formatter: function(value, row, index) {
+ var html = '';
+
+ html += row.symbol || '';
+ html += value;
+
+ if (row.suffix) {
+ html += ' ' + row.suffix || '';
+ }
+
+ html += ``
+
+ html += makeIconButton('fa-edit icon-blue', 'button-price-break-edit', row.pk, '{% trans "Edit price break" %}');
+ html += makeIconButton('fa-trash-alt icon-red', 'button-price-break-delete', row.pk, '{% trans "Delete price break" %}');
+
+ html += `
`;
+
+ return html;
+ }
+ },
+ ]
+});
$('#new-price-break').click(function() {
launchModalForm("{% url 'price-break-create' %}",
@@ -69,24 +109,4 @@ $('#new-price-break').click(function() {
);
});
-$('.pb-edit-button').click(function() {
- var button = $(this);
-
- launchModalForm(button.attr('url'),
- {
- reload: true,
- }
- );
-});
-
-$('.pb-delete-button').click(function() {
- var button = $(this);
-
- launchModalForm(button.attr('url'),
- {
- reload: true,
- }
- );
-});
-
{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/company/views.py b/InvenTree/company/views.py
index 457cf74ec2..9ef6adea0e 100644
--- a/InvenTree/company/views.py
+++ b/InvenTree/company/views.py
@@ -401,7 +401,7 @@ class PriceBreakCreate(AjaxCreateView):
def get_data(self):
return {
- 'success': 'Added new price break'
+ 'success': _('Added new price break')
}
def get_part(self):
diff --git a/InvenTree/part/admin.py b/InvenTree/part/admin.py
index 568a48034f..fce80eb219 100644
--- a/InvenTree/part/admin.py
+++ b/InvenTree/part/admin.py
@@ -13,6 +13,7 @@ from .models import PartAttachment, PartStar
from .models import BomItem
from .models import PartParameterTemplate, PartParameter
from .models import PartTestTemplate
+from .models import PartSellPriceBreak
from stock.models import StockLocation
from company.models import SupplierPart
@@ -257,6 +258,14 @@ class ParameterAdmin(ImportExportModelAdmin):
list_display = ('part', 'template', 'data')
+class PartSellPriceBreakAdmin(admin.ModelAdmin):
+
+ class Meta:
+ model = PartSellPriceBreak
+
+ list_display = ('part', 'quantity', 'cost', 'currency')
+
+
admin.site.register(Part, PartAdmin)
admin.site.register(PartCategory, PartCategoryAdmin)
admin.site.register(PartAttachment, PartAttachmentAdmin)
@@ -265,3 +274,4 @@ admin.site.register(BomItem, BomItemAdmin)
admin.site.register(PartParameterTemplate, ParameterTemplateAdmin)
admin.site.register(PartParameter, ParameterAdmin)
admin.site.register(PartTestTemplate, PartTestTemplateAdmin)
+admin.site.register(PartSellPriceBreak, PartSellPriceBreakAdmin)
diff --git a/InvenTree/part/api.py b/InvenTree/part/api.py
index abc4181895..72b72f0dae 100644
--- a/InvenTree/part/api.py
+++ b/InvenTree/part/api.py
@@ -20,6 +20,7 @@ from django.urls import reverse
from .models import Part, PartCategory, BomItem, PartStar
from .models import PartParameter, PartParameterTemplate
from .models import PartAttachment, PartTestTemplate
+from .models import PartSellPriceBreak
from . import serializers as part_serializers
@@ -107,6 +108,27 @@ class CategoryDetail(generics.RetrieveUpdateDestroyAPIView):
queryset = PartCategory.objects.all()
+class PartSalePriceList(generics.ListCreateAPIView):
+ """
+ API endpoint for list view of PartSalePriceBreak model
+ """
+
+ queryset = PartSellPriceBreak.objects.all()
+ serializer_class = part_serializers.PartSalePriceSerializer
+
+ permission_classes = [
+ permissions.IsAuthenticated,
+ ]
+
+ filter_backends = [
+ DjangoFilterBackend
+ ]
+
+ filter_fields = [
+ 'part',
+ ]
+
+
class PartAttachmentList(generics.ListCreateAPIView, AttachmentMixin):
"""
API endpoint for listing (and creating) a PartAttachment (file upload).
@@ -405,6 +427,28 @@ class PartList(generics.ListCreateAPIView):
except (ValueError, Part.DoesNotExist):
pass
+ # Filter by whether the BOM has been validated (or not)
+ bom_valid = params.get('bom_valid', None)
+
+ # TODO: Querying bom_valid status may be quite expensive
+ # TODO: (It needs to be profiled!)
+ # TODO: It might be worth caching the bom_valid status to a database column
+
+ if bom_valid is not None:
+
+ bom_valid = str2bool(bom_valid)
+
+ # Limit queryset to active assemblies
+ queryset = queryset.filter(active=True, assembly=True)
+
+ pks = []
+
+ for part in queryset:
+ if part.is_bom_valid() == bom_valid:
+ pks.append(part.pk)
+
+ queryset = queryset.filter(pk__in=pks)
+
# Filter by 'starred' parts?
starred = params.get('starred', None)
@@ -454,6 +498,7 @@ class PartList(generics.ListCreateAPIView):
# Filter by whether the part has stock
has_stock = params.get("has_stock", None)
+
if has_stock is not None:
has_stock = str2bool(has_stock)
@@ -477,6 +522,36 @@ class PartList(generics.ListCreateAPIView):
# Filter items which have an 'in_stock' level higher than 'minimum_stock'
queryset = queryset.filter(Q(in_stock__gte=F('minimum_stock')))
+ # Filter by "parts which need stock to complete build"
+ stock_to_build = params.get('stock_to_build', None)
+
+ # TODO: This is super expensive, database query wise...
+ # TODO: Need to figure out a cheaper way of making this filter query
+
+ if stock_to_build is not None:
+ # Filter only active parts
+ queryset = queryset.filter(active=True)
+ parts_need_stock = []
+
+ # Find parts with active builds
+ # where any subpart's stock is lower than quantity being built
+ for part in queryset:
+ if part.active_builds and part.can_build < part.quantity_being_built:
+ parts_need_stock.append(part.pk)
+
+ queryset = queryset.filter(pk__in=parts_need_stock)
+
+ # Limit choices
+ limit = params.get('limit', None)
+
+ if limit is not None:
+ try:
+ limit = int(limit)
+ if limit > 0:
+ queryset = queryset[:limit]
+ except ValueError:
+ pass
+
return queryset
permission_classes = [
@@ -502,6 +577,7 @@ class PartList(generics.ListCreateAPIView):
ordering_fields = [
'name',
+ 'creation_date',
]
# Default ordering
@@ -755,6 +831,11 @@ part_api_urls = [
url(r'^(?P\d+)/?', PartStarDetail.as_view(), name='api-part-star-detail'),
url(r'^$', PartStarList.as_view(), name='api-part-star-list'),
])),
+
+ # Base URL for part sale pricing
+ url(r'^sale-price/', include([
+ url(r'^.*$', PartSalePriceList.as_view(), name='api-part-sale-price-list'),
+ ])),
# Base URL for PartParameter API endpoints
url(r'^parameter/', include([
diff --git a/InvenTree/part/forms.py b/InvenTree/part/forms.py
index ffcb46114a..0a15d598bd 100644
--- a/InvenTree/part/forms.py
+++ b/InvenTree/part/forms.py
@@ -17,6 +17,8 @@ from .models import Part, PartCategory, PartAttachment
from .models import BomItem
from .models import PartParameterTemplate, PartParameter
from .models import PartTestTemplate
+from .models import PartSellPriceBreak
+
from common.models import Currency
@@ -253,3 +255,22 @@ class PartPriceForm(forms.Form):
'quantity',
'currency',
]
+
+
+class EditPartSalePriceBreakForm(HelperForm):
+ """
+ Form for creating / editing a sale price for a part
+ """
+
+ quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
+
+ cost = RoundingDecimalFormField(max_digits=10, decimal_places=5)
+
+ class Meta:
+ model = PartSellPriceBreak
+ fields = [
+ 'part',
+ 'quantity',
+ 'cost',
+ 'currency',
+ ]
diff --git a/InvenTree/part/migrations/0049_partsellpricebreak.py b/InvenTree/part/migrations/0049_partsellpricebreak.py
new file mode 100644
index 0000000000..1d49dcbfac
--- /dev/null
+++ b/InvenTree/part/migrations/0049_partsellpricebreak.py
@@ -0,0 +1,30 @@
+# Generated by Django 3.0.7 on 2020-09-17 13:22
+
+import InvenTree.fields
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('common', '0007_colortheme'),
+ ('part', '0048_auto_20200902_1404'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='PartSellPriceBreak',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('quantity', InvenTree.fields.RoundingDecimalField(decimal_places=5, default=1, max_digits=15, validators=[django.core.validators.MinValueValidator(1)])),
+ ('cost', InvenTree.fields.RoundingDecimalField(decimal_places=5, max_digits=10, validators=[django.core.validators.MinValueValidator(0)])),
+ ('currency', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='common.Currency')),
+ ('part', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='salepricebreaks', to='part.Part')),
+ ],
+ options={
+ 'unique_together': {('part', 'quantity')},
+ },
+ ),
+ ]
diff --git a/InvenTree/part/migrations/0050_auto_20200917_2315.py b/InvenTree/part/migrations/0050_auto_20200917_2315.py
new file mode 100644
index 0000000000..635294093d
--- /dev/null
+++ b/InvenTree/part/migrations/0050_auto_20200917_2315.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.0.7 on 2020-09-17 23:15
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('part', '0049_partsellpricebreak'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='partsellpricebreak',
+ name='part',
+ field=models.ForeignKey(limit_choices_to={'salable': True}, on_delete=django.db.models.deletion.CASCADE, related_name='salepricebreaks', to='part.Part'),
+ ),
+ ]
diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index f1b0890cba..afb2dfa64e 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -46,6 +46,8 @@ from order import models as OrderModels
from company.models import SupplierPart
from stock import models as StockModels
+import common.models
+
class PartCategory(InvenTreeTree):
""" PartCategory provides hierarchical organization of Part objects.
@@ -845,7 +847,6 @@ class Part(MPTTModel):
return str(hash.digest())
- @property
def is_bom_valid(self):
""" Check if the BOM is 'valid' - if the calculated checksum matches the stored value
"""
@@ -1227,6 +1228,21 @@ class PartAttachment(InvenTreeAttachment):
related_name='attachments')
+class PartSellPriceBreak(common.models.PriceBreak):
+ """
+ Represents a price break for selling this part
+ """
+
+ part = models.ForeignKey(
+ Part, on_delete=models.CASCADE,
+ related_name='salepricebreaks',
+ limit_choices_to={'salable': True}
+ )
+
+ class Meta:
+ unique_together = ('part', 'quantity')
+
+
class PartStar(models.Model):
""" A PartStar object creates a relationship between a User and a Part.
diff --git a/InvenTree/part/serializers.py b/InvenTree/part/serializers.py
index 8adb26680e..7c73e9f98b 100644
--- a/InvenTree/part/serializers.py
+++ b/InvenTree/part/serializers.py
@@ -12,6 +12,7 @@ from .models import BomItem
from .models import PartParameter, PartParameterTemplate
from .models import PartAttachment
from .models import PartTestTemplate
+from .models import PartSellPriceBreak
from stock.models import StockItem
@@ -87,6 +88,32 @@ class PartTestTemplateSerializer(InvenTreeModelSerializer):
]
+class PartSalePriceSerializer(InvenTreeModelSerializer):
+ """
+ Serializer for sale prices for Part model.
+ """
+
+ symbol = serializers.CharField(read_only=True)
+
+ suffix = serializers.CharField(read_only=True)
+
+ quantity = serializers.FloatField()
+
+ cost = serializers.FloatField()
+
+ class Meta:
+ model = PartSellPriceBreak
+ fields = [
+ 'pk',
+ 'part',
+ 'quantity',
+ 'cost',
+ 'currency',
+ 'symbol',
+ 'suffix',
+ ]
+
+
class PartThumbSerializer(serializers.Serializer):
"""
Serializer for the 'image' field of the Part model.
diff --git a/InvenTree/part/templates/part/sale_prices.html b/InvenTree/part/templates/part/sale_prices.html
new file mode 100644
index 0000000000..8d3cc61afd
--- /dev/null
+++ b/InvenTree/part/templates/part/sale_prices.html
@@ -0,0 +1,110 @@
+{% extends "part/part_base.html" %}
+{% load static %}
+{% load i18n %}
+
+{% block details %}
+
+{% include 'part/tabs.html' with tab='sales-prices' %}
+
+{% trans "Sale Price" %}
+
+
+
+
+
+
+
+
+{% endblock %}
+
+{% block js_ready %}
+{{ block.super }}
+
+function reloadPriceBreaks() {
+ $("#price-break-table").bootstrapTable("refresh");
+}
+
+$('#new-price-break').click(function() {
+ launchModalForm("{% url 'sale-price-break-create' %}",
+ {
+ success: reloadPriceBreaks,
+ data: {
+ part: {{ part.id }},
+ }
+ }
+ );
+});
+
+$('#price-break-table').inventreeTable({
+ name: 'saleprice',
+ formatNoMatches: function() { return "{% trans 'No price break information found' %}"; },
+ queryParams: {
+ part: {{ part.id }},
+ },
+ url: "{% url 'api-part-sale-price-list' %}",
+ onLoadSuccess: function() {
+ var table = $('#price-break-table');
+
+ table.find('.button-price-break-delete').click(function() {
+ var pk = $(this).attr('pk');
+
+ launchModalForm(
+ `/part/sale-price/${pk}/delete/`,
+ {
+ success: reloadPriceBreaks
+ }
+ );
+ });
+
+ table.find('.button-price-break-edit').click(function() {
+ var pk = $(this).attr('pk');
+
+ launchModalForm(
+ `/part/sale-price/${pk}/edit/`,
+ {
+ success: reloadPriceBreaks
+ }
+ );
+ });
+ },
+ columns: [
+ {
+ field: 'pk',
+ title: 'ID',
+ visible: false,
+ switchable: false,
+ },
+ {
+ field: 'quantity',
+ title: '{% trans "Quantity" %}',
+ sortable: true,
+ },
+ {
+ field: 'cost',
+ title: '{% trans "Price" %}',
+ sortable: true,
+ formatter: function(value, row, index) {
+ var html = '';
+
+ html += row.symbol || '';
+ html += value;
+
+ if (row.suffix) {
+ html += ' ' + row.suffix || '';
+ }
+
+ html += ``
+
+ html += makeIconButton('fa-edit icon-blue', 'button-price-break-edit', row.pk, '{% trans "Edit price break" %}');
+ html += makeIconButton('fa-trash-alt icon-red', 'button-price-break-delete', row.pk, '{% trans "Delete price break" %}');
+
+ html += `
`;
+
+ return html;
+ }
+ },
+ ]
+})
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/tabs.html b/InvenTree/part/templates/part/tabs.html
index ffb92cf191..1eab299ed5 100644
--- a/InvenTree/part/templates/part/tabs.html
+++ b/InvenTree/part/templates/part/tabs.html
@@ -46,6 +46,9 @@
{% endif %}
{% if part.salable %}
+
+ {% trans "Sale Price" %}
+
{% trans "Sales Orders" %} {{ part.sales_orders|length }}
diff --git a/InvenTree/part/urls.py b/InvenTree/part/urls.py
index 2707a563c7..e61947e243 100644
--- a/InvenTree/part/urls.py
+++ b/InvenTree/part/urls.py
@@ -18,6 +18,12 @@ part_attachment_urls = [
url(r'^(?P\d+)/delete/?', views.PartAttachmentDelete.as_view(), name='part-attachment-delete'),
]
+sale_price_break_urls = [
+ url(r'^new/', views.PartSalePriceBreakCreate.as_view(), name='sale-price-break-create'),
+ url(r'^(?P\d+)/edit/', views.PartSalePriceBreakEdit.as_view(), name='sale-price-break-edit'),
+ url(r'^(?P\d+)/delete/', views.PartSalePriceBreakDelete.as_view(), name='sale-price-break-delete'),
+]
+
part_parameter_urls = [
url(r'^template/new/', views.PartParameterTemplateCreate.as_view(), name='part-param-template-create'),
@@ -27,7 +33,6 @@ part_parameter_urls = [
url(r'^new/', views.PartParameterCreate.as_view(), name='part-param-create'),
url(r'^(?P\d+)/edit/', views.PartParameterEdit.as_view(), name='part-param-edit'),
url(r'^(?P\d+)/delete/', views.PartParameterDelete.as_view(), name='part-param-delete'),
-
]
part_detail_urls = [
@@ -52,6 +57,7 @@ part_detail_urls = [
url(r'^suppliers/?', views.PartDetail.as_view(template_name='part/supplier.html'), name='part-suppliers'),
url(r'^orders/?', views.PartDetail.as_view(template_name='part/orders.html'), name='part-orders'),
url(r'^sales-orders/', views.PartDetail.as_view(template_name='part/sales_orders.html'), name='part-sales-orders'),
+ url(r'^sale-prices/', views.PartDetail.as_view(template_name='part/sale_prices.html'), name='part-sale-prices'),
url(r'^tests/', views.PartDetail.as_view(template_name='part/part_tests.html'), name='part-test-templates'),
url(r'^track/?', views.PartDetail.as_view(template_name='part/track.html'), name='part-track'),
url(r'^attachments/?', views.PartDetail.as_view(template_name='part/attachments.html'), name='part-attachments'),
@@ -108,6 +114,9 @@ part_urls = [
# Part attachments
url(r'^attachment/', include(part_attachment_urls)),
+ # Part price breaks
+ url(r'^sale-price/', include(sale_price_break_urls)),
+
# Part test templates
url(r'^test-template/', include([
url(r'^new/', views.PartTestTemplateCreate.as_view(), name='part-test-template-create'),
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 58ece9d0b0..ccf607afc0 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -26,6 +26,7 @@ from .models import PartParameterTemplate, PartParameter
from .models import BomItem
from .models import match_part_names
from .models import PartTestTemplate
+from .models import PartSellPriceBreak
from common.models import Currency, InvenTreeSetting
from company.models import SupplierPart
@@ -2097,3 +2098,75 @@ class BomItemDelete(AjaxDeleteView):
ajax_template_name = 'part/bom-delete.html'
context_object_name = 'item'
ajax_form_title = _('Confim BOM item deletion')
+
+
+class PartSalePriceBreakCreate(AjaxCreateView):
+ """ View for creating a sale price break for a part """
+
+ model = PartSellPriceBreak
+ form_class = part_forms.EditPartSalePriceBreakForm
+ ajax_form_title = _('Add Price Break')
+
+ def get_data(self):
+ return {
+ 'success': _('Added new price break')
+ }
+
+ def get_part(self):
+ try:
+ part = Part.objects.get(id=self.request.GET.get('part'))
+ except (ValueError, Part.DoesNotExist):
+ part = None
+
+ if part is None:
+ try:
+ part = Part.objects.get(id=self.request.POST.get('part'))
+ except (ValueError, Part.DoesNotExist):
+ part = None
+
+ return part
+
+ def get_form(self):
+
+ form = super(AjaxCreateView, self).get_form()
+ form.fields['part'].widget = HiddenInput()
+
+ return form
+
+ def get_initial(self):
+
+ initials = super(AjaxCreateView, self).get_initial()
+
+ initials['part'] = self.get_part()
+
+ # Pre-select the default currency
+ try:
+ base = Currency.objects.get(base=True)
+ initials['currency'] = base
+ except Currency.DoesNotExist:
+ pass
+
+ return initials
+
+
+class PartSalePriceBreakEdit(AjaxUpdateView):
+ """ View for editing a sale price break """
+
+ model = PartSellPriceBreak
+ form_class = part_forms.EditPartSalePriceBreakForm
+ ajax_form_title = _('Edit Price Break')
+
+ def get_form(self):
+
+ form = super().get_form()
+ form.fields['part'].widget = HiddenInput()
+
+ return form
+
+
+class PartSalePriceBreakDelete(AjaxDeleteView):
+ """ View for deleting a sale price break """
+
+ model = PartSellPriceBreak
+ ajax_form_title = _("Delete Price Break")
+ ajax_template_name = "modal_delete_form.html"
diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py
index 7741c67129..54cb5a62cf 100644
--- a/InvenTree/stock/api.py
+++ b/InvenTree/stock/api.py
@@ -440,6 +440,8 @@ class StockList(generics.ListCreateAPIView):
params = self.request.query_params
+ queryset = super().filter_queryset(queryset)
+
# Perform basic filtering:
# Note: We do not let DRF filter here, it be slow AF
@@ -680,6 +682,14 @@ class StockList(generics.ListCreateAPIView):
filter_fields = [
]
+ search_fields = [
+ 'serial',
+ 'batch',
+ 'part__name',
+ 'part__IPN',
+ 'part__description'
+ ]
+
class StockAttachmentList(generics.ListCreateAPIView, AttachmentMixin):
"""
diff --git a/InvenTree/templates/InvenTree/bom_invalid.html b/InvenTree/templates/InvenTree/bom_invalid.html
new file mode 100644
index 0000000000..4a2fe5856c
--- /dev/null
+++ b/InvenTree/templates/InvenTree/bom_invalid.html
@@ -0,0 +1,15 @@
+{% extends "collapse_index.html" %}
+
+{% load i18n %}
+
+{% block collapse_title %}
+
+{% trans "BOM Waiting Validation" %}
+{% endblock %}
+
+{% block collapse_content %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/build_pending.html b/InvenTree/templates/InvenTree/build_pending.html
new file mode 100644
index 0000000000..1b8ebc19c2
--- /dev/null
+++ b/InvenTree/templates/InvenTree/build_pending.html
@@ -0,0 +1,15 @@
+{% extends "collapse_index.html" %}
+
+{% load i18n %}
+
+{% block collapse_title %}
+
+{% trans "Pending Builds" %}
+{% endblock %}
+
+{% block collapse_content %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html
index 570378e55d..df2ae1414a 100644
--- a/InvenTree/templates/InvenTree/index.html
+++ b/InvenTree/templates/InvenTree/index.html
@@ -7,9 +7,43 @@ InvenTree | Index
{% block content %}
InvenTree
-{% include "InvenTree/starred_parts.html" with collapse_id="starred" %}
-{% include "InvenTree/low_stock.html" with collapse_id="order" %}
+
+
+ {% include "InvenTree/latest_parts.html" with collapse_id="latest_parts" %}
+
+
+ {% include "InvenTree/starred_parts.html" with collapse_id="starred" %}
+
+
+
+ {% include "InvenTree/bom_invalid.html" with collapse_id="bom_invalid" %}
+
+
+ {% include "InvenTree/build_pending.html" with collapse_id="build_pending" %}
+
+
+
+ {% include "InvenTree/low_stock.html" with collapse_id="order" %}
+
+
+ {% include "InvenTree/required_stock_build.html" with collapse_id="stock_to_build" %}
+
+
+
+ {% include "InvenTree/po_outstanding.html" with collapse_id="po_outstanding" %}
+
+
+ {% include "InvenTree/so_outstanding.html" with collapse_id="so_outstanding" %}
+
+
{% trans "Stock Items" %}
+{% endblock %}
+
+{% block collapse_heading %}
+{% include "InvenTree/searching.html" %}
+{% endblock %}
+
+{% block collapse_content %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/searching.html b/InvenTree/templates/InvenTree/searching.html
index 5821515ad7..cb33727a9e 100644
--- a/InvenTree/templates/InvenTree/searching.html
+++ b/InvenTree/templates/InvenTree/searching.html
@@ -1 +1,3 @@
- Searching
\ No newline at end of file
+{% load i18n %}
+
+ {% trans "Searching" %}
diff --git a/InvenTree/templates/InvenTree/so_outstanding.html b/InvenTree/templates/InvenTree/so_outstanding.html
new file mode 100644
index 0000000000..29d0261b8b
--- /dev/null
+++ b/InvenTree/templates/InvenTree/so_outstanding.html
@@ -0,0 +1,15 @@
+{% extends "collapse_index.html" %}
+
+{% load i18n %}
+
+{% block collapse_title %}
+
+{% trans "Outstanding Sales Orders" %}
+{% 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 f13987e3c5..a0801566c2 100644
--- a/InvenTree/templates/InvenTree/starred_parts.html
+++ b/InvenTree/templates/InvenTree/starred_parts.html
@@ -1,15 +1,15 @@
-{% extends "collapse.html" %}
+{% extends "collapse_index.html" %}
{% load i18n %}
{% block collapse_title %}
-{% trans "Starred Parts" %}0
+{% trans "Starred Parts" %}
{% endblock %}
{% block collapse_content %}
-
+
{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/collapse_index.html b/InvenTree/templates/collapse_index.html
new file mode 100644
index 0000000000..d87f63b244
--- /dev/null
+++ b/InvenTree/templates/collapse_index.html
@@ -0,0 +1,19 @@
+{% block collapse_preamble %}
+{% endblock %}
+
+
+
+
+ {% block collapse_heading %}
+ {% endblock %}
+
+
+
+ {% block collapse_content %}
+ {% endblock %}
+
+
+
+
{% include "search_form.html" %}
- -
+
-
diff --git a/tasks.py b/tasks.py
index 51c5a68849..cbf9d1722c 100644
--- a/tasks.py
+++ b/tasks.py
@@ -108,6 +108,14 @@ def superuser(c):
manage(c, 'createsuperuser', pty=True)
+@task
+def check(c):
+ """
+ Check validity of django codebase
+ """
+
+ manage(c, "check")
+
@task
def migrate(c):
"""