Merge branch 'inventree:master' into fr-1421-sso

InvenTree/InvenTree/version.py

@@ -8,7 +8,7 @@ import re
 
 import common.models
 
-INVENTREE_SW_VERSION = "0.5.0 dev"
+INVENTREE_SW_VERSION = "0.6.0 dev"
 
 INVENTREE_API_VERSION = 12
 

InvenTree/order/api.py

@@ -8,11 +8,13 @@ from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
 from django.conf.urls import url, include
 from django.db import transaction
+from django.core.exceptions import ValidationError as DjangoValidationError
 
 from django_filters import rest_framework as rest_filters
 from rest_framework import generics
 from rest_framework import filters, status
 from rest_framework.response import Response
+from rest_framework import serializers
 from rest_framework.serializers import ValidationError
 
 
@@ -243,10 +245,11 @@ class POReceive(generics.CreateAPIView):
 
         pk = self.kwargs.get('pk', None)
 
-        if pk is None:
+        try:
-            return None
+            order = PurchaseOrder.objects.get(pk=pk)
-        else:
+        except (PurchaseOrder.DoesNotExist, ValueError):
-            order = PurchaseOrder.objects.get(pk=self.kwargs['pk'])
+            raise ValidationError(_("Matching purchase order does not exist"))
+        
         return order
 
     def create(self, request, *args, **kwargs):
@@ -259,9 +262,14 @@ class POReceive(generics.CreateAPIView):
         serializer.is_valid(raise_exception=True)
 
         # Receive the line items
+        try:
             self.receive_items(serializer)
+        except DjangoValidationError as exc:
+            # Re-throw a django error as a DRF error
+            raise ValidationError(detail=serializers.as_serializer_error(exc))
 
         headers = self.get_success_headers(serializer.data)
+
         return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
 
     @transaction.atomic

InvenTree/order/models.py

@@ -418,16 +418,24 @@ class PurchaseOrder(Order):
             barcode = ''
 
         if not self.status == PurchaseOrderStatus.PLACED:
-            raise ValidationError({"status": _("Lines can only be received against an order marked as 'Placed'")})
+            raise ValidationError(
+                "Lines can only be received against an order marked as 'PLACED'"
+            )
 
         try:
             if not (quantity % 1 == 0):
-                raise ValidationError({"quantity": _("Quantity must be an integer")})
+                raise ValidationError({
+                    "quantity": _("Quantity must be an integer")
+                })
             if quantity < 0:
-                raise ValidationError({"quantity": _("Quantity must be a positive number")})
+                raise ValidationError({
+                    "quantity": _("Quantity must be a positive number")
+                })
             quantity = int(quantity)
         except (ValueError, TypeError):
-            raise ValidationError({"quantity": _("Invalid quantity provided")})
+            raise ValidationError({
+                "quantity": _("Invalid quantity provided")
+            })
 
         # Create a new stock item
         if line.part and quantity > 0:

InvenTree/order/test_api.py

@@ -401,10 +401,7 @@ class PurchaseOrderReceiveTest(OrderTest):
         self.assertEqual(line_1.received, 0)
         self.assertEqual(line_2.received, 50)
 
-        # Receive two separate line items against this order
+        valid_data = {
-        self.post(
-            self.url,
-            {
             'items': [
                 {
                     'line_item': 1,
@@ -419,7 +416,30 @@ class PurchaseOrderReceiveTest(OrderTest):
                 }
             ],
             'location': 1,  # Default location
-            },
+        }
+
+        # Before posting "valid" data, we will mark the purchase order as "pending"
+        # In this case we do expect an error!
+        order = PurchaseOrder.objects.get(pk=1)
+        order.status = PurchaseOrderStatus.PENDING
+        order.save()
+
+        response = self.post(
+            self.url,
+            valid_data,
+            expected_code=400
+        )
+
+        self.assertIn('can only be received against', str(response.data))
+
+        # Now, set the PO back to "PLACED" so the items can be received
+        order.status = PurchaseOrderStatus.PLACED
+        order.save()
+
+        # Receive two separate line items against this order
+        self.post(
+            self.url,
+            valid_data,
             expected_code=201,
         )
 

InvenTree/part/templates/part/part_base.html

@@ -130,7 +130,7 @@
                             {% if roles.part.change %}
                             <li><a href='#' id='part-edit'><span class='fas fa-edit icon-blue'></span> {% trans "Edit part" %}</a></li>
                             {% endif %}
-                            {% if not part.active and roles.part.delete %}
+                            {% if roles.part.delete %}
                             <li><a href='#' id='part-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete part" %}</a></li>
                             {% endif %}
                         </ul>
@@ -503,12 +503,13 @@
     });
     {% endif %}
 
-    {% if not part.active and roles.part.delete %}
+    {% if roles.part.delete %}
     $("#part-delete").click(function() {
         launchModalForm(
             "{% url 'part-delete' part.id %}",
             {
-                redirect: {% if part.category %}"{% url 'category-detail' part.category.id %}"{% else %}"{% url 'part-index' %}"{% endif %}
+                redirect: {% if part.category %}"{% url 'category-detail' part.category.id %}"{% else %}"{% url 'part-index' %}"{% endif %},
+                no_post: {% if part.active %}true{% else %}false{% endif %},
             }
         );
     });

InvenTree/part/templates/part/partial_delete.html

@@ -3,6 +3,16 @@
 
 {% block pre_form_content %}
 
+{% if part.active %}
+
+<div class='alert alert-block alert-danger'>
+    {% blocktrans with full_name=part.full_name %}Part '<strong>{{full_name}}</strong>' cannot be deleted as it is still marked as <strong>active</strong>.
+    <br>Disable the "Active" part attribute and re-try.
+    {% endblocktrans %}
+</div>
+
+{% else %}
+
 <div class='alert alert-block alert-danger'>
     {% blocktrans with full_name=part.full_name %}Are you sure you want to delete part '<strong>{{full_name}}</strong>'?{% endblocktrans %}
 </div>
@@ -55,4 +65,12 @@
 <p>{% blocktrans with count=part.serials.all|length full_name=part.full_name  %}There are {{count}} unique parts tracked for '{{full_name}}'. Deleting this part will permanently remove this tracking information.{% endblocktrans %}</p>
 {% endif %}
 
+{% endif %}
+
+{% endblock %}
+
+{% block form %}
+{% if not part.active %}
+{{ block.super }}
+{% endif %}
 {% endblock %}

InvenTree/templates/InvenTree/search.html

@@ -117,7 +117,7 @@
         "{% url 'api-part-list' %}",
         {
             params: {
-                search: "{{ query }}",
+                original_search: "{{ query }}",
             },
             checkbox: false,
             disableFilters: true,
@@ -126,24 +126,10 @@
 
     addItem('category', '{% trans "Part Categories" %}', 'fa-sitemap');
 
-    $("#table-category").inventreeTable({
+    loadPartCategoryTable($("#table-category"), {
-        url: "{% url 'api-part-category-list' %}",
+        params: {
-        queryParams: {
+            original_search: "{{ query }}",
-            search: "{{ query }}",
+        }
-        },
-        columns: [
-            {
-                field: 'name',
-                title: '{% trans "Name" %}',
-                formatter: function(value, row, index, field) {
-                    return renderLink(value, '/part/category/' + row.pk + '/');
-                },
-            },
-            {
-                field: 'description',
-                title: '{% trans "Description" %}',
-            },
-        ],
     });
 
     addItem('manufacturer-part', '{% trans "Manufacturer Parts" %}', 'fa-toolbox');
@@ -153,7 +139,7 @@
         "{% url 'api-manufacturer-part-list' %}",
         {
             params: {
-                search: "{{ query }}",
+                original_search: "{{ query }}",
                 part_detail: true,
                 supplier_detail: true,
                 manufacturer_detail: true
@@ -168,7 +154,7 @@
         "{% url 'api-supplier-part-list' %}",
         {
             params: {
-                search: "{{ query }}",
+                original_search: "{{ query }}",
                 part_detail: true,
                 supplier_detail: true,
                 manufacturer_detail: true
@@ -186,7 +172,7 @@
 
     loadBuildTable('#table-build-order', {
         params: {
-            search: '{{ query }}',
+            original_search: '{{ query }}',
         }
     });
 
@@ -197,105 +183,23 @@
 
     addItem('stock', '{% trans "Stock Items" %}', 'fa-boxes');
 
-    $('#table-stock').inventreeTable({
+    loadStockTable($('#table-stock'), {
+        filterKey: 'stocksearch',
         url: "{% url 'api-stock-list' %}",
-        queryParams: {
+        params: {
-            search: "{{ query }}",
+            original_search: "{{ query }}",
             part_detail: true,
-            location_detail: true,
+            location_detail: true
-        },
-        columns: [
-            {
-                field: 'part',
-                title: "{% trans "Part" %}",
-                sortable: true,
-                formatter: function(value, row) {
-                    var url = `/stock/item/${row.pk}/`;
-                    var thumb = row.part_detail.thumbnail;
-                    var name = row.part_detail.full_name;
-
-                    html = imageHoverIcon(thumb) + renderLink(name, url);
-
-                    return html;
         }
-            },
-            {
-                field: 'part_description',
-                title: '{% trans "Description" %}',
-                sortable: true,
-                formatter: function(value, row, index, field) {
-                    return row.part_detail.description;
-                }
-            },
-            {
-                field: 'quantity',
-                title: '{% trans "Stock" %}',
-                sortable: true,
-                formatter: function(value, row, index, field) {
-
-                    var val = parseFloat(value);
-
-                    // If there is a single unit with a serial number, use the serial number
-                    if (row.serial && row.quantity == 1) {
-                        val = '# ' + row.serial;
-                    } else {
-                        val = +val.toFixed(5);
-                    }
-
-                    var html = renderLink(val, `/stock/item/${row.pk}/`);
-
-                    return html;
-                }
-            },
-            {
-                field: 'status',
-                title: '{% trans "Status" %}',
-                sortable: 'true',
-                formatter: function(value, row, index, field) {
-                    return stockStatusDisplay(value);
-                },
-            },
-            {
-                field: 'location_detail.pathstring',
-                title: '{% trans "Location" %}',
-                sortable: true,
-                formatter: function(value, row, index, field) {
-                    if (value) {
-                        return renderLink(value, `/stock/location/${row.location}/`);
-                    }
-                    else {
-                        if (row.customer) {
-                            var text = "{% trans "Shipped to customer" %}";
-                            return renderLink(text, `/company/${row.customer}/assigned-stock/`);
-                        } else {
-                            return '<em>{% trans "No stock location set" %}</em>';
-                        }
-                    }
-                }
-            },
-        ]
     });
 
     addItem('location', '{% trans "Stock Locations" %}', 'fa-map-marker-alt');
 
-    $("#table-location").inventreeTable({
+    loadStockLocationTable($("#table-location"), {
-        url: "{% url 'api-location-list' %}",
+        filterKey: 'locationsearch',
-        queryParams: {
+        params: {
-            search: "{{ query }}",
+            original_search: "{{ query }}",
         },
-        columns: [
-            {
-                field: 'name',
-                title: '{% trans "Name" %}',
-                formatter: function(value, row, index, field) {
-                    return renderLink(row.pathstring, '/stock/location/' + row.pk + '/');
-                },
-            },
-            {
-                field: 'description',
-                title: '{% trans "Description" %}',
-            },
-        ],
     });
 
     {% endif %}
@@ -307,7 +211,7 @@
 
     loadCompanyTable('#table-manufacturer', "{% url 'api-company-list' %}", {
         params: {
-            search: "{{ query }}",
+            original_search: "{{ query }}",
             is_manufacturer: "true",
         }
     });
@@ -317,7 +221,7 @@
 
     loadCompanyTable('#table-supplier', "{% url 'api-company-list' %}", {
         params: {
-            search: "{{ query }}",
+            original_search: "{{ query }}",
             is_supplier: "true",
         }
     });
@@ -326,7 +230,7 @@
 
     loadPurchaseOrderTable('#table-purchase-order', {
         params: {
-            search: '{{ query }}',
+            original_search: '{{ query }}',
         }
     });
 
@@ -337,7 +241,7 @@
 
     loadCompanyTable('#table-customer', "{% url 'api-company-list' %}", {
         params: {
-            search: "{{ query }}",
+            original_search: "{{ query }}",
             is_customer: "true",
         }
     });
@@ -346,7 +250,7 @@
 
     loadSalesOrderTable('#table-sales-orders', {
         params: {
-            search: '{{ query }}',
+            original_search: '{{ query }}',
         }
     });
 

InvenTree/templates/js/dynamic/inventree.js

@@ -116,7 +116,7 @@ function inventreeDocReady() {
                 success: function(data) {
                     var transformed = $.map(data.results, function(el) {
                         return {
-                            label: el.name,
+                            label: el.full_name,
                             id: el.pk,
                             thumbnail: el.thumbnail
                         };

InvenTree/templates/js/translated/company.js

@@ -361,7 +361,7 @@ function loadCompanyTable(table, url, options={}) {
             field: 'parts_supplied',
             title: '{% trans "Parts Supplied" %}',
             formatter: function(value, row) {
-                return renderLink(value, `/company/${row.pk}/parts/`);
+                return renderLink(value, `/company/${row.pk}/?display=supplier-parts`);
             }
         });
     } else if (options.pagetype == 'manufacturers') {
@@ -370,7 +370,7 @@ function loadCompanyTable(table, url, options={}) {
             field: 'parts_manufactured',
             title: '{% trans "Parts Manufactured" %}',
             formatter: function(value, row) {
-                return renderLink(value, `/company/${row.pk}/parts/`);
+                return renderLink(value, `/company/${row.pk}/?display=manufacturer-parts`);
             }
         });
     }
@@ -469,6 +469,7 @@ function loadManufacturerPartTable(table, url, options) {
         method: 'get',
         original: params,
         queryParams: filters,
+        sidePagination: 'server',
         name: 'manufacturerparts',
         groupBy: false,
         formatNoMatches: function() {
@@ -724,6 +725,7 @@ function loadSupplierPartTable(table, url, options) {
         url: url,
         method: 'get',
         original: params,
+        sidePagination: 'server',
         queryParams: filters,
         name: 'supplierparts',
         groupBy: false,

InvenTree/templates/js/translated/tables.js

@@ -182,6 +182,15 @@ function convertQueryParameters(params, filters) {
         delete params['sortable'];
     }
 
+    // If "original_search" parameter is provided, add it to the "search"
+    if ('original_search' in params) {
+        var search = params['search'] || '';
+
+        params['search'] = search + ' ' + params['original_search'];
+
+        delete params['original_search'];
+    }
+    
     return params;
 }
 

README.md

@@ -20,7 +20,6 @@ However, powerful business logic works in the background to ensure that stock tr
 # Docker
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/inventree/inventree)](https://hub.docker.com/r/inventree/inventree)
-![Docker Build](https://github.com/inventree/inventree/actions/workflows/docker_build.yaml/badge.svg)
 
 InvenTree is [available via Docker](https://hub.docker.com/r/inventree/inventree). Read the [docker guide](https://inventree.readthedocs.io/en/latest/start/docker/) for full details.