Merge remote-tracking branch 'inventree/master' into auto-allocation-improvements

InvenTree/build/templates/build/detail.html

@@ -304,6 +304,7 @@ loadStockTable($("#build-stock-table"), {
         location_detail: true,
         part_detail: true,
         build: {{ build.id }},
+        is_building: false,
     },
     groupByField: 'location',
     buttons: [

InvenTree/company/migrations/0041_alter_company_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.5 on 2021-10-04 20:41
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0040_alter_company_currency'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='company',
+            options={'ordering': ['name'], 'verbose_name_plural': 'Companies'},
+        ),
+    ]

InvenTree/company/models.py

@@ -94,6 +94,7 @@ class Company(models.Model):
         constraints = [
             UniqueConstraint(fields=['name', 'email'], name='unique_name_email_pair')
         ]
+        verbose_name_plural = "Companies"
 
     name = models.CharField(max_length=100, blank=False,
                             help_text=_('Company name'),

InvenTree/order/serializers.py

@@ -236,6 +236,7 @@ class POLineItemReceiveSerializer(serializers.Serializer):
         help_text=_('Unique identifier field'),
         default='',
         required=False,
+        allow_blank=True,
     )
 
     def validate_barcode(self, barcode):

InvenTree/stock/serializers.py

@@ -64,6 +64,7 @@ class StockItemSerializerBrief(InvenTreeModelSerializer):
             'location',
             'location_name',
             'quantity',
+            'serial',
         ]
 
 

InvenTree/templates/js/translated/build.js

@@ -614,8 +614,15 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
 
                             var url = '';
 
-                            if (row.serial && row.quantity == 1) {
-                                text = `{% trans "Serial Number" %}: ${row.serial}`;
+
+                            var serial = row.serial;
+
+                            if (row.stock_item_detail) {
+                                serial = row.stock_item_detail.serial;
+                            }
+
+                            if (serial && row.quantity == 1) {
+                                text = `{% trans "Serial Number" %}: ${serial}`;
                             } else {
                                 text = `{% trans "Quantity" %}: ${row.quantity}`;
                             }