Order parts wizard

InvenTree/company/api.py

@@ -312,7 +312,7 @@ def get_serializer(self, *args, **kwargs):
         try:
             params = self.request.query_params
             kwargs['part_detail'] = str2bool(params.get('part_detail', None))
-            kwargs['supplier_detail'] = str2bool(params.get('supplier_detail', None))
+            kwargs['supplier_detail'] = str2bool(params.get('supplier_detail', True))
             kwargs['manufacturer_detail'] = str2bool(params.get('manufacturer_detail', None))
             kwargs['pretty'] = str2bool(params.get('pretty', None))
         except AttributeError:

InvenTree/order/serializers.py

@@ -223,14 +223,30 @@ def __init__(self, *args, **kwargs):
         if order_detail is not True:
             self.fields.pop('order_detail')
 
-    quantity = serializers.FloatField(default=1)
-    received = serializers.FloatField(default=0)
+    quantity = serializers.FloatField(min_value=0, required=True)
+
+    def validate_quantity(self, quantity):
+
+        if quantity <= 0:
+            raise ValidationError(_("Quantity must be greater than zero"))
+
+        return quantity
+
+    def validate_purchase_order(self, purchase_order):
+
+        if purchase_order.status not in PurchaseOrderStatus.OPEN:
+            raise ValidationError(_('Order is not open'))
+
+        return purchase_order
+
+    received = serializers.FloatField(default=0, read_only=True)
 
     overdue = serializers.BooleanField(required=False, read_only=True)
 
     total_price = serializers.FloatField(read_only=True)
 
     part_detail = PartBriefSerializer(source='get_base_part', many=False, read_only=True)
+
     supplier_part_detail = SupplierPartSerializer(source='part', many=False, read_only=True)
 
     purchase_price = InvenTreeMoneySerializer(
@@ -248,6 +264,32 @@ def __init__(self, *args, **kwargs):
 
     order_detail = PurchaseOrderSerializer(source='order', read_only=True, many=False)
 
+    def validate(self, data):
+
+        data = super().validate(data)
+
+        supplier_part = data.get('part', None)
+        purchase_order = data.get('order', None)
+
+        if not supplier_part:
+            raise ValidationError({
+                'part': _('Supplier part must be specified'),
+            })
+
+        if not purchase_order:
+            raise ValidationError({
+                'order': _('Purchase order must be specified'),
+            })
+
+        # Check that the supplier part and purchase order match
+        if supplier_part is not None and supplier_part.supplier != purchase_order.supplier:
+            raise ValidationError({
+                'part': _('Supplier must match purchase order'),
+                'order': _('Purchase order must match supplier'),
+            })
+
+        return data
+
     class Meta:
         model = order.models.PurchaseOrderLineItem
 

InvenTree/part/templates/part/category.html

@@ -169,13 +169,18 @@ <h4>{% trans "Parts" %}</h4>
                 </button>
                 <ul class='dropdown-menu'>
                     {% if roles.part.change %}
-                    <li><a class='dropdown-item' href='#' id='multi-part-category' title='{% trans "Set category" %}'>{% trans "Set Category" %}</a></li>
+                    <li><a class='dropdown-item' href='#' id='multi-part-category' title='{% trans "Set category" %}'>
+                        <span class='fas fa-sitemap'></span> {% trans "Set Category" %}
+                    </a></li>
                     {% endif %}
-                    <li><a class='dropdown-item' href='#' id='multi-part-order' title='{% trans "Order parts" %}'>{% trans "Order Parts" %}</a></li>
+                    <li><a class='dropdown-item' href='#' id='multi-part-order' title='{% trans "Order parts" %}'>
+                        <span class='fas fa-shopping-cart'></span> {% trans "Order Parts" %}
+                    </a></li>
                     {% if report_enabled %}
-                    <li><a class='dropdown-item' href='#' id='multi-part-print-label' title='{% trans "Print Labels" %}'>{% trans "Print Labels" %}</a></li>
+                    <li><a class='dropdown-item' href='#' id='multi-part-print-label' title='{% trans "Print Labels" %}'>
+                        <span class='fas fa-tag'></span> {% trans "Print Labels" %}
+                    </a></li>
                     {% endif %}
-                    <li><a class='dropdown-item' href='#' id='multi-part-export' title='{% trans "Export" %}'>{% trans "Export Data" %}</a></li>
                 </ul>
             </div>
             {% include "filter_list.html" with id="parts" %}

InvenTree/part/templates/part/part_base.html

@@ -536,6 +536,22 @@ <h5>
     {% endif %}
 
     $("#part-order").click(function() {
+
+        inventreeGet(
+            '{% url "api-part-detail" part.pk %}',
+            {},
+            {
+                success: function(part) {
+                    orderParts(
+                        [part],
+                        {}
+                    );
+                }
+            }
+        );
+
+        return;
+
         launchModalForm("{% url 'order-parts' %}", {
             data: {
                 part: {{ part.id }},

InvenTree/templates/js/translated/api.js

@@ -105,7 +105,7 @@ function inventreeFormDataUpload(url, data, options={}) {
             }
         },
         error: function(xhr, status, error) {
-            console.log('Form data upload failure: ' + status);
+            console.error('Form data upload failure: ' + status);
 
             if (options.error) {
                 options.error(xhr, status, error);

InvenTree/templates/js/translated/barcode.js

@@ -86,7 +86,6 @@ function onCameraAvailable(hasCamera, options) {
 
 function onBarcodeScanCompleted(result, options) {
     if (result.data == '') return;
-    console.log('decoded qr code:', result.data);
     stopQrScanner();
     postBarcodeData(result.data, options);
 }

InvenTree/templates/js/translated/bom.js

@@ -129,7 +129,7 @@ function constructBomUploadTable(data, options={}) {
 
             var modal = createNewModal({
                 title: '{% trans "Row Data" %}',
-                cancelText: '{% trans "Close" %}',
+                closeText: '{% trans "Close" %}',
                 hideSubmitButton: true
             });
 
@@ -617,7 +617,7 @@ function bomSubstitutesDialog(bom_item_id, substitutes, options={}) {
             },
         },
         preFormContent: html,
-        cancelText: '{% trans "Close" %}',
+        closeText: '{% trans "Close" %}',
         submitText: '{% trans "Add Substitute" %}',
         title: '{% trans "Edit BOM Item Substitutes" %}',
         afterRender: function(fields, opts) {
@@ -1061,7 +1061,7 @@ function loadBomTable(table, options={}) {
                     table.bootstrapTable('append', response);
                 },
                 error: function(xhr) {
-                    console.log('Error requesting BOM for part=' + part_pk);
+                    console.error('Error requesting BOM for part=' + part_pk);
                     showApiError(xhr);
                 }
             }

InvenTree/templates/js/translated/company.js

@@ -115,17 +115,17 @@ function supplierPartFields() {
 
     return {
         part: {},
-        supplier: {},
-        SKU: {
-            icon: 'fa-hashtag',
-        },
         manufacturer_part: {
             filters: {
                 part_detail: true,
                 manufacturer_detail: true,
             },
             auto_fill: true,
         },
+        supplier: {},
+        SKU: {
+            icon: 'fa-hashtag',
+        },
         description: {},
         link: {
             icon: 'fa-link',

InvenTree/templates/js/translated/filters.js

@@ -62,7 +62,7 @@ function loadTableFilters(tableKey) {
             if (f.length == 2) {
                 filters[f[0]] = f[1];
             } else {
-                console.log(`Improperly formatted filter: ${item}`);
+                console.warn(`Improperly formatted filter: ${item}`);
             }
         }
     });
@@ -274,7 +274,7 @@ function setupFilterList(tableKey, table, target, options={}) {
     var element = $(target);
 
     if (!element || !element.exists()) {
-        console.log(`WARNING: setupFilterList could not find target '${target}'`);
+        console.warn(`setupFilterList could not find target '${target}'`);
         return;
     }